0.5.5-alt1

- live-related tweaks (including live.hooks support) - terminal server and webkiosk images
xorg: added xorg-dri-intel explicitly
2012-02-06 17:09:33 +02:00 · 2012-02-06 13:14:35 +02:00 · 2012-02-06 12:58:20 +02:00 · 2012-02-06 12:58:20 +02:00 · 2012-02-06 12:58:20 +02:00 · 2012-02-06 12:58:20 +02:00
55 changed files with 499 additions and 201 deletions
--- a/.gear/mkimage-profiles.spec
+++ b/.gear/mkimage-profiles.spec
@@ -1,5 +1,5 @@
 Name: mkimage-profiles
-Version: 0.5.2
+Version: 0.5.5
 Release: alt1

 Summary: ALT Linux based distribution metaprofile
@@ -59,6 +59,16 @@ cp -a * %buildroot%mpdir
 %doc README QUICKSTART

 %changelog
+* Mon Feb 06 2012 Michael Shigorin <mike@altlinux.org> 0.5.5-alt1
+- live-related tweaks (including live.hooks support)
+- terminal server and webkiosk images
+
+* Mon Jan 16 2012 Michael Shigorin <mike@altlinux.org> 0.5.4-alt1
+- better diags for initial deployment
+
+* Mon Jan 02 2012 Michael Shigorin <mike@altlinux.org> 0.5.3-alt1
+- multi-target, multi-arch, single-job builds
+
 * Mon Dec 19 2011 Michael Shigorin <mike@altlinux.org> 0.5.2-alt1
 - THE_{KMODULES,PACKAGES,LISTS,GROUPS}
 - incremental development, refactoring and bugfixing
--- a/.gear/tags/461cfaf9fc1fffe08daf223d04fd3f52edd21c16
+++ b/.gear/tags/461cfaf9fc1fffe08daf223d04fd3f52edd21c16
@@ -1,6 +0,0 @@
-object ae85287f97ae2879647491b4e3b0467ea250d931
-type commit
-tag v0.5.1
-tagger Michael Shigorin <mike@altlinux.org> 1322849338 +0200
-
-cpio.xz
--- a/.gear/tags/9e3e95942c73c5a2cca794e28935e6257cb37bc9
+++ b/.gear/tags/9e3e95942c73c5a2cca794e28935e6257cb37bc9
@@ -0,0 +1,6 @@
+object 8473fda02d9c0e194ac54a95159ebf49df8a0ace
+type commit
+tag v0.5.4
+tagger Michael Shigorin <mike@altlinux.org> 1326746252 +0200
+
+apt-get install hasher
--- a/.gear/tags/list
+++ b/.gear/tags/list
@@ -1 +1 @@
-461cfaf9fc1fffe08daf223d04fd3f52edd21c16 v0.5.1
+9e3e95942c73c5a2cca794e28935e6257cb37bc9 v0.5.4
--- a/107
+++ b/107
@@ -1,75 +1,38 @@
-# steps to build a distribution image:
-# --- here
-# 1. initialize new profile (BUILDDIR) as a copy of image.in/
-# 2. configure distro
-# 3. copy the needed bits from metaprofile to a new profile
-# --- in BUILDDIR
-# 4. build subprofiles and subsequently an image
+# umbrella mkimage-profiles makefile:
+# iterate over multiple goals/arches

-help:
-	@echo '** available distribution targets:'
-	@echo $(DISTROS) | fmt -sw"$$((COLUMNS>>1))" | column -t
-	@echo
-	@echo '** available virtual environment targets:'
-	@echo $(VES) | fmt -sw"$$((COLUMNS>>1))" | column -t
-
-MKIMAGE_PROFILES = $(dir $(lastword $(MAKEFILE_LIST)))
-
-# only process the first target (inter-target cleanup is tricky)
-IMAGE_TARGET := $(firstword $(MAKECMDGOALS))#	ve/generic.tar.gz
-ifeq (./,$(dir $(IMAGE_TARGET)))#		convenience fallback
-IMAGE_TARGET := distro/$(IMAGE_TARGET)#		for omitted "distro/"
+# immediate assignment
+ifndef ARCHES
+ifdef ARCH
+ARCHES := $(ARCH)
+else
+ARCHES := $(shell arch | sed 's/i686/i586/')
 endif
