0.7.5-alt1

- a bunch of fixups and cleanups

.gear/mkimage-profiles.spec

@@ -1,5 +1,5 @@
 Name: mkimage-profiles
-Version: 0.7.0
+Version: 0.7.5
 Release: alt1
 
 Summary: ALT Linux based distribution metaprofile
@@ -61,6 +61,21 @@ cp -a * %buildroot%mpdir
 %doc README QUICKSTART
 
 %changelog
+* Mon Jul 30 2012 Michael Shigorin <mike@altlinux.org> 0.7.5-alt1
+- a bunch of fixups and cleanups
+
+* Mon Jul 16 2012 Michael Shigorin <mike@altlinux.org> 0.7.4-alt1
+- ppc builds
+
+* Mon Jul 09 2012 Michael Shigorin <mike@altlinux.org> 0.7.3-alt1
+- arm builds
+
+* Mon Jul 02 2012 Michael Shigorin <mike@altlinux.org> 0.7.2-alt1
+- simply fixes
+
+* Mon Jun 25 2012 Michael Shigorin <mike@altlinux.org> 0.7.1-alt1
+- vm improvements and assorted tweaks/fixes
+
 * Mon Jun 18 2012 Michael Shigorin <mike@altlinux.org> 0.7.0-alt1
 - new features:
   + initial build-vm

.gear/tags/5c3b721d4cfae520e1fae593de6dd128da862699

@@ -1,6 +0,0 @@
-object ebeb52b5da710cf354f4e2bea16d3d72e2ad052e
-type commit
-tag v0.6.8
-tagger Michael Shigorin <mike@altlinux.org> 1338232536 +0300
-
-fixups

.gear/tags/86f3e957f38ad46ca4305e7ce190e36b0d9d71ff

@@ -0,0 +1,6 @@
+object 0a3aaf15c2a8d8860e6e05729ad8ad3a706675a9
+type commit
+tag v0.7.4
+tagger Michael Shigorin <mike@altlinux.org> 1342463836 +0300
+
+ppc builds

.gear/tags/list

@@ -1 +1 @@
-5c3b721d4cfae520e1fae593de6dd128da862699 v0.6.8
+86f3e957f38ad46ca4305e7ce190e36b0d9d71ff v0.7.4

Makefile

@@ -10,7 +10,7 @@ ifndef ARCHES
 ifdef ARCH
 ARCHES := $(ARCH)
 else
-ARCHES := $(shell arch | sed 's/i686/i586/')
+ARCHES := $(shell arch | sed 's/i686/i586/; s/armv.*/arm/; s/ppc.*/ppc/')
 endif
 endif
 export ARCHES
@@ -26,7 +26,7 @@ endif
 # recursive make considered useful for m-p
 MAKE += -r --no-print-directory
 
-DIRECT_TARGETS := clean distclean check help help/distro help/ve
+DIRECT_TARGETS := help help/distro help/ve help/vm clean distclean check
 .PHONY: $(DIRECT_TARGETS)
 $(DIRECT_TARGETS):
 	@$(MAKE) -f main.mk $@
@@ -36,6 +36,9 @@ export NUM_TARGETS := $(words $(MAKECMDGOALS))
 # for pipefail
 SHELL = /bin/bash
 
+# don't even consider remaking a configuration file
+.PHONY: $(HOME)/.mkimage/profiles.mk
+
 # real targets need real work
 %:
 	@n=1; \
@@ -50,7 +53,7 @@ SHELL = /bin/bash
 	fi; \
 	for ARCH in $(ARCHES); do \
 		if [ "$$ARCH" != "$(firstword $(ARCHES))" ]; then say; fi; \
-		say "** ARCH: $$ARCH" >&2; \
+		say "** ARCH: $$ARCH"; \
 		if $(MAKE) -f main.mk ARCH=$$ARCH $@ $(POSTPROC); then \
 			if [ -n "$$REPORT" ]; then \
 				$(MAKE) -f reports.mk ARCH=$$ARCH; \

QUICKSTART

@@ -1,3 +1,6 @@
+English quickstart: make server-mini.iso; see also
+http://en.altlinux.org/Hasher (a large tmpfs is nice).
+
 требуется
 ~~~~~~~~~
 - ALT Linux 6.0 или выше (возможна адаптация "вниз")
@@ -18,13 +21,13 @@
 # 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
+- тестовая сборка (см. тж. lib/distro.mk, doc/params.txt):
+$ make icewm.iso
 
 ссылки
 ~~~~~~

README

@@ -1,15 +1,16 @@
 Welcome to mkimage-profiles!
 
-English quickstart: make server-mini.iso;
-see http://en.altlinux.org/Hasher (and a large tmpfs).
-
 Configurables: ~/.mkimage/profiles.mk;
-see doc/variables.txt and conf.d/README
+see doc/params.txt and conf.d/README
 
 License: GPLv2+, see COPYING
 
 Most docs are in Russian, welcome to learn it or ask for English.
-См. тж. http://www.altlinux.org/Mkimage/Profiles/m-p
+
+См. тж. http://www.altlinux.org/Mkimage/Profiles/m-p и doc/*.txt:
+- params.txt: переменные, указываемые при запуске сборки
+- features.txt: обзор подключаемых особенностей
+- pkglists.txt: формирование состава образа
 
 Задача:
 - конфигурирование и создание образов на базе ALT Linux
@@ -33,7 +34,7 @@ Most docs are in Russian, welcome to learn it or ask for English.
 
 Объекты:
 - дистрибутивы и виртуальные среды/машины:
