0.5.4-alt1

- better diags for initial deployment

.gear/mkimage-profiles.spec

@@ -1,5 +1,5 @@
 Name: mkimage-profiles
-Version: 0.5.2
+Version: 0.5.4
 Release: alt1
 
 Summary: ALT Linux based distribution metaprofile
@@ -59,6 +59,12 @@ cp -a * %buildroot%mpdir
 %doc README QUICKSTART
 
 %changelog
+* 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

.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

.gear/tags/4d92978230ee015e53f81c2f29f4ec40d8bcc822

@@ -0,0 +1,6 @@
+object 672125b9e588b0a0bc6587680faf164da9f25af7
+type commit
+tag v0.5.3
+tagger Michael Shigorin <mike@altlinux.org> 1325530888 +0200
+
+main.mk

.gear/tags/list

@@ -1 +1 @@
-461cfaf9fc1fffe08daf223d04fd3f52edd21c16 v0.5.1
+4d92978230ee015e53f81c2f29f4ec40d8bcc822 v0.5.3

Makefile

@@ -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

QUICKSTART

@@ -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

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%/.}"

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 \

doc/assumptions.txt

@@ -1,5 +1,8 @@
 предположения фрагментов кода об окружении
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+NB: пути приводятся от верхнего уровня
+
 - pkg.in/lists/Makefile
   + ожидает, что названия пакаджлистов указываются в переменных
     вида *_LISTS, и копирует в генерируемый профиль только их

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
   + включает режим проверки сборки конфигурации
   + значение: пусто (по умолчанию) либо любая строка

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; \

features.in/README

@@ -4,7 +4,7 @@
 
 Каждая фича должна содержать задействуемый при построении
 конфигурации будущего образа файл config.mk, включаемый
-в ../Makefile; он может описывать одну или более целей
+в ../main.mk; он может описывать одну или более целей
 вида use/*, дополняющих конфигурацию, и при наличии
 дополнительных хуков для копирования или generate.*
 обязан добавить имя фичи в $(FEATURES), для чего

features.in/bootloader/README

@@ -5,6 +5,4 @@
 систему (он НЕ должен требоваться пакету installer-distro-*)
 и требует пакет выбранного загрузчика.
 
-Реализация экспериментальная (нужно модуляризовать installer-steps),
-пока завязана на installer-distro-altlinux-generic (TODO).  Возможно,
-с использованием alterator-lilo связаны проблемы времени установки.
+Реализация экспериментальная (нужно модуляризовать installer-steps).

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)
 

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__

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
 :

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

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"

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

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.*)

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

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

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
 

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)"; \

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)

image.in/Makefile

@@ -10,8 +10,10 @@ MKI_VER_OPTIMAL = 0.2.0
 
 include distcfg.mk
 include functions.mk
-include $(MKIMAGE_PREFIX)/config.mk
 
+ifeq (,$(realpath $(MKIMAGE_PREFIX)/config.mk))
+$(error please apt-get install mkimage and have a look at QUICKSTART as well)
+endif
 ifeq (-,$(shell rpmvercmp $(MKI_VERSION) $(MKI_VER_MINIMAL) | tr -d [0-9]))
 $(info error: mkimage-$(MKI_VERSION) is too old, please upgrade)
 $(error mkimage is too old, $(MKI_VER_MINIMAL) is minimal supported version)
@@ -21,6 +23,8 @@ $(info warning: mkimage-$(MKI_VERSION) is suboptimal, consider upgrading)
 $(warning consider upgrading mkimage to $(MKI_VER_OPTIMAL) or better)
 endif
 
+include $(MKIMAGE_PREFIX)/config.mk
+
 # reconstruct instead of passing yet another variable
 IMAGE_LINK := $(IMAGE_NAME).$(IMAGE_TYPE)
 IMAGE_OUTFILE := $(IMAGE_NAME)-$(DATE)-$(ARCH).$(IMAGE_TYPE)
@@ -60,5 +64,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)"

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)
 

lib/README

@@ -3,5 +3,5 @@
 конфигурации образа и генерации соответствующего
 профиля для сборки; см. тж. ../conf.d/.
 
-Следует помнить, что будучи включаемыми в ../Makefile,
+Следует помнить, что будучи включаемыми в ../main.mk,
 они работают в каталоге верхнего уровня.

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; \

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 ||:

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
 

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),~,'"; \
+)

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); \

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

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)))

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

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); \

pkg.in/lists/server-base

@@ -7,4 +7,5 @@ mdadm
 openssh-server
 openssh-clients
 openssh-blacklist
+screen
 acpid

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

pkg.in/lists/tagged/rescue+fs

@@ -1,3 +1,4 @@
+#anyfs-tools
 cpipe
 dar
 ddrescue

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)"; \