-IMAGE_CONF    := $(firstword $(subst ., ,$(IMAGE_TARGET)))# ve/generic
-IMAGE_CLASS   := $(firstword $(subst /, ,$(IMAGE_TARGET)))# ve
-IMAGE_FILE    := $(lastword  $(subst /, ,$(IMAGE_TARGET)))# generic.tar.gz
-IMAGE_NAME    := $(firstword $(subst ., ,$(IMAGE_FILE)))#   generic
-IMAGE_TYPE    := $(subst $(IMAGE_NAME).,,$(IMAGE_FILE))#    tar.gz
-
-# preferences
-include $(HOME)/.mkimage/profiles.mk
-
-# most of the actual work done elsewhere
-include lib/*.mk
-include conf.d/*.mk
-include features.in/*/config.mk
-
-DISTRO_TARGETS := $(shell sed -n 's,^\(distro/[^:.]\+\):.*$$,\1,p' \
-		lib/distro.mk $(wildcard conf.d/*.mk) | sort -u)
-VE_TARGETS := $(shell sed -n 's,^\(ve/[^:.]\+\):.*$$,\1,p' \
-		lib/ve.mk $(wildcard conf.d/*.mk) | sort -u)
-DISTROS := $(call addsuffices,$(DISTRO_EXTS),$(DISTRO_TARGETS)) 
-VES     := $(call addsuffices,$(VE_EXTS),$(VE_TARGETS))
-IMAGES  := $(DISTROS) $(VES)
-
-.PHONY: $(IMAGES) $(DISTRO_TARGETS) $(VE_TARGETS)
-
-### suboptimal but at least clear, reliable and convenient
-all:
-	@n=1; sum=$(words $(DISTROS)); \
-	for distro in $(DISTROS); do \
-		echo "** building $$distro:"; \
-		$(MAKE) --no-print-directory \
-			ALL=$$n/$$sum \
-			BUILDDIR=$(BUILDDIR) \
-			$$distro; \
-		echo; \
-		n=$$(($$n+1)); \
-	done
-
-$(IMAGES): debug \
-	config/with/$(IMAGE_CONF) \
-	config/like/$(IMAGE_CLASS) \
-	config/name/$(IMAGE_NAME) \
-	config/pack/$(IMAGE_TYPE) \
-	build; @:
-
-# convenience shortcut
-$(DISTROS:distro/%=%): %: distro/%
-
-debug:
-ifeq (2,$(DEBUG))
-	@$(foreach v,\
-		$(filter IMAGE_%,$(sort $(.VARIABLES))),\
-		$(warning $v = $($v)))
 endif
+export ARCHES
+
+# recursive make considered useful for m-p
+MAKE += --no-print-directory
+
+.PHONY: clean distclean help
+clean distclean help:
+	@$(MAKE) -f main.mk $@
+
+export NUM_TARGETS := $(words $(MAKECMDGOALS))
+
+# real targets need real work
+%:
+	@n=1; \
+	if [ "$(NUM_TARGETS)" -gt 1 ]; then \
+		n="`echo $(MAKECMDGOALS) \
+		| tr '[[:space:]]' '\n' \
+		| grep -nx "$@" \
+		| cut -d: -f1`"; \
+		echo "** goal: $@ [$$n/$(NUM_TARGETS)]"; \
+	fi; \
+	for ARCH in $(ARCHES); do \
+		if [ "$$ARCH" != "$(firstword $(ARCHES))" ]; then echo; fi; \
+		echo "** ARCH: $$ARCH"; \
+		$(MAKE) -f main.mk ARCH=$$ARCH $@; \
+	done; \
+	if [ "$$n" -lt "$(NUM_TARGETS)" ]; then echo; fi
--- a/3
+++ b/3
@@ -15,12 +15,13 @@
 команды
 ~~~~~~~
 - от имени root:
-# apt-get install hasher git-core
+# apt-get install mkimage hasher git-core
 # hasher-useradd USER

 - от имени пользователя (после повторного входа):
 $ git config --global user.email "my@email"
 $ git config --global user.name "My Name"
+$ mkdir ~/out

 - тестовая сборка (см. тж. lib/distro.mk, doc/variables.txt):
 $ make distro/icewm.iso
--- a/bin/mktmpdir
+++ b/bin/mktmpdir
@@ -1,20 +1,53 @@
 #!/bin/sh
 # analyze free space, preferring tmpfs over really many gigaz
+# and taking into account configured hasher workdir prefices

 # hope there aren't spaces in RM's $HOME are they?
-DIRS="$TMP $TMPDIR $HOME/hasher /tmp /var/tmp"
+DIRS="$TMP $TMPDIR $HOME/hasher /tmp /var/tmp .."
 MINSIZE=262144		# face control criterion

+# poor man's SourceIfExists()
+try_source() { [ -f "$1" ] && . "$1"; }
+
+# hasher accepted ones
+get_prefices()
+{
+	try_source /etc/hasher-priv/system
+	try_source `/usr/libexec/hasher-priv/getconf.sh`
+	echo "$prefix" | tr ':' '\n' | while read i; do realpath "$i"; done
+}
+
+# drop candidates that hasher won't handle anyways
+# NB: doesn't take --number into account,
+# prefix lists are defined by the primary configuration
+contemplate_dirs()
+{
+	for d in "$@"; do
+		D="`realpath "$d"`";
+		for p in `get_prefices`; do
+			[ "${D#$p}" = "$D" ] || echo "$D";
+		done;
+	done \
+	| uniq	# _not_ sort -u
+}
+
+# hasher emits no meaningful errors regarding those, sigh
+check_options()
+{
+	! egrep -q "^$1 $2 .*no(dev|exec)" /proc/mounts
+}
+
 # pick existing, writeable, >256M free space dirs
 # rank them wrt type: tmpfs > realfs > rootfs
 choose_tmpdir() {
-	for i in $DIRS; do
+	for i in "$@"; do
 		[ -d "$i" -a -w "$i" ] || continue
 		echo -n "$i "
 		df -Tl "$i" | tail -1
 	done \
 	| sort -unk6 \
 	| while read dir dev fstype size used free percent mnt; do
+		check_options "$dev" "$mnt" || continue
 		[ "$free" -gt "$MINSIZE" ] || continue
 		[ "$fstype" = "tmpfs" ] && { echo "2 $dir $free"; continue; }
 		[ "$mnt" = "/" ] && { echo "0 $dir $free"; continue; }
@@ -25,5 +58,24 @@ choose_tmpdir() {
 	| cut -f2 -d' '
 }

-DIR="`choose_tmpdir`"
-mktemp -d "${1:-tmpdir}.XXXXXXX" --tmpdir="${DIR:-`realpath ..`}"
+# bringing it all together
+TMPDIRS="`contemplate_dirs $DIRS`"
+if [ -z "$TMPDIRS" ]; then
+	echo "error: no suitable directories found;" >&2
+	echo "please check docs, filesystem and hasher setup" >&2
+	echo "(mount enough tmpfs into /tmp or fix hasher-priv prefix?)" >&2
+	exit 1
+fi
+
+TEMP="`choose_tmpdir $TMPDIRS`"
+if [ -z "$TEMP" ]; then
+	echo "error: no suitable directories found;" >&2
+	echo "please check hasher docs and filesystem setup" >&2
+	echo "(nodev and/or noexec on an otherwise suitable filesystem?)" >&2
+	exit 1
+fi
+
+DIR="$TEMP/`dirname "$1"`"
+NAME="`basename "${1:-tmpdir}"`"
+mkdir -p "$DIR"	# in case $1 contains slash(es)
+mktemp -d "$NAME.XXXXXXX" --tmpdir="${DIR%/.}"
--- a/conf.d/desktop.mk
+++ b/conf.d/desktop.mk
@@ -3,6 +3,7 @@ ifeq (distro,$(IMAGE_CLASS))

 distro/desktop-base: distro/installer use/repo/main \
 	use/syslinux/ui-vesamenu use/x11/xorg use/bootloader/grub
+	@$(call set,INSTALLER,desktop)

 distro/desktop-mini: distro/desktop-base \
 	use/lowmem use/x11/xdm use/bootloader/lilo \
@@ -11,6 +12,12 @@ distro/desktop-mini: distro/desktop-base \
 distro/icewm: distro/desktop-mini
 	@$(call add,BASE_LISTS,$(call tags,icewm desktop))

+distro/ltsp-icewm: distro/icewm use/ltsp use/firmware
+	@$(call add,BASE_LISTS,$(call tags,base network))
+	@$(call add,BASE_LISTS,ltsp)
+	@$(call add,BASE_PACKAGES,apt-repo)
+	@$(call add,BASE_PACKAGES,firefox)
+
 distro/desktop-systemd: distro/icewm use/systemd

 endif
--- a/conf.d/live.mk
+++ b/conf.d/live.mk
@@ -6,6 +6,8 @@ distro/rescue: distro/.base use/rescue use/syslinux/ui-menu
 distro/live: distro/.base use/live/base use/power/acpi/cpufreq
 distro/live-systemd: distro/.base use/live/base use/systemd

+distro/.live-x11: distro/live use/live/autologin use/power/acpi/button
+
 distro/live-isomd5sum: distro/.base use/live/base use/isomd5sum
 	@$(call add,LIVE_PACKAGES,livecd-isomd5sum)

@@ -24,11 +26,11 @@ distro/live-builder: distro/.base use/repo/main \
 distro/live-install: distro/.base use/live/base use/syslinux/localboot.cfg
 	@$(call add,LIVE_PACKAGES,live-install)

-distro/live-icewm: distro/live use/live/autologin
+distro/live-icewm: distro/.live-x11
 	@$(call add,LIVE_LISTS, \
 		$(call tags,(base || desktop) && (live || network || icewm)))

-distro/live-razorqt: distro/live use/live/autologin
+distro/live-razorqt: distro/.live-x11
 	@$(call add,LIVE_LISTS, \
 		$(call tags,(base || desktop) && (live || network || razorqt)))

@@ -37,4 +39,8 @@ distro/live-rescue: distro/live-icewm
 	@$(call add,LIVE_LISTS, \
 		$(call tags,(base || extra) && (archive || rescue || network)))

+distro/live-webkiosk: distro/.live-x11 use/live/hooks
+	@$(call add,LIVE_PACKAGES,livecd-webkiosk)
+	@$(call add,LIVE_PACKAGES,fonts-ttf-dejavu fonts-ttf-droid)
+
 endif
--- a/doc/assumptions.txt
+++ b/doc/assumptions.txt
@@ -1,5 +1,8 @@
 предположения фрагментов кода об окружении
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+NB: пути приводятся от верхнего уровня
+
 - pkg.in/lists/Makefile
  + ожидает, что названия пакаджлистов указываются в переменных
    вида *_LISTS, и копирует в генерируемый профиль только их
--- a/doc/variables.txt
+++ b/doc/variables.txt
@@ -9,12 +9,18 @@
  + см. ../image.in/Makefile, apt.conf.sample

 - ARCH
-  + задаёт целевую архитектуру образа
+  + задаёт целевую архитектуру образов
  + значение: пусто (по умолчанию авто), i586 или x86_64
  + см. ../lib/build.mk

+- ARCHES
+  + задаёт набор целевых архитектур образов
+  + значение: пусто (по умолчанию авто) либо список через пробел
+  + см. ../Makefile
+
 - BELL
  + подаёт сигнал после завершения сборки
+  + значение: пусто (по умолчанию нет) либо любая строка
  + см. ../lib/build.mk

 - BUILDDIR
@@ -22,6 +28,16 @@
  + значение: пусто (по умолчанию авто) либо строка
  + см. ../lib/profile.mk

+- BUILDDIR_PREFIX
+  + задаёт префикс каталога генерируемого профиля и сборки
+  + значение: строка; по умолчанию выбирается алгоритмически
+  + см. ../main.mk
+
+- BUILDLOG
+  + задаёт путь к файлу журнала сборки/очистки
+  + значение: по умолчанию $(BUILDDIR)/build.log либо строка
+  + см. ../lib/log.mk
+
 - CHECK
  + включает режим проверки сборки конфигурации
  + значение: пусто (по умолчанию) либо любая строка
--- a/features.in/Makefile
+++ b/features.in/Makefile
@@ -108,7 +108,7 @@ $(FEATURES):
 	if [ -s "generate.mk" ]; then $(MAKE) -f generate.mk; fi; \
 	if type -t git >&/dev/null && \
 	   pushd "$(BUILDDIR)/" >/dev/null; then \
-		if test -n "`git status -s`"; then \
+		if [ -n "`git status -s`" ]; then \
 			git add . && \
 			git commit -qam "$$feat feature generation complete"; \
 		fi; \
--- a/features.in/README
+++ b/features.in/README
@@ -4,7 +4,7 @@

 Каждая фича должна содержать задействуемый при построении
 конфигурации будущего образа файл config.mk, включаемый
-в ../Makefile; он может описывать одну или более целей
+в ../main.mk; он может описывать одну или более целей
 вида use/*, дополняющих конфигурацию, и при наличии
 дополнительных хуков для копирования или generate.*
 обязан добавить имя фичи в $(FEATURES), для чего
--- a/features.in/bootloader/README
+++ b/features.in/bootloader/README
@@ -5,6 +5,10 @@
 систему (он НЕ должен требоваться пакету installer-distro-*)
 и требует пакет выбранного загрузчика.

-Реализация экспериментальная (нужно модуляризовать installer-steps),
-пока завязана на installer-distro-altlinux-generic (TODO).  Возможно,
-с использованием alterator-lilo связаны проблемы времени установки.
+Обратите внимание: в процессе конфигурирования дистрибутива
+"переключение" загрузчика может происходить только в одну сторону
+-- если выставлен grub, произведено переключение на lilo и затем
+произведена ещё одна попытка переключения на grub, то в конфигурации
+останется lilo как последняя "новая" цель с точки зрения make.
+
+Реализация экспериментальная (нужно модуляризовать installer-steps).
--- a/features.in/bootloader/config.mk
+++ b/features.in/bootloader/config.mk
@@ -1,5 +1,7 @@
 # TODO: invent something prettier (think "lilo+grub" -- or error out?)
 # - add,BASE_PACKAGES,alterator-$* is overly additive
+#   NB: due to make target becoming having been made,
+#       the last different one wins
 # - remember .base if adding yet another *_PACKAGES

 use/bootloader: use/install2 sub/main
--- a/features.in/build-distro/lib/build-distro.mk
+++ b/features.in/build-distro/lib/build-distro.mk
@@ -13,6 +13,9 @@ ifneq (,$(findstring install2,$(FEATURES)))
 METADATA = metadata
 endif

+# see also ../scripts.d/01-isosort; needs mkimage-0.2.2+
+MKI_SORTFILE := /tmp/isosort
+
 all: $(GLOBAL_DEBUG) prep copy-subdirs copy-tree run-scripts pack-image \
 	postprocess $(GLOBAL_CLEAN_WORKDIR)

--- a/features.in/build-distro/scripts.d/01-isosort
+++ b/features.in/build-distro/scripts.d/01-isosort
@@ -0,0 +1,14 @@
+#!/bin/sh
+# provide mkisofs with image contents sort order hints
+
+### split over features or leave in a single piece?
+
+# NB: only a single space/tab in between, no trailing whitespace
+cat > /tmp/isosort <<__EOF__
+ALTLinux 0
+Metadata 100
+altinst 700
+rescue 800
+live 900
+syslinux 1000
+__EOF__
--- a/features.in/build-ve/image-scripts.d/03services
+++ b/features.in/build-ve/image-scripts.d/03services
@@ -6,6 +6,8 @@
 # candidates:
 # off: keytable

+[ -x /sbin/chkconfig ] || exit 0
+
 for i in network random syslogd random; do chkconfig $i on; done
 for i in fbsetfont netfs rawdevices; do chkconfig $i off; done
 :
--- a/features.in/build-ve/image-scripts.d/04inittab
+++ b/features.in/build-ve/image-scripts.d/04inittab
@@ -1,3 +1,4 @@
 #!/bin/sh -e
 # we don't need no gettys in OpenVZ VEs (might need one in LXC though)
-subst 's,^[0-9]\+:[0-9]\+:respawn:/sbin/mingetty.*,#&,' /etc/inittab
+[ -s /etc/inittab ] || exit 0
+sed -i 's,^[0-9]\+:[0-9]\+:respawn:/sbin/mingetty.*,#&,' /etc/inittab
--- a/features.in/build-ve/image-scripts.d/06syslog
+++ b/features.in/build-ve/image-scripts.d/06syslog
@@ -5,9 +5,12 @@
 #   remote syslog if you do care for reliable data anyways)
 # credits: vvk@, thresh@ (2010)

-sed -i \
-	-e 's,/dev/tty12,/var/log/syslog/console,' \
-	-e 's,^.*/var/log/syslog/console$,#&,' \
-	-e 's,-/var/log/,/var/log/,g' \
-	-e 's,/var/log/,-/var/log/,g' \
-	/etc/syslog.conf
+CONFIG=/etc/syslog.conf
+
+[ ! -f "$CONFIG" ] || \
+	sed -i \
+		-e 's,/dev/tty12,/var/log/syslog/console,' \
+		-e 's,^.*/var/log/syslog/console$,#&,' \
+		-e 's,-/var/log/,/var/log/,g' \
+		-e 's,/var/log/,-/var/log/,g' \
+		"$CONFIG"
--- a/features.in/dev/live/image-scripts.d/40-hasher
+++ b/features.in/dev/live/image-scripts.d/40-hasher
@@ -29,7 +29,7 @@ fi
 # $TMP
 TMP="/tmp/.private/$USER"
 control pam_mktemp enabled
-subst '/^%_tmppath.*tmp$/d' "$HOME/.rpmmacros"
+sed -i '/^%_tmppath.*tmp$/d' "$HOME/.rpmmacros"
 echo "%_tmppath	$TMP" >> "$HOME/.rpmmacros"

 # ~/hasher
--- a/features.in/firmware/config.mk
+++ b/features.in/firmware/config.mk
@@ -12,8 +12,8 @@ use/firmware/server: use/firmware
 use/firmware/wireless: use/firmware
 	@$(call add,MAIN_PACKAGES,firmware-acx100)
 	@$(call add,MAIN_PACKAGES,firmware-i2400m)
-	@$(call add,MAIN_PACKAGES,firmware-carl9170)
+	@$(call add,MAIN_PACKAGES_REGEXP,firmware-carl9170.*)
 	@$(call add,MAIN_PACKAGES_REGEXP,firmware-ipw.*)
-	@$(call add,MAIN_PACKAGES_REGEXP,firmware-iwl.*)
+	@#$(call add,MAIN_PACKAGES_REGEXP,firmware-iwl.*)
 	@$(call add,MAIN_PACKAGES_REGEXP,firmware-rt.*)
 	@$(call add,MAIN_PACKAGES_REGEXP,firmware-zd.*)
--- a/features.in/live/config.mk
+++ b/features.in/live/config.mk
@@ -11,3 +11,6 @@ use/live/x11: use/live/base use/x11/xorg use/x11/wacom use/virtualbox/guest
 #     *but* it only configures some of the *existing* means; let's add one
 use/live/autologin: use/live/x11
 	@$(call add,LIVE_PACKAGES,autologin xinit)
+
+use/live/hooks: use/live
+	@$(call add,LIVE_PACKAGES,livecd-run-hooks)
--- a/features.in/live/live/image-scripts.d/10-live-hooks
+++ b/features.in/live/live/image-scripts.d/10-live-hooks
@@ -0,0 +1,5 @@
+#!/bin/sh
+# if we're configured for running live hooks,
+# there should be a place for them either
+
+chkconfig livecd-run-hooks on >&/dev/null && mkdir /live.hooks ||:
--- a/features.in/live/live/image-scripts.d/40-autologin
+++ b/features.in/live/live/image-scripts.d/40-autologin
@@ -1,11 +1,17 @@
 #!/bin/sh -ef
+
+if [ ! -x /usr/bin/X ]; then
+	echo "warning: autologin feature requested but X not installed" >&2
+	exit 0
+fi
+
 USER=altlinux

 # setup runlevel
 INITTAB=/etc/inittab
 if [ -f "$INITTAB" ]; then
 	[ -z "$runlevel" ] && runlevel=5
-	subst "s,^\(id:\)\(.*\)\(:initdefault.*\),\\1$runlevel\\3," "$INITTAB"
+	sed -i "s,^\(id:\)\(.*\)\(:initdefault.*\),\\1$runlevel\\3," "$INITTAB"
 fi

 # autologin^2
--- a/features.in/live/live/image-scripts.d/90-cleanup-boot
+++ b/features.in/live/live/image-scripts.d/90-cleanup-boot
@@ -0,0 +1,6 @@
+#!/bin/sh
+# we don't really need the kernel in live root,
+# it's been booted already
+
+rm -f /boot/*
+:
--- a/features.in/live/stage1/files/index.html
+++ b/features.in/live/stage1/files/index.html
@@ -0,0 +1,10 @@
+<html>
+<head>
+<meta http-equiv="refresh" content="3;url=http://www.altlinux.org/">
+<title>Welcome to ALT Linux!</title>
+</head>
+<body>
+<h1>Welcome to ALT Linux!</h1>
+<p>You will be redirected to <a href="http://www.altlinux.org/">the home page</a> shortly.</p>
+</body>
+<html>
--- a/features.in/ltsp/README
+++ b/features.in/ltsp/README
@@ -0,0 +1,5 @@
+Эта фича обеспечивает добавление функций терминального сервера:
+- загрузку бездисковых тонких клиентов по сети;
+- предоставление им доступа к серверу приложений.
+
+На данный момент является совсем экспериментальной.
--- a/features.in/ltsp/config.mk
+++ b/features.in/ltsp/config.mk
@@ -0,0 +1,3 @@
+use/ltsp:
+	@$(call add,INSTALL2_PACKAGES,installer-feature-ltsp-stage2)
+	@$(call add,MAIN_LISTS,ltsp-client ltsp-client.$(ARCH))
--- a/features.in/stage2/stage1/scripts.d/03-test-kernel
+++ b/features.in/stage2/stage1/scripts.d/03-test-kernel
@@ -1,6 +1,9 @@
 #!/bin/sh
 # check relevant kernel features availability

+GZ_OPTS="-comp gzip"
+XZ_OPTS="-comp xz -b 524288 -noI"
+
 # test for installer-required filesystems support
 for opt in CONFIG_SQUASHFS CONFIG_AUFS_FS; do
 	if grep -q "^$opt=[my]$" /boot/config-*; then
@@ -16,7 +19,14 @@ done
 # squashfs options: not really neccessary but better than none
 # NB: this config file should be carried over into install2
 if grep -q '^CONFIG_SQUASHFS_XZ=y$' /boot/config-*; then
-	echo "PACK_SQUASHFS_OPTS=-comp xz -Xbcj x86" > /.image/squashcfg.mk
+	# TODO: figure out if it's generally worth it even on x86:
+	#       if binaries account for less than ~70% of blocks,
+	#       the decompression filter overhead might hurt
+	# NB: there are arm, powerpc and some other filters too
+	if grep -q "^CONFIG_X86" /boot/config-*; then
+		XZ_OPTS="$XZ_OPTS -Xbcj x86"
+	fi
+	echo "PACK_SQUASHFS_OPTS=$XZ_OPTS" > /.image/squashcfg.mk
 else
-	echo "PACK_SQUASHFS_OPTS=-comp gzip" >> /.image/squashcfg.mk
+	echo "PACK_SQUASHFS_OPTS=$GZ_OPTS" > /.image/squashcfg.mk
 fi
--- a/features.in/stage2/stage1/scripts.d/10-initrd-base
+++ b/features.in/stage2/stage1/scripts.d/10-initrd-base
@@ -2,5 +2,5 @@
 # prepare base make-initrd configuration for stage1
 # see also http://www.altlinux.org/Make-initrd-propagator

-subst 's/AUTODETECT/#AUTODETECT/' /etc/initrd.mk
+sed -i 's/AUTODETECT/#AUTODETECT/' /etc/initrd.mk
 echo 'FEATURES += propagator' >> /etc/initrd.mk
--- a/features.in/stage2/stage1/scripts.d/11-initrd-misc
+++ b/features.in/stage2/stage1/scripts.d/11-initrd-misc
@@ -5,7 +5,7 @@

 # FIXME: move to plymouth feature
 #if [ -f /etc/plymouth/plymouthd.conf ];then 
-#    subst 's/#\([T\[]\)/\1/' /etc/plymouth/plymouthd.conf
+#    sed -i 's/#\([T\[]\)/\1/' /etc/plymouth/plymouthd.conf
 #    echo 'FEATURES += plymouth' >> /etc/initrd.mk
 #fi

--- a/features.in/syslinux/generate.mk
+++ b/features.in/syslinux/generate.mk
@@ -51,14 +51,13 @@ all: prep debug
 	@### proper text branding should be implemented
 	@sed -i 's,@mkimage-profiles@,$(IMAGE_NAME),' $(DSTDIR)/*.cfg
 	@echo $(SYSLINUX_MODULES) > $(DSTDIR)/modules.list
-	@echo $(SYSLINUX_FILES) > $(DSTDIR)/files.list
-	@echo $(BOOTLOADER) > $(DSTDIR)/bootloader
+	@echo $(SYSLINUX_FILES) > $(DSTDIR)/syslinux.list

 prep:
 	@mkdir -p $(DSTDIR)

 debug:
-	@if test -n "$(DEBUG)"; then \
+	@if [ -n "$(DEBUG)" ]; then \
 		echo "** BOOTLOADER: $(BOOTLOADER)"; \
 		echo "** SYSLINUX_UI: $(SYSLINUX_UI)"; \
 		echo "** SYSLINUX_CFG: $(SYSLINUX_CFG)"; \
--- a/features.in/syslinux/stage1/scripts.d/01-syslinux
+++ b/features.in/syslinux/stage1/scripts.d/01-syslinux
@@ -7,33 +7,33 @@ MODDIR="/usr/lib/syslinux"
 mkdir -p "$WORKDIR/syslinux"
 cd "$WORKDIR/syslinux"

-# validate just in case (written by ../../generate.mk)
-BOOTLOADER="$(cat .in/bootloader)"
-case "$BOOTLOADER" in
+# validate just in case (see also stage1 Makefile)
+case "$GLOBAL_BOOTLOADER" in
 	isolinux|syslinux) ;;
-	*) echo "$0: error: weird BOOTLOADER: $BOOTLOADER" >&2; exit 1;;
+	*) echo "error: weird GLOBAL_BOOTLOADER: \`$GLOBAL_BOOTLOADER'" >&2;
+	   exit 1;;
 esac

 # copy extra files, if any
-SYSLINUX_FILES="$(cat .in/files.list)"
-if test -n "${SYSLINUX_FILES% }"; then
+SYSLINUX_FILES="$(cat .in/syslinux.list)"
+if [ -n "${SYSLINUX_FILES% }" ]; then
 	cp -a $SYSLINUX_FILES .
 fi

 # prune module-specific config snippets; skip built-in one
 SYSLINUX_MODULES="$(cat .in/modules.list)"
-if test -n "$SYSLINUX_MODULES"; then
+if [ -n "$SYSLINUX_MODULES" ]; then
 	for module in $SYSLINUX_MODULES; do
-		if test "$modules" == "prompt"; then continue; fi
+		if [ "$modules" == "prompt" ]; then continue; fi
 		cp -a $MODDIR/$module.c?? . || rm .in/[0-9][0-9]$module.cfg
 	done
 fi

 # number ordering sponsored by shell's pathname expansion
-grep -hv '^#' .in/[0-9][0-9]*.cfg > "$BOOTLOADER.cfg"
+grep -hv '^#' .in/[0-9][0-9]*.cfg > "$GLOBAL_BOOTLOADER.cfg"

 # snippets are not going into the actual image
-if test "$DEBUG" != 2; then rm -r .in/; fi
+if [ "$DEBUG" != 2 ]; then rm -r .in/; fi

 # NB: there will be final macro expansion based on actual image sizes
 #     (done by ../../scripts.d/10-propagator-ramdisk)
--- a/image.in/Makefile
+++ b/image.in/Makefile
@@ -10,6 +10,11 @@ MKI_VER_OPTIMAL = 0.2.0

 include distcfg.mk
 include functions.mk
+
+ifeq (,$(realpath $(MKIMAGE_PREFIX)/config.mk))
+$(error please apt-get install mkimage and have a look at QUICKSTART as well)
+endif
+
 include $(MKIMAGE_PREFIX)/config.mk

 ifeq (-,$(shell rpmvercmp $(MKI_VERSION) $(MKI_VER_MINIMAL) | tr -d [0-9]))
@@ -60,5 +65,6 @@ postprocess: | $(addprefix postprocess-,$(sort $(POSTPROCESS_TARGETS)))

 debug:
 	@echo "TOPDIR=$(TOPDIR)"
+	@echo "IMAGEDIR=$(IMAGEDIR)"
 	@echo "ARCH=$(ARCH)"
 	@echo "GLOBAL_HSH_APT_CONFIG=$(GLOBAL_HSH_APT_CONFIG)"
--- a/image.in/functions.mk
+++ b/image.in/functions.mk
@@ -1,7 +1,7 @@
 # globals
 PKGDIR := $(GLOBAL_BUILDDIR)/pkg

-### duplicated from toplevel build.mk, log.mk for sake of "local" builds
+# duplicated from metaprofile makefiles for the sake of "local" builds
 ARCH ?= $(shell arch | sed 's/i686/i586/')
 DATE ?= $(shell date +%Y%m%d)

--- a/lib/README
+++ b/lib/README
@@ -3,5 +3,5 @@
 конфигурации образа и генерации соответствующего
 профиля для сборки; см. тж. ../conf.d/.

-Следует помнить, что будучи включаемыми в ../Makefile,
+Следует помнить, что будучи включаемыми в ../main.mk,
 они работают в каталоге верхнего уровня.
--- a/lib/build.mk
+++ b/lib/build.mk
@@ -6,8 +6,6 @@ ifndef MKIMAGE_PROFILES
 $(error this makefile is designed to be included in toplevel one)
 endif

-export ARCH ?= $(shell arch | sed 's/i686/i586/')
-
 # try not to bog down the system, both CPU and I/O wise
 ifdef NICE
 START := nice $(shell ionice -c3 echo "ionice -c3" 2>/dev/null)
@@ -22,13 +20,18 @@ START += time -f "%E %PCPU %Mk"
 # /usr/bin/{i586,x86_64} are setarch(8) symlinks
 START += $(ARCH)

-# to be passed into distcfg.mk
-IMAGEDIR ?= $(shell [ -d "$$HOME/out" -a -w "$$HOME/out" ] \
-	&& echo "$$HOME/out" \
-	|| echo "$(BUILDDIR)/out" )
+# to be passed into distcfg.mk; suggestions are welcome
+IMAGEDIR ?= $(shell \
+	if [ -d "$$HOME/out" -a -w "$$HOME/out" ]; then \
+		echo "$$HOME/out"; \
+	else \
+		dir="`dirname $(BUILDDIR)`/out"; \
+		mkdir -p "$$dir" && echo "$$dir" || echo "/tmp"; \
+	fi; \
+)

-# poehali
-build: profile/populate
+# actual build starter
+build-image: profile/populate
 	@if [ -n "$(CHECK)" ]; then \
 		echo "$(TIME) skipping actual image build (CHECK is set)"; \
 		exit; \
@@ -37,25 +40,24 @@ build: profile/populate
 	if [ -n "$(DEBUG)" ]; then \
 		echo ": tail -f $(BUILDLOG)" $(SHORTEN); \
 	else \
-		if [ -n "$(ALL)" ]; then \
-			echo " [$(ALL)]"; \
-		else \
-			echo " (coffee time)"; \
-		fi; \
+		echo " (coffee time)"; \
 	fi; \
 	if $(START) $(MAKE) -C $(BUILDDIR)/ $(LOG); then \
 		echo "$(TIME) done (`tail -1 $(BUILDLOG) | cut -f1 -d.`)"; \
 		tail -200 "$(BUILDLOG)" $(SHORTEN) \
-		| GREP_COLOR="$(ANSI_OK)" \
-		  grep --color=auto '^\*\* image: .*' ||:; \
+		| GREP_COLOR="$(ANSI_OK)" GREP_OPTIONS="--color=auto" \
+		  grep '^\*\* image: .*' ||:; \
 	else \
-		echo "$(TIME) failed, see log: $(BUILDLOG)" $(SHORTEN); \
+		echo -n "$(TIME) failed, see log"; \
 		if [ -z "$(DEBUG)" ]; then \
-			echo "$(TIME) (you might want to re-run with DEBUG=1)"; \
+			echo ": $(BUILDLOG)" $(SHORTEN); \
+			echo "$(TIME) (you might want to rerun with DEBUG=1)"; \
+		else \
+			echo " above"; \
 		fi; \
 		tail -200 "$(BUILDLOG)" \
-		| GREP_COLOR="$(ANSI_FAIL)" \
-		  egrep --color=auto "^(E:|[Ee]rror|[Ww]arning).*"; \
+		| GREP_COLOR="$(ANSI_FAIL)" GREP_OPTIONS="--color=auto" \
+		  egrep "^((E:|[Ee]rror|[Ww]arning).*)|(.* Stop\.)$$"; \
 		df -P $(BUILDDIR) | awk 'END { if ($$4 < $(LOWSPACE)) \
 			{ print "NB: low space on "$$6" ("$$5" used)"}}'; \
 	fi; \
--- a/lib/clean.mk
+++ b/lib/clean.mk
@@ -3,6 +3,8 @@
 # drop stock predefined rules
 .DEFAULT:

+SYMLINK = build
+
 # tmpfs-sparing extra rule: cleanup workdir after completing each stage
 # (as packed results are saved this only lowers RAM pressure)
 # NB: it's useful enough to be enabled by default in DEBUG abscence
@@ -18,22 +20,37 @@ endif

 # ordinary clean: destroys workdirs but not the corresponding results
 clean:
-	@echo "$(TIME) cleaning up $(WARNING)"
 	@find -name '*~' -delete >&/dev/null ||:
-	@if [ -L build -a -d build/ ]; then \
-		$(MAKE) -C build $@ \
-			GLOBAL_BUILDDIR=$(shell readlink build) $(LOG) ||:; \
+	@if [ -L "$(SYMLINK)" -a -d "$(SYMLINK)"/ ]; then \
+		echo "$(TIME) cleaning up $(WARNING)"; \
+		$(MAKE) -C "$(SYMLINK)" $@ \
+			GLOBAL_BUILDDIR="$(realpath $(SYMLINK))" $(LOG) ||:; \
 	fi

 # there can be some sense in writing log here even if normally
 # $(BUILDDIR)/ gets purged: make might have failed,
 # and BUILDLOG can be specified by hand either
 distclean: clean
-	@if [ -L build -a -d build/ ]; then \
-		rm -rf build/.git; \
-		$(MAKE) -C build $@ \
-			GLOBAL_BUILDDIR=$(shell readlink build) $(LOG) || \
-			rm -rf build/; \
-		rm -rf $(shell readlink build); \
+	@if [ -L "$(SYMLINK)" -a -d "$(SYMLINK)"/ ]; then \
+		build="$(realpath $(SYMLINK)/)"; \
+		if [ "$$build" = / ]; then \
+			echo "** ERROR: invalid \`"$(SYMLINK)"' symlink" >&2; \
+			exit 128; \
+		else \
+			$(MAKE) -C "$(SYMLINK)" $@ \
+				GLOBAL_BUILDDIR="$$build" $(LOG) ||: \
+			rm -rf "$$build"; \
+		fi; \
+	fi
+	@rm -f "$(SYMLINK)"
+
+# builddir existing outside read-only metaprofile is less ephemeral
+# than BUILDDIR is -- usually it's unneeded afterwards so just zap it
+postclean: build-image
+	@if [ "$(NUM_TARGETS)" -gt 1 -a -z "$(DEBUG)" ] || \
+	    [ ! -L "$(SYMLINK)" -a "0$(DEBUG)" -lt 2 ]; then \
+		echo "$(TIME) cleaning up after build"; \
+		$(MAKE) -C "$(BUILDDIR)" distclean \
+			GLOBAL_BUILDDIR="$(BUILDDIR)" $(LOG) ||:; \
+		rm -rf "$(BUILDDIR)"; \
 	fi
-	@rm -f build ||:
--- a/lib/functions.mk
+++ b/lib/functions.mk
@@ -25,7 +25,7 @@ endef
 set = $(and $(1),$(2),$(set_body))
 define set_body
 { $(log_body); \
-subst 's|^$(1)[ 	]*[+?]*=.*$$|#& # overridden by $@|' "$(CONFIG)"; \
+sed -i 's|^$(1)[ 	]*[+?]*=.*$$|#& # overridden by $@|' "$(CONFIG)"; \
 printf '%s = %s\n' '$(1)' '$(2)' >> "$(CONFIG)"; }
 endef

--- a/lib/log.mk
+++ b/lib/log.mk
@@ -8,7 +8,7 @@ endif

 BUILDLOG ?= $(BUILDDIR)/build.log

-# LOG holds a postprocessor
+# LOG holds a redirecting postprocessor
 ifdef DEBUG
 # 1) makefile target; 2) also passed to script hooks
 GLOBAL_DEBUG := debug
@@ -27,3 +27,12 @@ DATE = $(shell date +%Y%m%d)
 TIME = `date +%H:%M:%S`

 export BUILDLOG DATE GLOBAL_DEBUG GLOBAL_VERBOSE LOG MAKE SHELL
+
+# brevity postprocessor; not exported, for toplevel use only
+SHORTEN = $(shell \
+	echo -n "| sed"; \
+	if [ -s "$(SYMLINK)" ]; then \
+		echo -n " -e 's,$(BUILDDIR),$(SYMLINK),'"; \
+	fi; \
+	echo -n " -e 's,$(TMP),\$$TMP,' -e 's,$(HOME),~,'"; \
+)
--- a/lib/profile.mk
+++ b/lib/profile.mk
@@ -4,14 +4,23 @@ endif

 SYMLINK = build

-# this could have come from environment;
-# if not, can be symlinked if r/w, or made anew
+# this could have come from env; or could be symlinked; or is made anew
+# (the reuse rationale is avoiding extra tmpdir lookups)
 # NB: immediate assignment matters
-# NB: PATH has no effect here
 ifndef BUILDDIR
-BUILDDIR := $(shell [ -s "$(SYMLINK)" ] \
-        && realpath "$(SYMLINK)" \
-        || bin/mktmpdir mkimage-profiles)
+BUILDLINK := $(realpath $(SYMLINK))
+BUILDDIR  := $(shell \
+if [ -s "$(SYMLINK)" -a "$(NUM_TARGETS)" = 1 ] && \
+   [ -n "$(findstring $(BUILDDIR_PREFIX).,$(BUILDLINK))" ]; \
+then \
+	echo "$(BUILDLINK)"; \
+else \
+	bin/mktmpdir $(BUILDDIR_PREFIX) || exit 127; \
+fi; )
+endif
+
+ifeq (,$(BUILDDIR))
+$(error suitable BUILDDIR unavailable)
 endif

 # even smart caching only hurts when every build goes from scratch
@@ -24,19 +33,14 @@ export BUILDDIR NO_CACHE PATH
 CONFIG := $(BUILDDIR)/distcfg.mk
 RC := $(HOME)/.mkimage/profiles.mk

-# holds a postprocessor; shell test executes in particular situation
-# NB: not exported, for toplevel use only
-SHORTEN = $(shell \
-		if [ -s "$(SYMLINK)" ]; then \
-			echo "| sed 's,$(BUILDDIR),$(SYMLINK),'"; \
-		else \
-			echo "| sed 's,$(TMP),\$$TMP,'"; \
-		fi;)
-
 # step 1: initialize the off-tree mkimage profile (BUILDDIR)
 profile/init: distclean
+	@if [ "`realpath "$(BUILDDIR)/"`" = / ]; then \
+		echo "$(TIME) ERROR: invalid BUILDDIR: \`$(BUILDDIR)'"; \
+		exit 128; \
+	fi;
 	@echo -n "$(TIME) initializing BUILDDIR: "
-	@rsync -qaH --delete image.in/ "$(BUILDDIR)"/
+	@rsync -qaxH --delete-after image.in/ "$(BUILDDIR)"/
 	@mkdir "$(BUILDDIR)"/.mki	# mkimage toplevel marker
 	@$(call put,ifndef DISTCFG_MK)
 	@$(call put,DISTCFG_MK = 1)
@@ -64,7 +68,7 @@ profile/init: distclean
 	fi
 	@if [ -w . ]; then \
 		rm -f "$(SYMLINK)" && \
-		ln -sf "$(BUILDDIR)" "$(SYMLINK)" && \
+		ln -s "$(BUILDDIR)" "$(SYMLINK)" && \
 		echo "$(SYMLINK)/"; \
 	else \
 		echo "$(BUILDDIR)/" $(SHORTEN); \
--- a/lib/sugar.mk
+++ b/lib/sugar.mk
@@ -13,3 +13,6 @@ config/pack/%: use/pack/%
 # just preconfigure
 config/name/%:
 	@$(call set,IMAGE_NAME,$*)
+
+# the final thing will pull the rest in
+build: postclean
--- a/lib/ve.mk
+++ b/lib/ve.mk
@@ -9,6 +9,9 @@ ifeq (ve,$(IMAGE_CLASS))
 ve/.bare: profile/bare
 	@$(call add,BASE_PACKAGES,basesystem)

+ve/bare: ve/.bare
+	@$(call add,BASE_PACKAGES,apt)
+
 ve/generic: ve/.bare
 	@$(call add,BASE_LISTS,\
 		$(call tags,base && (server || network || security || pkg)))
--- a/main.mk
+++ b/main.mk
@@ -0,0 +1,85 @@
+# steps to build an image:
+# --- here
+# 1. initialize new profile (BUILDDIR) as a copy of image.in/
+# 2. configure distro
+# 3. copy the needed bits from metaprofile to a new profile
+# --- in BUILDDIR
+# 4. build subprofiles and subsequently an image
+
+MKIMAGE_PROFILES = $(dir $(lastword $(MAKEFILE_LIST)))
+
+# deal with one target at a time
+IMAGE_TARGET := $(firstword $(MAKECMDGOALS))#	ve/generic.tar.gz
+ifeq (./,$(dir $(IMAGE_TARGET)))#		convenience fallback
+IMAGE_TARGET := distro/$(IMAGE_TARGET)#		for omitted "distro/"
+endif
+IMAGE_CONF    := $(firstword $(subst ., ,$(IMAGE_TARGET)))# ve/generic
+IMAGE_CLASS   := $(firstword $(subst /, ,$(IMAGE_TARGET)))# ve
+IMAGE_FILE    := $(lastword  $(subst /, ,$(IMAGE_TARGET)))# generic.tar.gz
+IMAGE_NAME    := $(firstword $(subst ., ,$(IMAGE_FILE)))#   generic
+IMAGE_TYPE    := $(subst $(IMAGE_NAME).,,$(IMAGE_FILE))#    tar.gz
+
+# readjustable
+ifeq (1,$(NUM_TARGETS))
+BUILDDIR_PREFIX ?= mkimage-profiles.build
+else
+BUILDDIR_PREFIX ?= mkimage-profiles.build/$(IMAGE_CONF).$(ARCH)
+endif
+
+# preferences
+-include $(HOME)/.mkimage/profiles.mk
+
+# most of the actual work done elsewhere
+include lib/*.mk
+include conf.d/*.mk
+include features.in/*/config.mk
+
+DISTRO_TARGETS := $(shell sed -n 's,^\(distro/[^:.]\+\):.*$$,\1,p' \
+		lib/distro.mk $(wildcard conf.d/*.mk) | sort -u)
+VE_TARGETS := $(shell sed -n 's,^\(ve/[^:.]\+\):.*$$,\1,p' \
+		lib/ve.mk $(wildcard conf.d/*.mk) | sort -u)
+DISTROS := $(call addsuffices,$(DISTRO_EXTS),$(DISTRO_TARGETS))
+VES     := $(call addsuffices,$(VE_EXTS),$(VE_TARGETS))
+IMAGES  := $(DISTROS) $(VES)
+
+.PHONY: $(IMAGES) $(DISTRO_TARGETS) $(VE_TARGETS)
+.PHONY: debug everything help space
+
+distro/help:
+	@echo '** available distribution targets:'
+	@echo $(DISTROS) | fmt -sw"$$((COLUMNS>>1))" | column -t
+
+ve/help:
+	@echo '** available virtual environment targets:'
+	@echo $(VES) | fmt -sw"$$((COLUMNS>>1))" | column -t
+
+help: | distro/help space ve/help
+space:; @echo
+
+### duplicate but still needed
+everything:
+	@n=1; sum=$(words $(DISTROS)); \
+	for distro in $(DISTROS); do \
+		echo "** building $$distro [$$n/$$sum]:"; \
+		$(MAKE) -f main.mk --no-print-directory $$distro; \
+		[ "$$n" -lt "$$sum" ] && echo; \
+		n=$$(($$n+1)); \
+	done
+
+# config/with/ve/generic config/like/ve config/name/generic config/pack/tar.gz
+$(IMAGES): debug \
+	config/with/$(IMAGE_CONF) \
+	config/like/$(IMAGE_CLASS) \
+	config/name/$(IMAGE_NAME) \
+	config/pack/$(IMAGE_TYPE) \
+	build; @:
+
+# convenience shortcut
+$(DISTROS:distro/%=%): %: distro/%
+
+debug:
+ifeq (2,$(DEBUG))
+	@$(foreach v,\
+		$(filter IMAGE_%,$(sort $(.VARIABLES))),\
+		$(warning $v = $($v)))
+endif
--- a/pkg.in/lists/Makefile
+++ b/pkg.in/lists/Makefile
@@ -24,32 +24,20 @@ all: $(TARGET) $(GLOBAL_DEBUG) $(DOTBASE)
 			$(shell cp --parents -at $(TARGET) \
 				-- $(value $V))))

-### FIXME: move to iterator/static pattern rule
+# args: name, suffix, command
+define dump-THEM
+if [ -n "$($(1)_$(2))" ]; then echo -e "\n## $(1)_$(2)"; $(3) $($(1)_$(2)); fi;
+endef
+
+dump-PACKAGES = $(call dump-THEM,$(1),PACKAGES,echo)
+dump-LISTS = $(call dump-THEM,$(1),LISTS,cat)
+
 dot-base:
 	@# construct .base packagelist for alterator-pkg
 	@{ \
 		echo "## generated by pkg.in/lists/Makefile"; \
-		if [ -n "$(BRANDING)" ]; then \
-			echo "branding-$(BRANDING)-release"; \
-		fi; \
-		if [ -n "$(SYSTEM_PACKAGES)" ]; then \
-			echo -e "\n## SYSTEM_PACKAGES\n$(SYSTEM_PACKAGES)"; \
-		fi; \
-		if [ -n "$(COMMON_PACKAGES)" ]; then \
-			echo -e "\n## COMMON_PACKAGES\n$(COMMON_PACKAGES)"; \
-		fi; \
-		if [ -n "$(THE_PACKAGES)" ]; then \
-			echo -e "\n## THE_PACKAGES\n$(THE_PACKAGES)"; \
-		fi; \
-		if [ -n "$(BASE_PACKAGES)" ]; then \
-			echo -e "\n## BASE_PACKAGES\n$(BASE_PACKAGES)"; \
-		fi; \
-		if [ -n "$(THE_LISTS)" ]; then \
-			echo -e "\n## THE_LISTS"; cat $(THE_LISTS); \
-		fi; \
-		if [ -n "$(BASE_LISTS)" ]; then \
-			echo -e "\n## BASE_LISTS"; cat $(BASE_LISTS); \
-		fi; \
+		$(foreach p,SYSTEM COMMON THE BASE,$(call dump-PACKAGES,$(p))) \
+		$(foreach l,THE BASE,$(call dump-LISTS,$(l))) \
 	} | sed -re '/^[^[:space:]#]/ s/[[:space:]]+/\n/g' >$(TARGET)/.base
 	@if [ -n "$(THE_GROUPS)$(MAIN_GROUPS)" ]; then \
 		cp -at $(TARGET) -- $(THE_GROUPS) $(MAIN_GROUPS); \
--- a/pkg.in/lists/ltsp
+++ b/pkg.in/lists/ltsp
@@ -0,0 +1,25 @@
+ltsp-server
+ltsp-server-basic
+
+alterator-ltsconf
+
+alsa-plugins
+alsa-plugins-pulse
+
+syslinux
+mkisofs
+
+#kde-settings-kded-no_media_popup
+
+#docs-install_ltsp
+#docs-issue-desktop_personal
+
+installer-feature-ltsp-stage3
+
+# Set available online repository and some useful utilites from /sbin
+installer-feature-symlinks-from-sbin
+installer-feature-online-repo
+
+####
+vim-console
+cpio
--- a/pkg.in/lists/ltsp-client
+++ b/pkg.in/lists/ltsp-client
@@ -0,0 +1,5 @@
+ltsp-client
+ltsp-client-full
+ltsp-client-nxsession
+# ouch!
+mc
--- a/pkg.in/lists/ltsp-client.i586
+++ b/pkg.in/lists/ltsp-client.i586
@@ -0,0 +1,3 @@
+kernel-image-ltsp-client
+kernel-modules-drm-ltsp-client
+kernel-modules-alsa-ltsp-client
--- a/pkg.in/lists/ltsp-client.x86_64
+++ b/pkg.in/lists/ltsp-client.x86_64
@@ -0,0 +1,3 @@
+kernel-image-std-def
+kernel-modules-drm-std-def
+kernel-modules-alsa-std-def
--- a/pkg.in/lists/server-base
+++ b/pkg.in/lists/server-base
@@ -7,4 +7,5 @@ mdadm
 openssh-server
 openssh-clients
 openssh-blacklist
+screen
 acpid
--- a/pkg.in/lists/tagged/rescue+extra
+++ b/pkg.in/lists/tagged/rescue+extra
@@ -8,8 +8,10 @@ bonnie++
 cfdisk
 ddrescue
 disktype
-evms
-evms-ncurses
+# NB: EVMS must be off by default as "normal" /dev/sd*
+#     would suddenly get busy otherwise
+#evms
+#evms-ncurses
 fdisk
 gpart
 iotop
@@ -67,8 +69,10 @@ iftop
 iproute2
 iptables
 iputils
+lft
 lftp
 mailx
+mtr
 netcat
 netlist
 nfs-utils
@@ -99,3 +103,6 @@ mc
 # Development/Debuggers
 strace
 sysstat
+
+# win32
+chntpw
--- a/pkg.in/lists/tagged/rescue+fs
+++ b/pkg.in/lists/tagged/rescue+fs
@@ -1,3 +1,4 @@
+#anyfs-tools
 cpipe
 dar
 ddrescue
--- a/pkg.in/lists/xorg
+++ b/pkg.in/lists/xorg
@@ -21,12 +21,13 @@ xorg-drv-wacom
 xorg-drv-wizardpen
 xorg-drv-qxl

+# #25044?
+xorg-dri-intel
+
 # for those who need these
 xorg-drv-keyboard
 xorg-drv-mouse

-#xorg-dri-*
-
 xauth
 xorg-utils
 #xorg-extensions*
--- a/sub.in/stage1/Makefile
+++ b/sub.in/stage1/Makefile
@@ -11,6 +11,7 @@ include $(MKIMAGE_PREFIX)/config.mk
 ifndef BOOTLOADER
 $(error BOOTLOADER not defined)
 endif
+GLOBAL_BOOTLOADER := $(BOOTLOADER)

 MKI_PACK_RESULTS = data
 PROPAGATOR_VERSION = ALT Linux
@@ -38,15 +39,15 @@ CHROOT_PACKAGES_REGEXP += $(STAGE1_PACKAGES_REGEXP)
 CHROOT_PACKAGES = $(STAGE1_PACKAGES) $(SYSTEM_PACKAGES)

 # scripts prepare bootloader configuration, too
-# NB: we pass tested squashfs options for ../install2/Makefile
+# NB: we pass tested squashfs options for ../stage2/Makefile to include
 all: | debug prepare-workdir copy-tree run-scripts $(BUILD_PROPAGATOR) \
 	copy-$(BOOTLOADER) $(COPY_SQUASHCFG) pack-image $(GLOBAL_CLEAN_WORKDIR)
-	@if test -s $(OUTDIR)/squashcfg.mk; then \
+	@if [ -s $(OUTDIR)/squashcfg.mk ]; then \
 		cp $(OUTDIR)/squashcfg.mk $(GLOBAL_BUILDDIR)/; \
 	fi

 debug:
-	@if test -n "$(GLOBAL_VERBOSE)"; then \
+	@if [ -n "$(GLOBAL_VERBOSE)" ]; then \
 		echo "** BRANDING: $(BRANDING)"; \
 		echo "** IMAGE_INIT_LIST: $(IMAGE_INIT_LIST)"; \
 		echo "** STAGE1_PACKAGES: $(STAGE1_PACKAGES)"; \
Author	SHA1	Message	Date
Michael Shigorin	0ad3c6b8bd	0.5.5-alt1 - live-related tweaks (including live.hooks support) - terminal server and webkiosk images	2012-02-06 17:09:33 +02:00
Michael Shigorin	f044bdbc33	xorg: added xorg-dri-intel explicitly xorg-drv-intel doesn't pull it in at the moment: https://bugzilla.altlinux.org/25044	2012-02-06 13:14:35 +02:00
Michael Shigorin	202f473499	conf.d/live.mk: live-webkiosk += live.hooks Rather convenient for native flash images but can also be beneficial with usual ISO by editing one before burning it.	2012-02-06 12:58:20 +02:00
Michael Shigorin	97e1be6a31	features.in/live: introduced live.hooks support The implementation builds upon liveflash.eeepc by gns@; thanks <sol/codis.ru> who suggested adding it to live-webkiosk	2012-02-06 12:58:20 +02:00
Michael Shigorin	c39c100cdc	conf.d/live.mk: initial live-webkiosk This one starts up a Firefox session in kiosk mode (there are several extensions, I find hsv@'s one preferable) and tries to browse /image/index.html which corresponds to index.html in the image root (could be edited by means of e.g. isomaster).	2012-02-06 12:58:20 +02:00
Michael Shigorin	bc091ab919	conf.d/live.mk: factor commons into distro/.live-x11 It's rather unexpected that someone would do an X11 LiveCD without user autologin -- but even if that's the case, then this waypoint is just not used for it.	2012-02-06 12:58:20 +02:00
Michael Shigorin	8b39c4af27	lists/tagged/rescue+extra += chntpw Thanks ildar@ for the reminder: http://www.altlinux.org/Talk:ALT_Linux_5.0_Rescue	2012-02-06 12:58:20 +02:00
Michael Shigorin	6cd6a0ff0d	features.in/bootloader: mind the make Document the one-way nature of bootloader type switching.	2012-02-06 12:58:20 +02:00
Michael Shigorin	7a3ab55db4	image.in/Makefile: fixed thinko regression MKI_VERSION was tested against even before the config.mk that defines it got included. Ouch.	2012-02-06 12:58:20 +02:00
Michael Shigorin	0c97aaf80b	ltsp-icewm += firefox That way it's at least marginally useful...	2012-02-06 12:58:20 +02:00
Michael Shigorin	01a03d037b	features.in/ltsp: support x86_64 clients Courtesy of prividen@, there's actual x86_64 client support in ALTSP. Although led@ tells that it's i586 optimization that hurts on i686+ and should be replaced with either i486 or i686 for that matter...	2012-02-06 12:58:20 +02:00
Michael Shigorin	33fe8cbd1f	initial ltsp feature Sort of builds on current Sisyphus with ltsp-related packages fixed up in a pocket but the latter are rather in need of some proper face-lift.	2012-02-06 12:58:20 +02:00
Michael Shigorin	178a700e6e	03-test-kernel: tweak squashfs compression A larger block size was recommended by led@; gns@ seems to concur as the 512k value was borrowed from liveflash.eeepc profile (along with -noI). The other issue is with binary specific compressors: x86 was clearly assumed while the data for an educated guess are pretty handy. Please note that using filters incurs additional compression attempts for the utility to choose the best result.	2012-01-18 23:33:29 +02:00
Michael Shigorin	3fcbed3378	features.in/live: added 90-cleanup-boot script Spotted /boot/vmlinuz* in a live environment, and wondered why waste a few megs of potentially precious space...	2012-01-18 23:11:04 +02:00
Michael Shigorin	d9a0d305ee	gear-store-tags	2012-01-16 22:38:37 +02:00
Michael Shigorin	8473fda02d	0.5.4-alt1 - better diags for initial deployment	2012-01-17 00:36:43 +04:00
Michael Shigorin	9304c12c58	fix toplevel arch/distro loops There was a somewhat subtle Makefile->main.mk rename leftover lurking in "everything" target: the default Makefile got used, not the supposed main.mk -- which resulted in an attempt to get way too much job done (the number of builds per target became $ARCH squared, not just $ARCH). Huge thanks to led@ for being an inspiring pedantic!	2012-01-17 00:32:54 +04:00
Michael Shigorin	b95caa9b73	lib/ve.mk: introduced ve/bare A minimal chroot supporting extension via apt-get; vitals if built on Sisyphus as of Jan 16, 2012: i586: 13M tar.xz, 58M chroot (33M w/o /usr/share/{doc,locale,man}) x86_64: 14M tar.xz, 60M chroot (35M w/o /usr/share/{doc,locale,man}) Trivial fixups (extra checks) added to two script hooks.	2012-01-16 20:10:16 +04:00
Michael Shigorin	804cedbca5	features.in/build-distro: initial isosort implementation mkisofs can use hints on file disposition; this needs some support on mkimage side but that's pretty trivial (hope to see it in 0.2.2+).	2012-01-15 23:00:19 +02:00
Michael Shigorin	efa73b97f0	sub.in/stage1/Makefile: comment fixup Referring to install2 subprofile after it got generalized and renamed to stage2 is an omission, better fix it late than never.	2012-01-11 15:54:59 +02:00
Michael Shigorin	5a7b6b5739	icewm.iso: use desktop installer It's burdensome for testing but at least the result is somewhat useful then.	2012-01-11 15:54:55 +02:00
Michael Shigorin	df0861ad02	Makefile: dummy commit The point is to give Colin S. Miller the credit for a hack to get the current goal's word-in-a-list position: http://lists.gnu.org/archive/html/help-gnu-utils/2010-05/msg00004.html	2012-01-11 12:23:12 +02:00
Michael Shigorin	37f050d227	features.in/bootloader: README update The dependency is actually long gone since the current hack is to just replace hardwired "grub" in an installer-steps with whatever got configured...	2012-01-11 10:35:52 +02:00
Michael Shigorin	5a1065c33e	bin/mktmpdir: check for filesystem mount options As was found out by Vladimir Karpinsky (thanks for patience!), the autochosen directory might still have too restrictive mount options -- nodev and/or noexec. Hopefully the diags are a bit better and faster by now.	2012-01-10 16:00:56 +02:00
Michael Shigorin	87bfa3f65d	check vigorously the autochosen path prefix either It happens that if the host environment isn't particularly tuned up for package builds already then bin/mktmpdir might come up with a directory outside hasher-allowed prefix list; now that's a shame and not a Christmas gift, clearly. Thanks Vladimir Karpinsky for pointing this problem out too.	2012-01-06 19:15:07 +02:00
Michael Shigorin	0ec7d7cd01	check vigorously for installed mkimage It was briefly mentioned in QUICKSTART but somehow managed to evade the commandlines provided. And while at it, let's make errors like this more explicit to avoid extra lookups. Oh, and fix QUICKSTART so that readers miss the hassle. :) Thanks Vladimir Karpinsky for pointing this problem out.	2012-01-04 22:33:53 +02:00
Michael Shigorin	426c985da3	syslinux: piggybacking cleanups Avoid extra files where a variable would suffice; and use the more specific "syslinux.list" rather than a "files.list".	2012-01-04 15:50:01 +02:00
Michael Shigorin	8fbf3585b0	40-autologin: don't do runlevel 5 if X is absent We can do textmode live images, after all. Some sort of autologin would be useful there too but doing it right is less obvious to me at the moment...	2012-01-03 15:09:33 +02:00
Michael Shigorin	a7ac4f236c	gear-store-tags	2012-01-02 21:01:33 +02:00
Michael Shigorin	672125b9e5	0.5.3-alt1 - multi-target, multi-arch, single-job builds	2012-01-02 21:01:09 +02:00
Michael Shigorin	e93d6cabca	docs: minor updates doc/variables.txt was missing the already-existing BUILDLOG variable description, and ARCHES got added during multi-target toplevel rewrite. Other minor fixes come as appropriate.	2012-01-02 21:01:09 +02:00
Michael Shigorin	7738c6a67d	bin/mktmpdir tweaks The fallback case of building in a brother directory moved from the last line of code to the first one becoming more explicit along the way. Support for slash-containing argument (being a tmpdir name template prefix) has been added.	2012-01-02 21:01:09 +02:00
Michael Shigorin	2f307ffffb	main.mk introduced, lib/*.mk partially rewritten The former toplevel Makefile is now toplevel main.mk; this change allows for multi-target, multi-arch processing in the current toplevel Makefile. As the "build" symlink semantics change quite considerably when one is doing bulk builds (several pruned builddirs might be useful for comparison), BUILDDIR is now much more likely to be recreated: the cases when it will persist are when it's either a single-image build or when the prefix hasn't changed. There are some more or less subtle bugfixes and enhancements all over the map as well. Done within 20111230..20120102 timeframe, actually...	2012-01-02 21:01:09 +02:00
Michael Shigorin	3d2f69f112	lib/{clean,profile}.mk: robustness improvements First, let's not do rsync --delete on an unverified target dir again: the lesson was learned during a subway hacking session and I must say that SSDs are frightening fast (even if it was more than a second to realize what happens and terminate the extermination before it got /home, thanks xterm). Second, let's use a variable for common name and make's own realpath function instead of external binary.	2012-01-02 21:01:09 +02:00
Michael Shigorin	abfd88e262	06syslog: more durability At least it shouldn't bail out when the anticipated file just isn't there...	2011-12-26 18:36:37 +02:00
Michael Shigorin	96e89d0062	s/subst/sed -i/g Initial openSUSE package base taming effort has shown that relatively few things should be fixed; subst has been generalized as -i option to sed(1) since its introduction, so let's just fix it.	2011-12-26 18:21:22 +02:00
Michael Shigorin	643d4a753d	p/l/Makefile: refactor repetitive actions _PACKAGES and _LISTS shouldn't inflict copypasted blocks; we can iterate over these just fine. NB: dump-, not dump_, due to namespace pollution hurting debug target if done the latter way (in case someone misses the morning tea as wel).	2011-12-26 16:34:20 +02:00
Michael Shigorin	90d7a6142a	rescue: drop evms by default As current devmapper doesn't allow for simultaneous mounts of virtually the same device by different names (signalled by "Device or resource busy" when trying to e.g. mount /dev/sda2 but with /dev/evms/sda2 being just fine), EVMS triggering such behaviour but rarely needed should be avoided altogether until a hook to disable it is in place.	2011-12-21 21:13:38 +02:00
Michael Shigorin	180ed5359c	"if test ..." replaced by "if [ ... ]" Fixed up the remnants of the early style mix to correspond to the proposed doc/style.txt; the rationale being that if [ ... ]; then ... ... fi is the more readable construct among itself, if test ...; then ... ... fi and [ ... ] && { ... ... } due to the condition being more distinguishable when bracketed and the body more apparent as the one inside "if" and not any other block; the less obvious difference is that the final construct of the latter form is prone to the whole script exit status being non-zero if the condition isn't met.	2011-12-21 12:14:03 +02:00
Michael Shigorin	a8ccfb3d41	firmware related fixups - it wasn't firmware-carl9170 but firmware-carl9170-1.9.4 - firmware-linux Obsoletes: firmware-iwl* since 20110520-alt1	2011-12-20 16:13:14 +02:00
Michael Shigorin	d3351bb8b7	server, rescue pkglists: minor additions screen(1) is definitely the part of a server; tmux(1) can also be installed of course. Thanks vvk@ (#15887).	2011-12-20 14:03:05 +02:00
Michael Shigorin	d9585b48fb	gear-store-tags	2011-12-19 22:50:34 +02:00