-  + описываются в conf.d/*.mk или соответственно lib/{distro,ve}.mk
+  + описываются в conf.d/*.mk или соответственно lib/{distro,ve,vm}.mk
   + могут основываться на предшественниках, расширяя их
   + дистрибутивы также:
     - включают один или более субпрофилей по надобности
@@ -58,4 +59,4 @@ Most docs are in Russian, welcome to learn it or ask for English.
   + указанный явно,
   + либо ~/out/ (если возможно),
   + или $(BUILDDIR)/out/ иначе
-- формируются отчёты, если запрошены (REPORTS)
+- формируются отчёты, если запрошены (REPORT)

bin/mktmpdir

@@ -12,7 +12,7 @@ try_source() { [ -f "$1" ] && . "$1"; }
 # hasher accepted ones
 get_prefices()
 {
-	try_source /etc/hasher-priv/system
+	try_source /etc/hasher-priv/system || exit 1
 	try_source `/usr/libexec/hasher-priv/getconf.sh`
 	echo "$prefix" | tr ':' '\n' | while read i; do realpath "$i"; done
 }
@@ -43,7 +43,7 @@ choose_tmpdir() {
 	for i in "$@"; do
 		[ -d "$i" -a -w "$i" ] || continue
 		echo -n "$i "
-		df -Tl "$i" | tail -1
+		df -PT "$i" | tail -1
 	done \
 	| sort -unk6 \
 	| while read dir dev fstype size used free percent mnt; do
@@ -61,19 +61,19 @@ choose_tmpdir() {
 # 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
+	echo "error: no suitable directories found;"
+	echo "please check QUICKSTART, filesystem and hasher setup"
+	echo "(mount enough tmpfs into /tmp or fix hasher-priv prefix?)"
 	exit 1
-fi
+fi >&2
 
 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
+	echo "error: no suitable directories found;"
+	echo "please check hasher docs and filesystem setup"
+	echo "(nodev and/or noexec on an otherwise suitable filesystem?)"
 	exit 1
-fi
+fi >&2
 
 DIR="$TEMP/`dirname "$1"`"
 NAME="`basename "${1:-tmpdir}"`"

bin/tar2vm

@@ -1,4 +1,4 @@
-#!/bin/sh -e
+#!/bin/bash -e
 
 . shell-error
 
@@ -27,10 +27,10 @@ IMG="$2"
 
 # image size in bytes (256M is a fallback)
 TARSIZE="$(stat -Lc %s "$TAR")"
-DEFSIZE="$(expr 3 '*' "$TARSIZE" '/' 2)"
+DEFSIZE="$((3 * $TARSIZE / 2))"
 DISKSIZE="${3:-${DEFSIZE:-268435456}}"
 # ...and in megabytes
-DISKSIZEM="$(expr "$DISKSIZE" / 1048576)"
+DISKSIZEM="$(($DISKSIZE / 1048576))"
 
 # tested to work: ext[234], jfs
 ROOTFSTYPE="${4:-ext4}"
@@ -68,7 +68,8 @@ trap exit_handler EXIT
 
 # prepare disk image and a filesystem inside it
 rm -f -- "$IMG"
-dd if=/dev/zero of="$IMG" bs=1 count=1 seek="$DISKSIZE" conv=notrunc
+dd if=/dev/zero of="$IMG" conv=notrunc \
+	bs=1 count=1 seek="$(($DISKSIZE - 1))"
 losetup "$LOOPDEV" "$IMG"
 
 parted --script "$LOOPDEV" mklabel msdos

conf.d/README

@@ -10,22 +10,27 @@
 
 Попросту говоря, copy-paste -- тревожный признак.
 
-По переменным:
+По переменным (см. тж. ../doc/pkglists.txt):
+
+- для пользовательского окружения (live, main) предназначены
+  THE_PACKAGES, THE_LISTS, THE_GROUPS, THE_PACKAGES_REGEXP
+
+- для "обычного общего" (live, main, rescue) есть COMMON_PACKAGES
+  (NB: тоже попадают в базовую установку)
+
 - SYSTEM_PACKAGES стоит применять крайне осторожно -- эти пакеты попадут
   во все стадии, в том числе в образ чувствительной к объёму install2
   (в stage1 -- только в инструментальный чрут); применяйте для того,
   что обязано быть и в инсталяторе, и в готовой системе
-- для "обычного общего" (live, main, rescue) есть COMMON_PACKAGES
-  (NB: попадают в базовую систему)
-- для "пользовательского" окружения (live, main) предназначены
-  THE_PACKAGES, THE_LISTS, THE_GROUPS, THE_PACKAGES_REGEXP
-- для строго направленного действия служат:
+
+- для направленного действия служат:
   + STAGE1_PACKAGES, STAGE1_PACKAGES_REGEXP (первая стадия загрузки)
   + STAGE2_PACKAGES (инсталятор и спасательная/"живая" система)
   + INSTALL2_PACKAGES (инсталятор)
   + BASE_PACKAGES, BASE_LISTS, BASE_PACKAGES_REGEXP (базовая система)
   + MAIN_PACKAGES, MAIN_LISTS, MAIN_PACKAGES_REGEXP (дополнительные пакеты)
   + LIVE_PACKAGES, LIVE_LISTS, LIVE_PACKAGES_REGEXP ("живая" система)
+
 - аналогично по модулям ядра:
   + THE_KMODULES попадут в "пользовательскую" среду (live, main)
   + STAGE1_KMODULES доступны в производных от stage2 (install2, live, rescue)
@@ -33,6 +38,8 @@
   + MAIN_KMODULES будут доступны для установки с носителя
   + LIVE_KMODULES предназначены для LiveCD/LiveFlash
 
+Не стоит бояться такого разнообразия, для большинства задач достаточно THE_*.
+
 По подстановкам:
 - $(VAR) подставляются перед их записью в $(CONFIG), который distcfg.mk
 - $$(VAR) раскрываются позже, при включении $(CONFIG) и востребовании

conf.d/desktop.mk

@@ -7,6 +7,7 @@ distro/.desktop-base: distro/.installer use/syslinux/ui/vesamenu use/x11/xorg
 distro/.desktop-mini: distro/.desktop-base use/x11/xdm +power; @:
 
 distro/.desktop-network: distro/.desktop-mini +vmguest
+	@$(call add,SYSTEM_PACKAGES,fonts-ttf-google-croscore-arimo)
 	@$(call add,BASE_LISTS, \
 		$(call tags,(base || desktop) && (l10n || network)))
 

conf.d/live.mk

@@ -20,7 +20,8 @@ distro/live-isomd5sum: distro/.base use/live/base use/isomd5sum
 	@$(call add,LIVE_PACKAGES,livecd-isomd5sum)
 
 distro/live-builder: pkgs := livecd-tmpfs livecd-online-repo mkimage-profiles
-distro/live-builder: distro/.live-base use/dev/mkimage use/dev/repo
+distro/live-builder: distro/.live-base use/dev/mkimage use/dev/repo \
+	use/syslinux/timeout/30
 	@$(call set,KFLAVOURS,$(BIGRAM))
 	@$(call add,LIVE_LISTS,$(call tags,base && (server || builder)))
 	@$(call add,LIVE_PACKAGES,zsh sudo)
@@ -28,7 +29,7 @@ distro/live-builder: distro/.live-base use/dev/mkimage use/dev/repo
 	@$(call add,MAIN_PACKAGES,$(pkgs))
 	@$(call add,MAIN_PACKAGES,syslinux pciids memtest86+ mkisofs)
 
-distro/live-install: distro/.live-base use/live/textinst; @:
+distro/live-install: distro/.live-base use/live/textinstall; @:
 distro/.livecd-install: distro/.live-base use/live/install; @:
 
 distro/live-icewm: distro/.live-desktop use/live/autologin +icewm; @:
@@ -38,7 +39,7 @@ distro/live-plymouth: distro/.live-base use/plymouth/live; @:
 
 distro/live-rescue: distro/live-icewm
 	@$(call add,LIVE_LISTS,$(call tags,rescue && (fs || live || x11)))
-	@$(call add,LIVE_LISTS, \
+	@$(call add,LIVE_LISTS,openssh \
 		$(call tags,(base || extra) && (archive || rescue || network)))
 
 distro/live-webkiosk-mini: distro/.live-kiosk use/live/hooks use/live/ru
@@ -46,6 +47,12 @@ distro/live-webkiosk-mini: distro/.live-kiosk use/live/hooks use/live/ru
 	@$(call add,LIVE_PACKAGES,livecd-webkiosk)
 	@$(call add,CLEANUP_PACKAGES,'libqt4*' 'qt4*')
 
+# NB: flash/java plugins are predictable security holes
+distro/live-webkiosk-flash: distro/live-webkiosk-mini use/plymouth/live +vmguest
+	@$(call add,LIVE_PACKAGES,mozilla-plugin-adobe-flash)
+	@$(call add,LIVE_PACKAGES,mozilla-plugin-java-1.6.0-sun)
+	@$(call add,LIVE_PACKAGES,alsa-utils udev-alsa)
+
 distro/live-webkiosk: distro/live-webkiosk-mini use/live/desktop; @:
 
 distro/live-flightgear: distro/live-icewm use/live/sound use/x11/3d-proprietary
@@ -69,4 +76,7 @@ distro/live-gimp: distro/live-icewm use/x11/3d-free use/live/ru
 	@$(call add,LIVE_PACKAGES,qtfm openssh-clients rsync)
 	@$(call add,LIVE_PACKAGES,design-graphics-sisyphus2)
 
+distro/live-testserver: distro/live-install use/server/mini
+	@$(call set,KFLAVOURS,std-def el-smp)
+
 endif

conf.d/server.mk

@@ -2,20 +2,15 @@
 ifeq (distro,$(IMAGE_CLASS))
 
 distro/.server-base: distro/.installer use/syslinux/ui/menu use/memtest
-	@$(call add,BASE_LISTS,server-base)
+	@$(call add,BASE_LISTS,server-base openssh)
 
 distro/server-nano: distro/.server-base \
-	use/cleanup/x11-alterator use/bootloader/lilo
+	use/cleanup/x11-alterator use/bootloader/lilo +power
 	@$(call add,BASE_LISTS,$(call tags,server network))
 	@$(call add,BASE_PACKAGES,dhcpcd cpio)
 
-distro/server-mini: distro/.server-base use/cleanup/x11-alterator
+distro/server-mini: distro/.server-base use/server/mini use/cleanup/x11-alterator
 	@$(call set,KFLAVOURS,el-smp)
-	@$(call add,THE_KMODULES,e1000e igb)
-	@$(call add,STAGE1_KMODULES,e1000e igb)
-	@$(call add,BASE_LISTS,\
-		$(call tags,base && (server || network || security || pkg)))
-	@$(call add,BASE_LISTS,$(call tags,extra (server || network)))
 
 distro/server-systemd: distro/server-mini use/systemd
 	@$(call set,KFLAVOURS,std-def)

conf.d/simply.mk

@@ -6,6 +6,6 @@ distro/live-simply: distro/.livecd-install use/slinux/full
 	@$(call add,THE_LISTS,slinux/live-install)
 
 distro/simply: distro/.installer use/slinux/full
-	@$(call set,INSTALLER,desktop)
+	@$(call set,INSTALLER,simply-linux)
 
 endif

conf.d/vm.mk

@@ -0,0 +1,13 @@
+# virtual machines
+ifeq (vm,$(IMAGE_CLASS))
+
+# NB: use/x11 employs some installer-feature packages
+vm/icewm: vm/bare use/cleanup/installer use/x11/xdm +icewm; @:
+
+vm/net: vm/bare use/vm-net/dhcp use/vm-ssh; @:
+
+vm/net-static: vm/bare use/vm-net/static use/vm-ssh
+	@$(call set,VM_NET_IPV4ADDR,10.0.2.16/24)
+	@$(call set,VM_NET_IPV4GW,10.0.2.2)
+
+endif

doc/debug.txt

@@ -10,7 +10,7 @@
 
 - build/build.log
   + подробность зависит от значения переменной DEBUG,
-    которую можно передать при запуске make (см. variables.txt);
+    которую можно передать при запуске make (см. params.txt);
   + содержит коммит, из которого происходит сборка, и признак
     "грязности" рабочего каталога при наличии модификаций после
     этого коммита;

doc/params.txt

@@ -10,7 +10,7 @@
 
 - ARCH
   + задаёт целевую архитектуру образов
-  + значение: пусто (по умолчанию авто), i586 или x86_64
+  + значение: пусто (по умолчанию авто), i586, x86_64, arm, ppc
   + см. ../lib/build.mk
 
 - ARCHES
@@ -41,7 +41,7 @@
 - CHECK
   + включает режим проверки сборки конфигурации (без сборки образа)
   + значение: пусто (по умолчанию) либо любая строка
-  + см. ../lib/build.mk
+  + см. ../lib/build.mk, ../lib/clean.mk
 
 - CLEAN
   + экономия RAM+swap при сборке в tmpfs, иначе места на диске
@@ -51,9 +51,9 @@
   + см. ../lib/clean.mk
 
 - DEBUG
-  + включает средства отладки
+  + включает средства отладки, может отключить зачистку после сборки
   + значение: пусто (по умолчанию), 1 или 2
-  + см. ../lib/log.mk
+  + см. ../lib/log.mk, ../lib/clean.mk
 
 - HOMEPAGE, HOMENAME, HOMEWAIT
   + указывают адрес, название и таймаут перехода для домашней страницы

doc/pkglists.txt

@@ -0,0 +1,50 @@
+списки пакетов
+~~~~~~~~~~~~~~
+Состав пакетной базы субпрофилей определяется значенями
+следующих переменных профиля (см. тж. ../conf.d/README):
+
+- main: пакетная база для установки
+  + sub.in/main/Makefile, features.in/*/main/lib/*.mk
+  + THE_LISTS, BASE_LISTS, MAIN_LISTS
+  + THE_GROUPS, MAIN_GROUPS
+  + THE_PACKAGES, BASE_PACKAGES, MAIN_PACKAGES,
+    SYSTEM_PACKAGES, COMMON_PACKAGES
+  + THE_PACKAGES_REGEXP, BASE_PACKAGES_REGEXP, MAIN_PACKAGES_REGEXP
+  + THE_KMODULES, BASE_KMODULES, MAIN_KMODULES, BASE_KMODULES_REGEXP
+    - KFLAVOURS
+
+- stage2: общая часть installer, live, rescue
+  + sub.in/stage2/Makefile, features.in/*/stage2/lib/*.mk
+  + SYSTEM_PACKAGES, STAGE2_PACKAGES
+  + STAGE1_KMODULES, STAGE1_KMODULES_REGEXP,
+    STAGE2_KMODULES, STAGE2_KMODULES_REGEXP
+    - STAGE1_KFLAVOUR или последний из KFLAVOURS
+
+- installer: компактная "живая" система, содержащая только инсталятор
+  + см. stage2
+  + features.in/install2/install2/stage2cfg.mk,
+    features.in/*/install2/lib/*.mk
+  + INSTALL2_PACKAGES
+
+- live: пользовательский LiveCD (может содержать также инсталятор)
+  + см. stage2
+  + features.in/live/live/stage2cfg.mk,
+    features.in/*/live/lib/*.mk
+  + THE_LISTS, LIVE_LISTS
+  + THE_GROUPS, LIVE_GROUPS
+  + THE_PACKAGES, LIVE_PACKAGES, COMMON_PACKAGES
+  + THE_PACKAGES_REGEXP, LIVE_PACKAGES_REGEXP
+  + THE_KMODULES, LIVE_KMODULES
+
+- rescue: спасательный LiveCD
+  + см. stage2
+  + features.in/rescue/rescue/stage2cfg.mk
+  + RESCUE_PACKAGES, COMMON_PACKAGES
+  + RESCUE_LISTS
+
+- stage1: ядро и загрузчик второй стадии
+  + sub.in/stage1/Makefile, features.in/*/stage1/lib/*.mk
+  + STAGE1_PACKAGES, SYSTEM_PACKAGES
+  + STAGE1_PACKAGES_REGEXP
+  + STAGE1_KMODULES_REGEXP
+    - STAGE1_KFLAVOUR или последний из KFLAVOURS

doc/qemu.txt

@@ -0,0 +1,26 @@
+Для сборки с применением трансляции посредством QEMU
+выполните от имени root следующие команды:
+
+apt-get install qemu-user-binfmt_misc
+modprobe binfmt_misc
+echo 32768 > /proc/sys/vm/mmap_min_addr
+
+и сконфигурируйте его применение для требуемых платформ:
+
+echo ":arm:M::\x7fELF\x01\x01\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x28\x00:\xff\xff\xff\xff\xff\xff\xff\x00\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff\xff:/.host/qemu-arm:" > /proc/sys/fs/binfmt_misc/register
+echo ':ppc:M::\x7fELF\x01\x02\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x14:\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff:/.host/qemu-ppc:' > /proc/sys/fs/binfmt_misc/register
+
+Если файл /proc/sys/fs/binfmt_misc/register не существует,
+потребуется установить и загрузить иное ядро (например, std-def).
+
+Также нужен sources.list с указанием соответствующего репозитория
+и ссылающийся на него apt.conf (см. apt.conf.sample); например:
+
+--- sources.list.sisyphus.arm
+rpm http://ftp.altlinux.org/pub/distributions/ALTLinux/Sisyphus arm classic
+---
+
+--- sources.list.4.1.ppc
+rpm http://ftp.altlinux.org/pub/people/wart/repos/lioka/powerpc ppc classic
+rpm http://ftp.altlinux.org/pub/people/wart/repos/lioka/powerpc noarch classic
+---

doc/vm.txt

@@ -13,6 +13,10 @@ mike ALL=NOPASSWD: /usr/share/mkimage-profiles/bin/tar2vm
 пользователю право выполнять с повышенными привилегиями доступный ему
 по записи скрипт равнозначно предоставлению полных привилегий root.
 
+Для работы с более специфичными форматами, чем raw ("буквальный"
+образ диска), потребуется утилита qemu-img из одноименного пакета;
+см. тж. вывод команды make help/vm
+
 Также потребуется пакет multipath-tools (/sbin/kpartx).
 
 Пример сборки и запуска VM:

features.in/Makefile

@@ -30,6 +30,8 @@ endef
 
 else
 
+export BUILDDIR
+
 include $(BUILDDIR)/distcfg.mk
 
 # first rsync what's static, and make backups (*~) --

features.in/branding/README

@@ -2,6 +2,11 @@
 добавление задающих внешний вид и сообщения дистрибутива
 пакетов; см. тж. http://www.altlinux.org/Branding
 
+Реализация "двумерная" -- отдельно задаётся BRANDING
+(см. пакеты branding-*-%version-%release.src.rpm),
+затем отдельно указывается, какие и куда помещать
+компоненты заданного брендинга.
+
 Назначение и возможные значения (если требуются):
 
 - STAGE1_BRANDING

features.in/build-distro/lib/90-build-distro.mk

@@ -22,7 +22,7 @@ MKI_SORTFILE := /tmp/isosort
 all: $(GLOBAL_DEBUG) prep copy-subdirs copy-tree run-scripts pack-image \
 	postprocess $(GLOBAL_CLEAN_WORKDIR)
 
-prep: $(GLOBAL_DEBUG) dot-disk $(WHATEVER) imagedir
+prep: $(GLOBAL_DEBUG) dot-disk $(WHATEVER)
 
 dot-disk:
 	@mkdir -p files/.disk

features.in/build-ve/lib/90-build-ve.mk

@@ -15,5 +15,3 @@ IMAGE_PACKAGES = $(call list,$(BASE_LISTS)) \
 
 all: $(GLOBAL_DEBUG) build-image copy-tree run-image-scripts pack-image \
 	postprocess $(GLOBAL_CLEAN_WORKDIR)
-
-prep: imagedir

features.in/build-vm/config.mk

@@ -1,3 +1,4 @@
 # hooked from ../../lib/sugar.mk
 use/build-vm:
 	@$(call add_feature)
+	@$(call xport,ROOTPW)

features.in/build-vm/generate.mk

@@ -0,0 +1,4 @@
+# copy tar2vm helper into generated profile to enable standalone builds
+
+all:
+	@install -pD $(MKIMAGE_PROFILES)/bin/tar2vm $(BUILDDIR)/bin/tar2vm

features.in/build-vm/image-scripts.d/00root

@@ -1,7 +1,11 @@
 #!/bin/sh
 
-ROOTPW="${GLOBAL_ROOTPW:-root}"
-
-if type -t chpasswd >&/dev/null; then
-	echo "root:$ROOTPW" | chpasswd
+if [ -n "$GLOBAL_ROOTPW" ]; then
+	if type -t chpasswd >&/dev/null; then
+		echo "root:$GLOBAL_ROOTPW" | chpasswd
+	else
+		echo "** warning: chpasswd binary missing" >&2
+	fi
+else
+	echo "** warning: no root password provided, you're on your own" >&2
 fi

features.in/build-vm/image-scripts.d/06syslog

@@ -1,16 +1,12 @@
 #!/bin/sh -e
-# tweak syslog configuration to:
-# - avoid logging to a nonexistent tty;
-# - avoid hard sync logging (one is better off doing
-#   remote syslog if you do care for reliable data anyways)
+# tweak syslog configuration to avoid hard sync logging (one is better off
+# doing remote syslog if you do care for reliable data anyways)
 # credits: vvk@, thresh@ (2010)
 
 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/build-vm/lib/90-build-vm.mk

@@ -9,6 +9,11 @@ IMAGE_PACKAGES = $(SYSTEM_PACKAGES) \
 
 # intermediate chroot archive
 VM_TARBALL := $(IMAGE_OUTDIR)/$(IMAGE_NAME).tar
+VM_RAWDISK := $(IMAGE_OUTDIR)/$(IMAGE_NAME).raw
+
+ifeq (,$(ROOTPW))
+$(error please provide root password via ROOTPW)
+endif
 
 check-sudo:
 	@if ! type -t sudo >&/dev/null; then \
@@ -16,18 +21,32 @@ check-sudo:
 		exit 1; \
 	fi
 
-convert-image: check-sudo
+prepare-image: check-sudo
 	@if ! sudo $(TOPDIR)/bin/tar2vm \
-		"$(VM_TARBALL)" "$(IMAGE_OUTPATH)" $$VM_SIZE; then \
+		"$(VM_TARBALL)" "$(VM_RAWDISK)" $$VM_SIZE; then \
 		echo "** error: sudo tar2vm failed, see also doc/vm.txt" >&2; \
 		exit 1; \
 	fi
 
+convert-image: prepare-image
+	@case "$(IMAGE_TYPE)" in \
+	"img") mv "$(VM_RAWDISK)" "$(IMAGE_OUTPATH)"; exit 0;; \
+	"vhd") VM_FORMAT="vpc";; \
+	*) VM_FORMAT="$(IMAGE_TYPE)"; \
+	esac; \
+	if ! type -t qemu-img >&/dev/null; then \
+		echo "** warning: qemu-img not available" >&2; \
+	else \
+		qemu-img convert -O "$$VM_FORMAT" \
+			"$(VM_RAWDISK)" "$(IMAGE_OUTPATH)"; \
+		rm "$(VM_RAWDISK)"; \
+	fi
+
+run-image-scripts: GLOBAL_CLEANUP_PACKAGES := $(CLEANUP_PACKAGES)
 run-image-scripts: GLOBAL_ROOTPW := $(ROOTPW)
 
+# override
 pack-image: MKI_PACK_RESULTS := tar:$(VM_TARBALL)
 
 all: $(GLOBAL_DEBUG) build-image copy-tree run-image-scripts pack-image \
 	convert-image postprocess $(GLOBAL_CLEAN_WORKDIR)
-
-prep: imagedir

features.in/cleanup/config.mk

@@ -1,5 +1,6 @@
 use/cleanup:
 	@$(call add_feature)
+	@$(call xport,CLEANUP_PACKAGES)
 
 use/cleanup/installer: use/cleanup
 	@$(call add,CLEANUP_PACKAGES,'installer-*')

features.in/cleanup/image-scripts.d/90cleanup-pkgs

@@ -0,0 +1,7 @@
+#!/bin/sh -efu
+# remove temporary packages from the installed system
+
+[ -n "$GLOBAL_CLEANUP_PACKAGES" ] || exit 0
+
+list="$(rpmquery -a --qf='%{NAME}\n' $GLOBAL_CLEANUP_PACKAGES)"
+[ -z "$list" ] || apt-get remove -f -y  -- $list

features.in/cleanup/install2/image-scripts.d/90cleanup-pkgs

@@ -14,7 +14,7 @@ cat > "$SCRIPT" << EOF
 # don't override the script start message on the same line
 echo "removing $GLOBAL_CLEANUP_PACKAGES"
 
-# remove extra packages from installed system
+# remove temporary packages from the installed system
 list="\$(exec_chroot rpmquery -a --qf='%{NAME}\\n' $GLOBAL_CLEANUP_PACKAGES)"
 [ -z "\$list" ] || exec_chroot apt-get remove -f -y  -- \$list
 EOF

features.in/dev/config.mk

@@ -3,7 +3,7 @@ use/dev:
 	@$(call add,THE_PACKAGES,git-core hasher gear)
 
 use/dev/mkimage: use/dev
-	@$(call add,THE_PACKAGES,mkimage shadow-change)
+	@$(call add,THE_PACKAGES,mkimage shadow-change su)
 
 use/dev/repo: use/dev use/repo/main
 	@$(call add,THE_PACKAGES,apt-repo)

features.in/dev/live/image-scripts.d/40-hasher

@@ -13,10 +13,10 @@ HOME="/home/$USER"
 install -dm750 -o "$USER" -g "$USER" "$HOME"
 
 # we honestly don't know much more
-if type -t git >&/dev/null; then
+if type -t git && type -t su; then
 	su - -c "git config --global user.email $USER@localhost" "$USER"
 	su - -c "git config --global user.name 'live builder'" "$USER"
-fi
+fi >&/dev/null
 
 # developer should feel comfortable, eh? ;-)
 ZSHELL="/bin/zsh"

features.in/install2/config.mk

@@ -5,6 +5,7 @@ use/install2: use/stage2 sub/stage2/install2 use/metadata use/cleanup/installer
 	@$(call add,INSTALL2_PACKAGES,branding-$$(BRANDING)-alterator)
 	@$(call add,BASE_PACKAGES,branding-$$(BRANDING)-release)
 	@$(call add,BASE_LISTS,$(call tags,basesystem))
+	@$(call xport,BASE_BOOTLOADER)
 
 use/install2/net: use/install2
 	@$(call add,INSTALL2_PACKAGES,curl)
@@ -13,6 +14,6 @@ use/install2/net: use/install2
 use/install2/kms: use/stage2/kms
 	@$(call add,BASE_KMODULES_REGEXP,drm.*)
 
-# see also use/vm/kvm/guest; qxl included in xorg pkglist
+# see also use/vmguest/kvm; qxl included in xorg pkglist
 use/install2/kvm:
 	@$(call add,INSTALL2_PACKAGES,spice-vdagent xorg-drv-qxl)

features.in/install2/install2/stage2cfg.mk

@@ -8,9 +8,6 @@ MKI_PACK_RESULTS = squash:altinst
 # also removed in a cleanup hook but to spare a few cycles...
 HSH_EXCLUDE_DOCS = 1
 
-# pass downstream
-GLOBAL_BASE_BOOTLOADER := $(BASE_BOOTLOADER)
-
 debug::
 	@echo "** install2: IMAGE_PACKAGES: $(IMAGE_PACKAGES)"
 	@echo "** install2: IMAGE_PACKAGES_REGEXP: $(IMAGE_PACKAGES_REGEXP)"

features.in/live/live/image-scripts.d/30-users

@@ -2,8 +2,7 @@
 # * reset password for root
 # * add user `altlinux' (without password)
 
-NPG="nopasswdlogin"
-GRPLIST="users scanner audio radio proc cdrom cdwriter wheel fuse $NPG"
+GRPLIST="users scanner audio radio proc cdrom cdwriter wheel fuse"
 
 verbose()
 {
@@ -15,7 +14,6 @@ verbose()
 add_user()
 {
     verbose "Add $1 user"
-    groupadd -r "$NPG"
     local groups=
     for g in $GRPLIST; do
 	if groupmod $g 2>/dev/null; then
@@ -28,6 +26,8 @@ add_user()
     done
 
     useradd -p "" -G "$groups" "$1" ||:
+    # Workaround for ALT#13213
+    chown -R "$1:auth" "/etc/tcb/$1"
     chown -R "$1:$1" /home/$1
 
     if [ -n "$GLOBAL_CRYPT_HOMES" ]; then

features.in/live/live/image-scripts.d/35-xdg-user-dirs

@@ -0,0 +1,6 @@
+#!/bin/sh
+# Turn on xdg-user-dirs.
+# NB: not yet available on t6/p6 hence the warning
+
+control xdg-user-dirs enabled ||
+	echo "** warning: control xdg-user-dirs failed" >&2

features.in/live/live/image-scripts.d/40-autologin

@@ -7,6 +7,14 @@ fi
 
 USER=altlinux
 
+add_nopasswdlogin_group()
+{
+	[ -f "/etc/pam.d/$1" ] &&
+	egrep -qs '^auth.+user[[:blank:]]+ingroup[[:blank:]]+nopasswdlogin' "/etc/pam.d/$1" &&
+	groupadd -r nopasswdlogin &&
+	gpasswd -a "$USER" nopasswdlogin
+}
+
 ## setup runlevel
 INITTAB=/etc/inittab
 if [ -f "$INITTAB" ]; then
@@ -29,6 +37,7 @@ if [ -f "$LIGHTDM_CONF" ]; then
 		-e "s/^#\(autologin-user=\).*$/\1$USER/" \
 		-e "s/^#\(autologin-user-timeout=0\)/\1/" \
 		"$LIGHTDM_CONF"
+	add_nopasswdlogin_group lightdm ||:
 fi
 
 ## gdm2 autologin
@@ -36,6 +45,7 @@ GDM_CONF=/etc/X11/gdm/custom.conf
 if [ -f "$GDM_CONF" ]; then
 	sed -i -e '/\[daemon\]/aAutomaticLoginEnable=true\nAutomaticLogin='$USER \
 		"$GDM_CONF"
+	add_nopasswdlogin_group gdm ||:
 fi
 
 ## kdm3 autologin

features.in/live/live/image-scripts.d/50-etcnet-dhcp

@@ -1,14 +0,0 @@
-#!/bin/sh -efu
-# attempt to autoconfigure ethernet
-
-[ -x /sbin/dhcpcd -o -x /sbin/dhclient ] || {
-	echo "NOT configuring DHCP for eth0" >&2
-	exit 0
-}
-
-echo "configuring DHCP for eth0" >&2
-
-mkdir -p /etc/net/ifaces/eth0 && {
-	echo TYPE=eth
-	echo BOOTPROTO=dhcp
-} > /etc/net/ifaces/eth0/options ||:

features.in/live/live/image-scripts.d/50-setup-network

@@ -0,0 +1,53 @@
+#!/bin/sh
+# Setup network settings
+# 1. Init /etc/hosts with "127.0.0.1 localhost"
+# 2. Set hostname, domainname
+# 3. Set defaults for NetworkManager or
+#    attempt to autoconfigure eth0 by etcnet.
+
+. shell-config
+
+verbose()
+{
+	if [ -n "$GLOBAL_VERBOSE" ]; then
+		echo "HOOK: 50-setup-network: $@"
+	fi
+}
+
+verbose "has started"
+
+# At startup time hostname may be changed by live-hostname package.
+HOSTNAME="localhost.localdomain"
+DOMAINNAME="localdomain"
+
+verbose "Init /etc/hosts with 127.0.0.1 localhost"
+echo "127.0.0.1 localhost localhost.localdomain" > /etc/hosts
+
+netcfg="/etc/sysconfig/network"
+
+verbose "Enable networking, set hostname to $HOSTNAME, domainname to $DOMAINNAME"
+shell_config_set "$netcfg" NETWORKING yes
+shell_config_set "$netcfg" HOSTNAME "$HOSTNAME"
+shell_config_set "$netcfg" DOMAINNAME "$DOMAINNAME"
+
+
+if  [ -x /usr/sbin/NetworkManager ] ; then
+	verbose "Setup defaults for NetworkManager"
+	shell_config_set /etc/net/ifaces/default/options-eth NM_CONTROLLED yes
+	shell_config_set /etc/net/ifaces/default/options-eth DISABLED yes
+	shell_config_set /etc/net/ifaces/default/options-eth BOOTPROTO dhcp
+else
+	# attempt to autoconfigure ethernet by etcnet
+	if [ -x /sbin/dhcpcd -o -x /sbin/dhclient ]; then
+		verbose "configuring DHCP for eth0"
+
+		mkdir -p /etc/net/ifaces/eth0 && {
+		echo TYPE=eth
+		echo BOOTPROTO=dhcp
+		} > /etc/net/ifaces/eth0/options
+	else
+		verbose "NOT configuring eth0 for DHCP"
+	fi
+fi
+
+verbose "finished"

features.in/live/live/stage2cfg.mk

@@ -5,10 +5,10 @@ STAGE2_KMODULES = $(THE_KMODULES) $(LIVE_KMODULES)
 IMAGE_PACKAGES_REGEXP = $(THE_PACKAGES_REGEXP) \
 			$(LIVE_PACKAGES_REGEXP)
 
-IMAGE_PACKAGES = $(COMMON_PACKAGES) $(THE_PACKAGES) $(LIVE_PACKAGES) \
-		 $(call map,list, \
+IMAGE_PACKAGES = $(call map,list, \
 			$(THE_LISTS) $(THE_GROUPS) \
 			$(LIVE_LISTS) $(LIVE_GROUPS)) \
+		 $(COMMON_PACKAGES) $(THE_PACKAGES) $(LIVE_PACKAGES) \
 		 interactivesystem
 
 MKI_PACK_RESULTS = squash:live

features.in/pack/config.mk

@@ -1,3 +1,5 @@
+### this might really belong to build-*...
+
 # distributions
 DISTRO_EXTS := .iso
 
@@ -38,6 +40,6 @@ $(foreach c,$(VE_ARCHIVES), \
 		$(eval $(call PACK_compressors,$(c),$(z)))))
 
 # virtual machines
-VM_EXTS := .img
+VM_EXTS := .img .qcow2 .vdi .vmdk .vhd
 
-use/pack/img: use/pack; @:
+$(VM_EXTS:.%=use/pack/%): use/pack; @:

features.in/plymouth/config.mk

@@ -18,9 +18,9 @@ use/plymouth/stage2: use/plymouth use/branding \
 	@$(call add,STAGE1_PACKAGES_REGEXP,make-initrd-plymouth)
 	@$(call add,STAGE1_BRANDING,bootsplash)
 	@$(call add,STAGE2_BRANDING,bootsplash)
+	@$(call add,STAGE2_BOOTARGS,quiet splash)
 
-use/plymouth/base: use/plymouth use/install2/kms
-	@$(call add,INSTALL2_BOOTARGS,quiet splash)
+use/plymouth/base: use/plymouth/stage2 use/install2/kms
 	@$(call add,INSTALL2_PACKAGES,installer-feature-setup-plymouth)
 	@$(call add,BASE_PACKAGES_REGEXP,make-initrd-plymouth cpio)
 	@$(call add,THE_BRANDING,bootsplash)

features.in/rescue/rescue/stage2cfg.mk

@@ -1,8 +1,8 @@
 # stage2 mod: rescue "live" image
 
-IMAGE_PACKAGES = $(COMMON_PACKAGES) \
+IMAGE_PACKAGES = $(call list,$(RESCUE_LISTS)) \
+		 $(COMMON_PACKAGES) \
 		 $(RESCUE_PACKAGES) \
-		 $(call list,$(RESCUE_LISTS)) \
 		 interactivesystem startup-rescue
 
 MKI_PACK_RESULTS = squash:rescue

features.in/server/README

@@ -0,0 +1,2 @@
+Эта фича предоставляет типичные для серверных образов
+наборы списков пакетов и модулей ядра.

features.in/server/config.mk

@@ -0,0 +1,9 @@
+use/server:
+	@$(call add_feature)
+
+use/server/mini: use/server
+	@$(call add,THE_KMODULES,e1000e igb)
+	@$(call add,STAGE1_KMODULES,e1000e igb)
+	@$(call add,THE_LISTS,\
+		$(call tags,base && (server || network || security || pkg)))
+	@$(call add,THE_LISTS,$(call tags,extra (server || network)))

features.in/slinux/live/image-scripts.d/30-local-time

@@ -0,0 +1,5 @@
+#!/bin/bash
+# Set system time to local time.
+
+CONFIG="/etc/sysconfig/clock"
+sed -i 's/^UTC=true/UTC=false/' "$CONFIG"

features.in/syslinux/cfg.in/05live.cfg

@@ -1,5 +1,5 @@
 label live
   menu label ^LiveCD (no hard disk needed)
   kernel alt0/vmlinuz
-  append initrd=alt0/full.cz fastboot live lowmem showopts automatic=method:cdrom ramdisk_size=@live_size@ stagename=live splash quiet=1 vga=0x314
+  append initrd=alt0/full.cz fastboot live lowmem showopts automatic=method:cdrom ramdisk_size=@live_size@ stagename=live vga=0x314 @bootargs@
 

features.in/syslinux/generate.mk

@@ -26,7 +26,6 @@ endif
 # 01defaults.cfg is included indefinitely
 SYSLINUX_CFG := $(SYSLINUX_CFG) $(notdir $(SUBPROFILES)) defaults
 
-### have to operate BUILDDIR, not pretty...
 DSTDIR := $(BUILDDIR)/stage1/files/syslinux/.in
 
 # we can do SYSLINUX_{CFG,MODULES,FILES}
@@ -65,8 +64,8 @@ timeout: bootargs
 
 # pass over additional parameters, if any
 bootargs: clean
-	@if [ -n "$(INSTALL2_BOOTARGS)" ]; then \
-		sed -i "s,@bootargs@,$(INSTALL2_BOOTARGS)," $(DSTDIR)/*.cfg; \
+	@if [ -n "$(STAGE2_BOOTARGS)" ]; then \
+		sed -i "s,@bootargs@,$(STAGE2_BOOTARGS)," $(DSTDIR)/*.cfg; \
 	fi; \
 	sed -i "s,@bootargs@,," $(DSTDIR)/*.cfg
 

features.in/systemd/live/image-scripts.d/20-systemd-locale

@@ -0,0 +1,4 @@
+#!/bin/sh
+# Don't allow systemd to set LANG.
+
+echo 'LANG=' >/etc/locale.conf

features.in/vm-net/README

@@ -0,0 +1,3 @@
+Эта фича добавляет базовую поддержку сети в создаваемый образ
+виртуальной машины.  Принимаются предложения по усовершенствованию
+статической конфигурации.

features.in/vm-net/config.mk

@@ -0,0 +1,11 @@
+use/vm-net:
+	@$(call add_feature)
+	@$(call add,THE_PACKAGES,etcnet)
+
+use/vm-net/dhcp: use/vm-net
+	@$(call add,THE_PACKAGES,dhcpcd)
+	@$(call set,VM_NET,dhcp)
+
+# need to further add VM_NET_IPV4ADDR and VM_NET_IPV4GW
+use/vm-net/static: use/vm-net
+	@$(call set,VM_NET,static)

features.in/vm-net/generate.mk

@@ -0,0 +1,26 @@
+ifdef BUILDDIR
+
+include $(BUILDDIR)/distcfg.mk
+
+all: dir = $(BUILDDIR)/files/etc/net/ifaces/eth0
+all:
+	@write_static() { \
+		echo "$(VM_NET_IPV4ADDR)" > "$(dir)/ipv4address"; \
+		echo "default via $(VM_NET_IPV4GW)" > "$(dir)/ipv4route"; \
+	}; \
+	if [ -n "$(VM_NET)" ] && mkdir -p "$(dir)"; then \
+		case "$(VM_NET)" in \
+		dhcp) ;; \
+		static) write_static;; \
+		*) \
+			echo "** error: unknown value of $(VM_NET)" >&2; \
+			exit 1;; \
+		esac; \
+		{ \
+			echo "TYPE=eth"; \
+			echo "DISABLED=no"; \
+			echo "BOOTPROTO=$(VM_NET)"; \
+		} > "$(dir)/options"; \
+	fi
+
+endif

features.in/vm-ssh/README

@@ -0,0 +1,6 @@
+Эта фича предназначена для добавления в образ виртуальной машины
+поддержки SSH: добавляется клиент и конфигурируется сервер
+(требуется задание пути к существующему публичному ключу
+посредством переменной SSH_KEY).
+
+Фактически требует один из вариантов use/vm-net для осмысленности.

features.in/vm-ssh/config.mk

@@ -0,0 +1,3 @@
+use/vm-ssh:
+	@$(call add_feature)
+	@$(call add,THE_LISTS,openssh)

features.in/vm-ssh/generate.mk

@@ -0,0 +1,12 @@
+ifdef BUILDDIR
+
+include $(BUILDDIR)/distcfg.mk
+
+# prepare the provided public SSH key to be carried over into the VM image
+all: SSH_DIR = $(BUILDDIR)/files/root/.ssh
+all:
+	@if [ -s "$(SSH_KEY)" ]; then \
+		install -pD "$(SSH_KEY)" "$(SSH_DIR)/authorized_keys"; \
+	fi
+
+endif

features.in/vm-ssh/image-scripts.d/50-.ssh-perms

@@ -0,0 +1,5 @@
+#!/bin/sh
+# tighten up permissions just in case
+
+[ ! -d /root/.ssh ] || chmod 700 /root/.ssh
+[ ! -f /root/.ssh/authorized_keys ] || chmod 600 /root/.ssh/authorized_keys

features.in/vm/README

@@ -1,2 +0,0 @@
-Эта фича предназначена для конфигурирования поддержки
-виртуальных машин; в данный момент со стороны гостевой ОС.

features.in/vmguest/README

@@ -0,0 +1,2 @@
+Эта фича предназначена для конфигурирования поддержки выполнения
+дистрибутивов в качестве гостей в среде виртуальных машин.

features.in/vmguest/config.mk

@@ -1,12 +1,12 @@
-+vmguest: use/vm/virtualbox/guest use/vm/kvm/guest; @:
++vmguest: use/vmguest/virtualbox use/vmguest/kvm; @:
 
-use/vm/virtualbox/guest:
+use/vmguest/virtualbox:
 	@$(call add_feature)
 	@$(call add,THE_KMODULES,virtualbox-addition drm)
 	@$(call add,THE_PACKAGES,virtualbox-guest-additions)
 
 # NB: only reasonable for X11-bearing images
-use/vm/kvm/guest:
+use/vmguest/kvm:
 	@$(call add_feature)
 	@$(call add,THE_PACKAGES,spice-vdagent)
 

features.in/x11/config.mk

@@ -27,14 +27,14 @@ use/x11/runlevel5: use/x11/xorg
 
 ### xdm: see also #23108
 use/x11/xdm: use/x11/runlevel5
-	@$(call add,THE_PACKAGES,xdm installer-feature-no-xconsole)
+	@$(call add,THE_PACKAGES,xdm installer-feature-no-xconsole-stage3)
 
 ### : some set()-like thing might be better?
 use/x11/lightdm/qt use/x11/lightdm/gtk: use/x11/lightdm/%: use/x11/runlevel5
 	@$(call add,THE_PACKAGES,lightdm-$*-greeter)
 
 use/x11/kdm: use/x11/runlevel5
-	@$(call add,THE_PACKAGES,kdebase-kdm)
+	@$(call add,THE_PACKAGES,kdebase-kdm<4)
 
 use/x11/gdm2.20: use/x11/runlevel5
 	@$(call add,THE_PACKAGES,gdm2.20)

image.in/Makefile

@@ -36,7 +36,7 @@ IMAGE_OUTFILE  := $(IMAGE_NAME)-$(DATE)-$(ARCH).$(IMAGE_TYPE)
 IMAGE_OUTPATH  := $(IMAGE_OUTDIR)/$(IMAGE_OUTFILE)
 IMAGE_RELPATH  := $(IMAGE_SORTDIR:%=%/)$(IMAGE_OUTFILE)
 IMAGE_RELDIR   := $(IMAGE_OUTDIR:$(GLOBAL_BUILDDIR)/%=%)
-IMAGE_LINK     := $(IMAGE_NAME).$(IMAGE_TYPE)
+IMAGE_LINK     := $(IMAGE_NAME)-latest-$(ARCH).$(IMAGE_TYPE)
 IMAGE_LINKPATH := $(IMAGEDIR)/$(IMAGE_LINK)
 
 ### multi-pack can be useful (think netinst iso/tree)
@@ -48,6 +48,7 @@ COPY_TREE = ./files
 # outdir shouldn't be wiped clean before use
 CLEANUP_OUTDIR ?=
 
+GLOBAL_TARGET := $(ARCH)
 GLOBAL_HSH_APT_CONFIG := $(wildcard $(APTCONF))
 
 # the lib/build-*.mk comes from features.in/build-*/lib
@@ -67,6 +68,8 @@ save-profile:
 
 .PHONY: imagedir postprocess debug
 
+prep: imagedir
+
 imagedir:
 	@mkdir -p "$(IMAGE_OUTDIR)"
 
@@ -74,16 +77,20 @@ postprocess: | $(addprefix postprocess-,$(sort $(POSTPROCESS_TARGETS)))
 	@OUTSIZE="`ls -lh "$(IMAGE_OUTPATH)" | cut -f5 -d' '`"; \
 	echo "** image: $(IMAGE_OUTPATH) [$$OUTSIZE]" >&2 && \
 	echo "IMAGE_OUTPATH = $(IMAGE_OUTPATH)" && \
+	echo "IMAGE_OUTFILE = $(IMAGE_OUTFILE)" && \
 	ln -sf "$(IMAGE_RELPATH)" "$(IMAGE_LINKPATH)" && \
 	ln -sf "$(IMAGE_RELDIR)" "$(OUT_LINK)" && \
 	ln -sf "$(IMAGE_LINK)" "$(IMAGEDIR)/$(CURRENT_LINK).$(IMAGE_TYPE)"; \
 	if [ -n "$(GLOBAL_DEBUG)" ]; then \
-		cp -a build.log "$(IMAGE_OUTPATH).log"; \
-		cp -a distcfg.mk "$(IMAGE_OUTPATH).cfg"; \
+		mkdir -p "$(LOGDIR)"; \
+		cp -a build.log "$(LOGDIR)/$(IMAGE_OUTFILE).log"; \
+		cp -a distcfg.mk "$(LOGDIR)/$(IMAGE_OUTFILE).cfg"; \
 	fi
 
 debug:
 	@echo "TOPDIR=$(TOPDIR)"
 	@echo "IMAGEDIR=$(IMAGEDIR)"
 	@echo "ARCH=$(ARCH)"
+	@echo "GLOBAL_TARGET=$(GLOBAL_TARGET)"
 	@echo "GLOBAL_HSH_APT_CONFIG=$(GLOBAL_HSH_APT_CONFIG)"
+	@echo "GLOBAL_HSH_USE_QEMU=$(GLOBAL_HSH_USE_QEMU)"

image.in/functions.mk

@@ -2,7 +2,7 @@
 PKGDIR := $(GLOBAL_BUILDDIR)/pkg
 
 # duplicated from metaprofile makefiles for the sake of "local" builds
-ARCH ?= $(shell arch | sed 's/i686/i586/')
+ARCH ?= $(shell arch | sed 's/i686/i586/; s/armv.*/arm/; s/ppc.*/ppc/')
 DATE ?= $(shell date +%Y%m%d)
 
 # prefix pkglist name with its directory to form a path (relative/absolute)

lib/build.mk

@@ -3,7 +3,7 @@ ANSI_OK   ?= 1;32
 ANSI_FAIL ?= 1;31
 
 MAX_ERRORS = 3
-GOTCHA := ^(((\*\* )?(E:|[Ee]rror|[Ww]arning).*)|(.* (conflicts|Depends:) .*)|(.* (Stop|failed)\.))$$
+GOTCHA := ^(((\*\* )?(E:|[Ee]rror|[Ww]arning).*)|(.* (conflicts|Depends:) .*)|(.* (Stop|failed|not found)\.))$$
 
 ifndef MKIMAGE_PROFILES
 $(error this makefile is designed to be included in toplevel one)
@@ -20,8 +20,15 @@ LOWSPACE = 1024
 # it's also nice to know how long and much it takes
 START += time -f "%E %PCPU %Mk"
 
-# /usr/bin/{i586,x86_64} are setarch(8) symlinks
+# /usr/bin/{i586,x86_64} are setarch(8) symlinks but arm is not;
+# also check whether non-x86 build is running native
+ifeq (,$(wildcard $(subst :,/$(ARCH) ,$(PATH):)))
+ifeq (,$(findstring $(ARCH),$(shell uname -m)))
+export GLOBAL_HSH_USE_QEMU=$(ARCH)
+endif
+else
 START += $(ARCH)
+endif
 
 # to be passed into distcfg.mk; suggestions are welcome
 IMAGEDIR ?= $(shell \
@@ -33,6 +40,8 @@ IMAGEDIR ?= $(shell \
 	fi; \
 )
 
+LOGDIR ?= $(IMAGEDIR)
+
 # actual build starter
 # NB: our output MUST go into stderr to escape POSTPROC
 build-image: profile/populate

lib/clean.mk

@@ -50,11 +50,15 @@ distclean: clean
 	} >&2
 
 # builddir existing outside read-only metaprofile is less ephemeral
-# than BUILDDIR is -- usually it's unneeded afterwards so just zap it
+# than BUILDDIR variable is -- usually it's unneeded afterwards
+# so just zap it unless DEBUG has been requested (moreso for multi
+# image builds, UI based ones, and readonly metaprofile; or CHECK)
 postclean: build-image
 	@{ \
-	if [ "$(NUM_TARGETS)" -gt 1 -a -z "$(DEBUG)" -a -z "$(__frontend)" ] ||\
-	    [ ! -L "$(SYMLINK)" -a "0$(DEBUG)" -lt 2 ]; then \
+	if [ "0$(DEBUG)" -lt 2 -a -z "$(CHECK)" ] && \
+	     [ "$(NUM_TARGETS)" -gt 1 \
+	       -o -n "$(__frontend)" \
+	       -o ! -L "$(SYMLINK)" ]; then \
 		echo "$(TIME) cleaning up after build"; \
 		$(MAKE) -C "$(BUILDDIR)" distclean \
 			GLOBAL_BUILDDIR="$(BUILDDIR)" $(LOG) ||:; \

lib/functions.mk

@@ -36,6 +36,14 @@ define try_body
 printf '%s ?= %s\n' '$(1)' '$(2)' >> "$(CONFIG)"; }
 endef
 
+# xport() requests a variable to be exported to the scripts
+xport = $(and $(1),$(xport_body))
+define xport_body
+{ $(log_body); \
+v='$(1:GLOBAL_%=%)'; \
+printf 'export GLOBAL_%s = $$(%s)\n' "$$v" "$$v" >> "$(CONFIG)"; }
+endef
+
 # if the rule being executed isn't logged yet, log it
 define log_body
 { [ -s "$(CONFIG)" ] && \

lib/kernel.mk

@@ -6,5 +6,5 @@ endif
 ifeq (i586,$(ARCH))
 BIGRAM := std-pae
 else
-BUGRAM := std-def
+BIGRAM := std-def
 endif

lib/profile.mk

@@ -52,13 +52,25 @@ profile/init: distclean
 		fi $(LOG); \
 	fi; \
 	{ \
-		eval `apt-config shell $${APTCONF:+-c=$(wildcard $(APTCONF))} \
+		APTCONF="$(wildcard $(APTCONF))"; \
+		echo "** using $${APTCONF:-system apt configuration}:"; \
+		eval `apt-config shell $${APTCONF:+-c=$$APTCONF} \
 			SOURCELIST Dir::Etc::sourcelist/f \
 			SOURCEPARTS Dir::Etc::sourceparts/d`; \
 		find "$$SOURCEPARTS" -name '*.list' \
-		| xargs egrep -Rhv '^#|^[[:blank:]]*$$' "$$SOURCELIST" && \
+		| xargs egrep -Rhv '^#|^[[:blank:]]*$$' "$$SOURCELIST" \
+		| tee $(BUILDDIR)/sources.list; \
 		echo; \
 	} $(LOG); \
+	if ! grep -q "[	 ]$(ARCH)[ 	]" $(BUILDDIR)/sources.list; then \
+		echo -n "requested arch '$$ARCH' unavailable" >&2; \
+		if [ -z "$(APTCONF)" ]; then \
+			echo " (no APTCONF)"; \
+		else \
+			echo; \
+		fi >&2; \
+		exit 1; \
+	fi; \
 	if type -t git >&/dev/null; then \
 		if cd $(BUILDDIR); then \
 			git init -q && \
@@ -84,6 +96,7 @@ profile/bare: profile/init
 	@$(call try,MKIMAGE_PREFIX,/usr/share/mkimage)
 	@$(call try,GLOBAL_VERBOSE,)
 	@$(call try,IMAGEDIR,$(IMAGEDIR))
+	@$(call try,LOGDIR,$(LOGDIR))
 	@$(call try,BRANDING,altlinux-sisyphus)
 	@$(call set,IMAGE_INIT_LIST,+branding-$$(BRANDING)-release)
 	@if type -t git >&/dev/null && cd $(BUILDDIR); then \

lib/ve.mk

@@ -6,18 +6,25 @@ endif
 
 ifeq (ve,$(IMAGE_CLASS))
 
+# no package management and networking
 ve/.bare: profile/bare
 	@$(call add,BASE_PACKAGES,basesystem)
 
+# no "vzctl enter"
 ve/bare: ve/.bare
-	@$(call add,BASE_PACKAGES,apt)
+	@$(call add,BASE_PACKAGES,sysvinit etcnet apt)
 
-ve/generic: ve/.bare
-	@$(call add,BASE_PACKAGES,openssh-server openssh-blacklist openssh-clients)
-	@$(call add,BASE_LISTS,\
+# /dev/pty and friends start here
+ve/base: ve/bare
+	@$(call add,BASE_PACKAGES,interactivesystem)
+
+# this should be more or less deployable
+ve/generic: ve/base
+	@$(call add,BASE_LISTS,openssh \
 		$(call tags,base && (server || network || security || pkg)))
 
-ve/openvpn: ve/.bare
+# example of service-specific template
+ve/openvpn: ve/bare
 	@$(call add,BASE_LISTS,$(call tags,server openvpn))
 
 endif

lib/vm.mk

@@ -6,9 +6,8 @@ endif
 
 ifeq (vm,$(IMAGE_CLASS))
 
-#vm/.bare: profile/bare use/bootloader/grub
 vm/.bare: profile/bare
-	@$(call add,BASE_PACKAGES,basesystem interactivesystem lilo passwd shadow-utils e2fsprogs mingetty)
+	@$(call add,BASE_PACKAGES,interactivesystem lilo shadow-utils e2fsprogs)
 	@$(call set,KFLAVOURS,std-def)
 
 vm/bare: vm/.bare

main.mk

@@ -6,8 +6,6 @@
 # --- 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
@@ -26,6 +24,8 @@ else
 BUILDDIR_PREFIX ?= mkimage-profiles.build/$(IMAGE_CONF).$(ARCH)
 endif
 
+export MKIMAGE_PROFILES := $(realpath $(dir $(lastword $(MAKEFILE_LIST))))
+
 # preferences
 -include $(HOME)/.mkimage/profiles.mk
 

pkg.in/lists/openssh

@@ -0,0 +1,3 @@
+openssh-server
+openssh-blacklist
+openssh-clients

pkg.in/lists/server-base

@@ -4,8 +4,5 @@ vim-console
 sfdisk
 mdadm
 
-openssh-server
-openssh-clients
-openssh-blacklist
 screen
 acpid

pkg.in/lists/slinux/xfce

@@ -28,15 +28,16 @@ thunar-volman-plugin
 thunar-archive-plugin
 
 #screensaver
-gnome-screensaver
+#gnome-screensaver
 #gnome-screensaver-utils
+xscreensaver
+xscreensaver-frontend
+xscreensaver-hacks-gl-
+xscreensaver-modules-gl-
 
 #samba
 thunar-shares-plugin
 
-xscreensaver-
-xscreensaver-hacks-gl-
-xscreensaver-modules-gl-
 xfce4-wmdock-plugin-
 xfce4-radio-plugin-
 xfce4-genmon-plugin-
@@ -66,4 +67,3 @@ xfce4-mount-plugin
 #xfce4-weather-plugin
 xfce4-systemload-plugin
 xfce4-cpugraph-plugin
-#xfce4-xfapplet-plugin

pkg.in/lists/tagged/rescue+extra

@@ -78,8 +78,6 @@ netlist
 nfs-utils
 ngrep
 nmap
-openssh-clients
-openssh-server
 p0f
 postfix
 rsync

pkg.in/lists/tagged/server+network

@@ -8,9 +8,6 @@ lftp
 mailx
 netcat
 netlist
-openssh-clients
-openssh-server
-openssh-blacklist
 rsync
 traceroute
 vlan-utils

reports.mk

@@ -8,6 +8,8 @@ BUILDDIR := $(shell sed -n 's/^.* BUILDDIR = \(.*\)/\1/p' "$(REPORT_PATH)")
 BUILDLOG := $(BUILDDIR)/$(BUILD_LOG)
 REPORTDIR := $(BUILDDIR)/reports
 IMAGE_OUTPATH := $(shell sed -n 's/^IMAGE_OUTPATH = \(.*\)/\1/p' $(BUILDLOG))
+IMAGE_OUTFILE := $(shell sed -n 's/^IMAGE_OUTFILE = \(.*\)/\1/p' $(BUILDLOG))
+LOGDIR := $(shell sed -n 's/^LOGDIR = \(.*\)/\1/p' $(BUILDLOG))
 
 # for a multi-image build there's no sense to refer to buildroot
 # contained reports as these are very ephemeral between builds
@@ -17,7 +19,7 @@ endif
 
 all: reports/targets reports/scripts
 	@if [ -n "$(IMAGE_OUTPATH)" ]; then \
-		cp -a $(REPORTDIR) $(IMAGE_OUTPATH).reports; \
+		cp -a "$(REPORTDIR)" "$(LOGDIR)/$(IMAGE_OUTFILE).reports"; \
 	fi
 
 reports/prep: