0.7.6-alt1

- minor improvements

.gear/mkimage-profiles.spec

@@ -1,5 +1,5 @@
 Name: mkimage-profiles
-Version: 0.6.7
+Version: 0.7.6
 Release: alt1
 
 Summary: ALT Linux based distribution metaprofile
@@ -61,6 +61,32 @@ cp -a * %buildroot%mpdir
 %doc README QUICKSTART
 
 %changelog
+* Mon Aug 06 2012 Michael Shigorin <mike@altlinux.org> 0.7.6-alt1
+- minor improvements
+
+* 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
+  + plymouth
+
+* Mon May 28 2012 Michael Shigorin <mike@altlinux.org> 0.6.8-alt1
+- minor bugfixes
+
 * Mon May 21 2012 Michael Shigorin <mike@altlinux.org> 0.6.7-alt1
 - docs updates
 

.gear/tags/02fe7a7e583b570944eb332ca93eba03a6f0f11e

@@ -1,6 +0,0 @@
-object a4836609d986c3609ba52860ae60061d0cf0e514
-type commit
-tag v0.6.6
-tagger Michael Shigorin <mike@altlinux.org> 1337020642 +0300
-
-frontstart

.gear/tags/50e9488f26557b8bcab412e07ae6265c1270938d

@@ -0,0 +1,6 @@
+object 2a437c4d2225bdfd1406765711ba46694c9ed2aa
+type commit
+tag v0.7.5
+tagger Michael Shigorin <mike@altlinux.org> 1343664913 +0400
+
+fixups

.gear/tags/list

@@ -1 +1 @@
-02fe7a7e583b570944eb332ca93eba03a6f0f11e v0.6.6
+50e9488f26557b8bcab412e07ae6265c1270938d v0.7.5

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
@@ -32,8 +33,8 @@ 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

@@ -0,0 +1,131 @@
+#!/bin/bash -e
+
+. shell-error
+
+if [ $# -lt 2 ]; then
+	fatal "error: tar2vm needs at least two arguments"
+fi
+
+# this needs env_keep sudo setup to actually work
+if [ -n "$GLOBAL_BUILDDIR" ]; then
+	WORKDIR="$GLOBAL_BUILDDIR/vmroot"
+else
+	WORKDIR="$(mktemp --tmpdir -d vmroot-XXXXX)"
+fi
+
+[ -n "$WORKDIR" ] || fatal "couldn't come up with suitable WORKDIR"
+
+[ -n "$GLOBAL_DEBUG" ] || message "WORKDIR: $WORKDIR"
+
+# a tarball containing chroot with a kernel
+TAR="$1"
+[ -s "$TAR" ] || fatal "source tarball doesn't really exist"
+
+# a path to the image to be generated
+IMG="$2"
+[ -d "$(dirname "$IMG")" ] || fatal "target directory doesn't exist"
+
+# image size in bytes (256M is a fallback)
+TARSIZE="$(stat -Lc %s "$TAR")"
+DEFSIZE="$((3 * $TARSIZE / 2))"
+DISKSIZE="${3:-${DEFSIZE:-268435456}}"
+# ...and in megabytes
+DISKSIZEM="$(($DISKSIZE / 1048576))"
+
+# tested to work: ext[234], jfs
+ROOTFSTYPE="${4:-ext4}"
+
+# single root partition hardwired so far,
+# add another image for swap if needed
+ROOTDEV="/dev/sda1"
+
+# last preparations...
+for i in losetup parted kpartx mkfs."$ROOTFSTYPE"; do
+	if ! type -t "$i" >&/dev/null; then
+		fatal "$i required but not found"
+	fi
+done
+
+LOOPDEV="$(losetup --find)"
+ROOTFS="$WORKDIR/chroot"
+
+exit_handler()
+{
+	rc=$?
+	if [ -n "$ROOTFS" ]; then
+		umount "$ROOTFS"{/dev,/proc,/sys,}
+		if [ -n "$LOOPDEV" ]; then
+			kpartx -d "$LOOPDEV"
+			losetup --detach "$LOOPDEV"
+		fi
+		rm -r -- "$ROOTFS"
+		rmdir -- "$WORKDIR"
+	fi
+	exit $rc
+}
+
+trap exit_handler EXIT
+
+# prepare disk image and a filesystem inside it
+rm -f -- "$IMG"
+dd if=/dev/zero of="$IMG" conv=notrunc \
+	bs=1 count=1 seek="$(($DISKSIZE - 1))"
+losetup "$LOOPDEV" "$IMG"
+
+parted --script "$LOOPDEV" mklabel msdos
+parted --script "$LOOPDEV" mkpart primary ext2 1 "$DISKSIZEM"
+
+kpartx -a "$LOOPDEV"
+LOOPDEV1="/dev/mapper/$(basename "$LOOPDEV")p1"
+
+mkfs."$ROOTFSTYPE" "$LOOPDEV1"
+
+# mount and populate it
+mkdir -pm755 "$ROOTFS"
+mount "$LOOPDEV1" "$ROOTFS"
+tar -C "$ROOTFS" --numeric-owner -xf "$TAR"
+for i in /dev /proc /sys; do mount --bind "$i" "$ROOTFS$i"; done
+
+# NB: different storage modules might be needed for non-kvm
+echo "$LOOPDEV1 / $ROOTFSTYPE defaults 1 1" >> "$ROOTFS/etc/fstab"
+echo "MODULES_PRELOAD=sd_mod ata_piix $ROOTFSTYPE" >> "$ROOTFS/etc/initrd.mk"
+
+KERNEL="$(readlink $ROOTFS/boot/vmlinuz | sed 's,vmlinuz-,,')"
+chroot "$ROOTFS" make-initrd -k "$KERNEL"
+
+sed -i "s,$LOOPDEV1,$ROOTDEV," "$ROOTFS/etc/fstab"
+
+# configure and install bootloader
+REGEXP='^([0-9]+) heads, ([0-9]+) sectors/track, ([0-9]+) cylinders.*$'
+set -- $(fdisk -l "$LOOPDEV" | grep -E "$REGEXP" | sed -r "s@$REGEXP@\1 \2 \3@")
+
+LILO_COMMON="lba32
+delay=1
+vga=0
+image=/boot/vmlinuz
+  initrd=/boot/initrd.img
+  append=\"root=$ROOTDEV rootdelay=3\"
+  label=linux"
+
+cat > "$ROOTFS"/etc/lilo-loop.conf << EOF
+boot=$LOOPDEV
+disk=$LOOPDEV
+  bios=0x80
+  heads=$1
+  sectors=$2
+  cylinders=$3
+  partition=$LOOPDEV1
+  start=63
+$LILO_COMMON
+EOF
+
+chroot "$ROOTFS" lilo -C /etc/lilo-loop.conf
+
+cat > "$ROOTFS"/etc/lilo.conf << EOF
+boot=${ROOTDEV%[0-9]*}
+$LILO_COMMON
+EOF
+
+if [ -n "$SUDO_USER" ]; then
+	chown "$SUDO_USER" "$IMG" "$ROOTFS" "$WORKDIR"
+fi

conf.d/README

@@ -10,21 +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)
@@ -32,6 +38,8 @@
   + MAIN_KMODULES будут доступны для установки с носителя
   + LIVE_KMODULES предназначены для LiveCD/LiveFlash
 
+Не стоит бояться такого разнообразия, для большинства задач достаточно THE_*.
+
 По подстановкам:
 - $(VAR) подставляются перед их записью в $(CONFIG), который distcfg.mk
 - $$(VAR) раскрываются позже, при включении $(CONFIG) и востребовании

conf.d/alien.mk

@@ -1,6 +0,0 @@
-ve/.centos-base: ve/.bare
-	@$(call set,IMAGE_INIT_LIST,hasher-pkg-init)
-
-ve/centos: ve/.centos-base
-	@$(call add,BASE_PACKAGES,openssh-server)
-

conf.d/desktop.mk

@@ -7,12 +7,13 @@ 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,BASE_LISTS,$(call tags,(base || desktop) && network))
+	@$(call add,SYSTEM_PACKAGES,fonts-ttf-google-croscore-arimo)
+	@$(call add,BASE_LISTS, \
+		$(call tags,(base || desktop) && (l10n || network)))
 
 distro/icewm: distro/.desktop-network use/lowmem +icewm; @:
 distro/tde: distro/.desktop-mini +tde; @:
 distro/ltsp-tde: distro/tde +ltsp; @:
 distro/ltsp-icewm: distro/icewm +ltsp; @:
-distro/desktop-systemd: distro/icewm use/systemd; @:
 
 endif

conf.d/live.mk

@@ -1,43 +1,39 @@
 # live images
 ifeq (distro,$(IMAGE_CLASS))
 
-distro/syslinux: distro/.init \
-	use/syslinux/localboot.cfg use/syslinux/ui/vesamenu use/hdt; @:
-
 distro/dos: distro/.init use/dos use/syslinux/ui/menu; @:
 distro/rescue: distro/.base use/rescue use/syslinux/ui/menu; @:
-distro/live-systemd: distro/.base use/live/base use/systemd; @:
 
 distro/.live-base: distro/.base use/live/base use/power/acpi/button; @:
-distro/.live-desktop: distro/.base +live use/syslinux/ui/vesamenu; @:
+distro/.live-desktop: distro/.base +live use/plymouth/live; @:
 
 distro/.live-kiosk: distro/.base use/live/base use/live/autologin \
 	use/syslinux/timeout/1 use/cleanup +power
 	@$(call add,LIVE_PACKAGES,fonts-ttf-dejavu)
 	@$(call add,CLEANUP_PACKAGES,'alterator*' 'guile*' 'vim-common')
 
-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,livecd-qemu-arch strace)
+	@$(call add,LIVE_PACKAGES,qemu-user-binfmt_misc)
 	@$(call add,LIVE_PACKAGES,zsh sudo)
 	@$(call add,LIVE_PACKAGES,$(pkgs))
 	@$(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; @:
 distro/live-razorqt: distro/.live-desktop use/live/autologin +razorqt; @:
-distro/live-tde: distro/.live-desktop use/live/ru +tde; @:
+distro/live-tde: distro/.live-desktop use/live/ru use/live/install +tde; @:
 
 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
@@ -45,6 +41,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
@@ -52,7 +54,10 @@ distro/live-flightgear: distro/live-icewm use/live/sound use/x11/3d-proprietary
 	@$(call try,HOMEPAGE,http://www.4p8.com/eric.brasseur/flight_simulator_tutorial.html)
 
 distro/live-cinnamon: distro/.live-desktop use/live/autologin use/live/ru \
-	use/x11/cinnamon use/x11/3d-proprietary
+	use/x11/cinnamon use/x11/3d-proprietary; @:
+
+distro/live-mate: distro/.live-desktop use/live/nodm use/live/ru use/x11/3d-free
+	@$(call add,LIVE_LISTS,$(call tags,(desktop || mobile) && mate))
 
 distro/live-enlightenment: distro/.live-desktop use/live/autologin \
 	use/live/ru use/x11/3d-free

conf.d/server.mk

@@ -2,22 +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 use/bootloader/lilo; @:
 
 distro/server-ovz: distro/server-mini use/install2/net use/hdt use/rescue \
 	use/firmware/server use/firmware/wireless use/power/acpi/button
@@ -31,9 +24,4 @@ distro/server-ovz: distro/server-mini use/install2/net use/hdt use/rescue \
 	@$(call add,MAIN_GROUPS,ipmi mysql-server dhcp-server mail-server)
 	@$(call add,MAIN_GROUPS,monitoring diag-tools)
 
-# tiny network-only server-ovz installer (stage2 comes over net too)
-distro/server-ovz-netinst: distro/.base sub/stage1 use/stage2 \
-	use/syslinux/ui/menu use/syslinux/localboot.cfg use/memtest
-	@$(call add,SYSLINUX_CFG,netinstall2)
-
 endif

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/test.mk

@@ -0,0 +1,52 @@
+# debug/test/experimental images
+ifneq (,$(DEBUG))
+
+ifeq (distro,$(IMAGE_CLASS))
+
+distro/syslinux: distro/.init \
+	use/syslinux/localboot.cfg use/syslinux/ui/vesamenu use/hdt; @:
+
+distro/syslinux-auto: distro/.init use/hdt use/syslinux/timeout/1; @:
+distro/syslinux-noescape: distro/syslinux-auto use/syslinux/noescape.cfg; @:
+
+distro/live-systemd: distro/.base use/live/base use/systemd; @:
+distro/live-plymouth: distro/.live-base use/plymouth/live; @:
+
+distro/live-isomd5sum: distro/.base use/live/base use/isomd5sum
+	@$(call add,LIVE_PACKAGES,livecd-isomd5sum)
+
+distro/live-testserver: distro/live-install use/server/mini
+	@$(call set,KFLAVOURS,std-def el-smp)
+
+distro/server-systemd: distro/server-mini use/systemd
+	@$(call set,KFLAVOURS,std-def)
+
+# tiny network-only server-ovz installer (stage2 comes over net too)
+distro/server-ovz-netinst: distro/.base sub/stage1 use/stage2 \
+	use/syslinux/ui/menu use/syslinux/localboot.cfg use/memtest
+	@$(call add,SYSLINUX_CFG,netinstall2)
+
+distro/desktop-systemd: distro/icewm use/systemd; @:
+distro/desktop-plymouth: distro/icewm +plymouth; @:
+
+endif # IMAGE_CLASS: distro
+
+ifeq (ve,$(IMAGE_CLASS))
+
+ve/.centos-base: ve/.bare
+	@$(call set,IMAGE_INIT_LIST,hasher-pkg-init)
+
+ve/centos: ve/.centos-base
+	@$(call add,BASE_PACKAGES,openssh-server)
+
+endif # IMAGE_CLASS: ve
+
+ifeq (vm,$(IMAGE_CLASS))
+
+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 # IMAGE_CLASS: vm
+
+endif

conf.d/vm.mk

@@ -0,0 +1,9 @@
+# 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; @:
+
+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
   + указывают адрес, название и таймаут перехода для домашней страницы
@@ -76,11 +76,22 @@
   + NB: в силу специфики обработки передаётся только явно
   + см. ../Makefile, ../report.mk, ../lib/report.mk
 
+- ROOTPW
+  + устанавливает пароль root по умолчанию для образов виртуальных машин
+  + значение: пусто (по умолчанию root) либо строка
+  + см. ../features.in/build-vm/image-scripts.d/00root
+
 - SAVE_PROFILE
   + сохраняет архив сгенерированного профиля в .disk/
   + значение: пусто (по умолчанию) либо любая строка
   + см. ../image.in/Makefile
 
+- SORTDIR
+  + дополнительно структурирует каталог собранных образов
+  + значение: пусто (по умолчанию) либо строка
+    - например, '$(IMAGE_NAME)/$(DATE)'
+  + см. ../image.in/Makefile
+
 - SQUASHFS
   + определяет характер сжатия squashfs для stage2
   + значение:
@@ -89,10 +100,10 @@
     - fast: gzip/lzo (быстрее запаковывается и распаковывается, меньше степень)
   + см. ../features.in/stage2/stage1/scripts.d/03-test-kernel
 
-- SORTDIR
-  + дополнительно структурирует каталог собранных образов
-  + значение: пусто (по умолчанию) либо строка
-    - например, '$(IMAGE_NAME)/$(DATE)'
+- STATUS
+  + добавляет в имя образа указанный префикс
+  + значение:
+    - пусто (по умолчанию) либо строка (например, "alpha", "beta")
   + см. ../image.in/Makefile
 
 пример

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

@@ -0,0 +1,24 @@
+сборка образов виртуальных машин
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+ВНИМАНИЕ: заключительная операция создания образа жёсткого диска
+из архива с содержимым корневой файловой системы требует доступа
+к sudo и разрешения на выполнение скрипта bin/tar2vm в корневом
+каталоге метапрофиля при установке mkimage-profiles из пакета.
+
+Соответствующий фрагмент конфигурации sudo(8) может выглядеть как:
+
+mike ALL=NOPASSWD: /usr/share/mkimage-profiles/bin/tar2vm
+
+При работе с git следует иметь в виду, что предоставлять недоверенному
+пользователю право выполнять с повышенными привилегиями доступный ему
+по записи скрипт равнозначно предоставлению полных привилегий root.
+
+Для работы с более специфичными форматами, чем raw ("буквальный"
+образ диска), потребуется утилита qemu-img из одноименного пакета;
+см. тж. вывод команды make help/vm
+
+Также потребуется пакет multipath-tools (/sbin/kpartx).
+
+Пример сборки и запуска VM:
+
+$ make ROOTPW=reallysecret1 vm/bare.img && kvm -hda ~/out/bare.img

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

@@ -1,3 +1,26 @@
 Эта фича врезается в makefile субпрофилей и обеспечивает
 добавление задающих внешний вид и сообщения дистрибутива
 пакетов; см. тж. http://www.altlinux.org/Branding
+
+Реализация "двумерная" -- отдельно задаётся BRANDING
+(см. пакеты branding-*-%version-%release.src.rpm),
+затем отдельно указывается, какие и куда помещать
+компоненты заданного брендинга.
+
+Назначение и возможные значения (если требуются):
+
+- STAGE1_BRANDING
+  + относится к загрузке со сгенерированного образа (например, ISO)
+  + bootloader bootsplash (при старте)
+
+- STAGE2_BRANDING
+  + общая часть для всех вариантов stage2
+  + bootsplash (при выключении)
+
+- INSTALL2_BRANDING
+  + специфические пакеты брендирования инсталятора
+  + notes slideshow
+
+- THE_BRANDING
+  + общий список для использования в установленной системе и LiveCD
+  + alterator bootsplash graphics indexhtml notes slideshow

features.in/branding/config.mk

@@ -1,12 +1,11 @@
+# NB: release part of branding goes to install2 feature
 use/branding:
 	@$(call add_feature)
-	@### see install2
-	@#$(call add,BASE_PACKAGES,branding-$$(BRANDING)-release)
 
 # NB: not every distro might have all the branding of its own
 use/branding/full: use/branding use/syslinux/ui/gfxboot
 	@$(call add,THE_BRANDING,alterator bootsplash graphics)
 	@$(call add,THE_BRANDING,indexhtml notes slideshow)
 
-use/branding/complete: use/branding/full
+use/branding/complete: use/branding/full use/plymouth/full
 	@$(call add,INSTALL2_BRANDING,notes slideshow)

features.in/branding/stage2/lib/40branding.mk

@@ -0,0 +1 @@
+IMAGE_PACKAGES_REGEXP += $(call branding,$(STAGE2_BRANDING))

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

@@ -22,8 +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 metadata 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/README

@@ -0,0 +1,3 @@
+Эта фича конфигурирует создание образа виртуальной машины (VM).
+Дополняет финальную стадию сборки (lib/, image-scripts.d/).
+Требует для работы sudo(8) -- см. тж. ../../doc/vm.txt .

features.in/build-vm/config.mk

@@ -0,0 +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

@@ -0,0 +1,11 @@
+#!/bin/sh
+
+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/03services

@@ -0,0 +1,9 @@
+#!/bin/sh
+# VMs might have no means to communicate with the outer
+# world except for networking
+
+[ -x /sbin/chkconfig ] || exit 0
+
+for i in network random syslogd; do chkconfig $i on; done
+for i in fbsetfont netfs rawdevices; do chkconfig $i off; done
+:

features.in/build-vm/image-scripts.d/04inittab

@@ -0,0 +1,4 @@
+#!/bin/sh -e
+# we don't need no extra gettys in VMs
+[ -s /etc/inittab ] || exit 0
+sed -i 's,^[3-9]\+:[0-9]\+:respawn:/sbin/mingetty.*,#&,' /etc/inittab

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

@@ -0,0 +1,12 @@
+#!/bin/sh -e
+# 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,-/var/log/,/var/log/,g' \
+		-e 's,/var/log/,-/var/log/,g' \
+		"$CONFIG"

features.in/build-vm/image-scripts.d/07kernel

@@ -0,0 +1,13 @@
+#!/bin/sh
+# predictable file locations make bootloader configuration simple;
+# this script relates to .../features.in/stage2/stage1/scripts.d/80-make-initfs
+
+kver="$(rpm -qa 'kernel-image*' \
+            --qf '%{installtime} %{version}-%{name}-%{release}\n' \
+        | sort -n \
+        | tail -n 1 \
+        | cut -f 2 -d ' ' \
+        | sed 's/kernel-image-//')"
+
+ln -s vmlinuz-$kver /boot/vmlinuz
+ln -s initrd-$kver.img /boot/initrd.img

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

@@ -0,0 +1,52 @@
+# step 4: build the virtual machine image
+
+IMAGE_PACKAGES = $(SYSTEM_PACKAGES) \
+		 $(COMMON_PACKAGES) \
+		 $(BASE_PACKAGES) \
+		 $(THE_PACKAGES) \
+		 $(call list,$(BASE_LISTS) $(THE_LISTS)) \
+		 $(call kpackages,$(THE_KMODULES) $(BASE_KMODULES),$(KFLAVOURS))
+
+# 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 \
+		echo "** error: sudo not available, see doc/vm.txt" >&2; \
+		exit 1; \
+	fi
+
+prepare-image: check-sudo
+	@if ! sudo $(TOPDIR)/bin/tar2vm \
+		"$(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)

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,14 +5,15 @@ 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)
 
 # modern free xorg drivers for mainstream hardware requires KMS support
-use/install2/kms:
-	@$(call set,STAGE1_KMODULES_REGEXP,drm.*)
+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/image-scripts.d/99cleanupdb

@@ -3,9 +3,6 @@
 echo "** install2 packages before rpmdb purge:"
 rpmquery -a --qf='%{NAME} %{VERSION}-%{RELEASE}\n'
 
-# not going to need them without rpmdb, it's not even rescue anymore
-apt-get remove -f -y apt libapt
-
 # remove rpm, apt databases and cache
 find /var/lib/rpm /var/lib/apt /var/cache/apt -type f -delete
 

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/kernel/lib/10-kernel.mk

@@ -1,4 +1,6 @@
 # step 4: build the distribution image
 #         take care for kernel bits
 
-DOT_BASE += $(call kpackages,$(THE_KMODULES) $(BASE_KMODULES),$(KFLAVOURS))
+DOT_BASE += $(call kpackages, \
+	    $(THE_KMODULES) $(BASE_KMODULES) $(BASE_KMODULES_REGEXP), \
+	    $(KFLAVOURS))

features.in/live/config.mk

@@ -9,6 +9,10 @@ use/live: use/stage2 sub/stage2/live
 use/live/base: use/live use/syslinux/ui/menu
 	@$(call add,LIVE_LISTS,$(call tags,base && (live || network)))
 
+# a very simplistic one
+use/live/x11: use/live use/x11/xorg
+	@$(call add,LIVE_PACKAGES,xinit)
+
 # optimized out: use/x11/xorg
 use/live/desktop: use/live/base use/x11/wacom use/live/sound +vmguest +power
 	@$(call add,LIVE_LISTS,$(call tags,desktop && (live || network)))
@@ -26,9 +30,12 @@ use/live/textinstall: use/syslinux/localboot.cfg
 
 # NB: there's an unconditional live/image-scripts.d/40-autologin script
 #     *but* it only configures some of the *existing* means; let's add one
-#     for the cases when there should be no display manager
-use/live/autologin: use/live use/x11/xorg
-	@$(call add,LIVE_PACKAGES,autologin xinit)
+#     or another for the cases when there should be no display manager
+use/live/autologin: use/live/x11
+	@$(call add,LIVE_PACKAGES,autologin)
+
+use/live/nodm: use/live/x11
+	@$(call add,LIVE_PACKAGES,nodm)
 
 use/live/hooks: use/live
 	@$(call add,LIVE_PACKAGES,livecd-run-hooks)

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

@@ -1,4 +1,4 @@
-#!/bin/sh -ef
+#!/bin/sh -e
 
 if [ ! -x /usr/bin/X ]; then
 	echo "SKIP autologin: X not installed" >&2
@@ -7,14 +7,22 @@ fi
 
 USER=altlinux
 
-# setup runlevel
+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
 	[ -z "$runlevel" ] && runlevel=5
 	sed -i "s,^\(id:\)\(.*\)\(:initdefault.*\),\\1$runlevel\\3," "$INITTAB"
 fi
 
-# autologin^2
+## autologin^2
 if [ -x /usr/sbin/autologin ]; then
 	cat << E_O_F >> /etc/sysconfig/autologin
 USER=$USER
@@ -22,23 +30,25 @@ AUTOLOGIN=yes
 E_O_F
 fi
 
-# lightdm autologin
+## lightdm autologin
 LIGHTDM_CONF=/etc/lightdm/lightdm.conf
 if [ -f "$LIGHTDM_CONF" ]; then
 	sed -i \
 		-e "s/^#\(autologin-user=\).*$/\1$USER/" \
 		-e "s/^#\(autologin-user-timeout=0\)/\1/" \
 		"$LIGHTDM_CONF"
+	add_nopasswdlogin_group lightdm ||:
 fi
 
-# gdm2 autologin
+## gdm2 autologin
 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
+## kdm3 autologin
 # TODO: iterate over kdm{,4} if feasible
 KDMRC=/etc/X11/kdm/kdmrc
 if [ -f "$KDMRC" ]; then
@@ -47,3 +57,66 @@ if [ -f "$KDMRC" ]; then
 		-e '/AutoLoginUser/ s,^.*$,AutoLoginUser='$USER',' \
 		"$KDMRC"
 fi
+
+## nodm autologin (the last since the most intrusive)
+# FIXME nodm and xinitrc should be modified (also in p6)
+NODM_RC=/etc/sysconfig/nodm
+NODM_EXE=/usr/sbin/nodm
+
+if [ -x "$NODM_EXE" ]; then
+	cat << E_O_F >> "$NODM_RC"
+export NODM_USER=$USER
+E_O_F
+else
+	exit 0
+fi
+
+# FIXME: drop when #27449 is fixed
+PREFDM=/etc/X11/prefdm
+if [ -f "$PREFDM" ] && ! grep -q nodm "$PREFDM"; then
+	sed -i \
+		-e '/AUTOLOGIN_EXE=/ s,^.*$,AUTOLOGIN_EXE='$NODM_EXE',' \
+		-e '/AUTOLOGIN_CFG=/ s,^.*$,AUTOLOGIN_CFG='$NODM_RC',' \
+		"$PREFDM"
+fi
+
+# FIXME: drop when #27451 is fixed
+NODM_PAM=/etc/pam.d/nodm
+for module in pam_console.so pam_ck_connector.so; do
+	if [ -f /lib*/security/$module ]; then
+		str="-session	optional	$module"
+		grep -q "^$str$" "$NODM_PAM" || echo -e "$str" >> "$NODM_PAM"
+	fi
+done
+
+NODM_POLKIT_CONFDIR=/etc/polkit-1/localauthority/50-local.d
+NODM_POLKIT_CONF=org.freedesktop.NetworkManager.pkla
+if [ -d "$NODM_POLKIT_CONFDIR" ]; then
+	cat > "$NODM_POLKIT_CONFDIR/$NODM_POLKIT_CONF" << _EOF_
+[nm-applet]
+Identity=unix-group:users
+Action=org.freedesktop.NetworkManager.*
+ResultAny=yes
+ResultInactive=no
+ResultActive=yes
+_EOF_
+fi
+
+NODM_DBUS_NM_CONF=/etc/dbus-1/system.d/nm-applet.conf
+if [ -f "$NODM_DBUS_NM_CONF" ]; then
+	sed -i "s/at_console=\"true\"/user=\"$USER\"/" "$NODM_DBUS_NM_CONF"
+fi
+
+NODM_G2KR_DIR=/etc/skel/.gnome2/keyrings
+mkdir -p "$NODM_G2KR_DIR"
+echo -n login > "$NODM_G2KR_DIR"/default
+cat > "$NODM_G2KR_DIR"/login.keyring << _EOF_
+[keyring]
+display-name=login
+ctime=0
+mtime=0
+lock-on-idle=false
+lock-after=false
+_EOF_
+
+:

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/metadata/lib/50-metadata.mk

@@ -6,6 +6,9 @@ METADIR := files/Metadata
 # preparation targets of ../../build-distro/lib/build-distro.mk
 WHATEVER += metadata
 
+# handle these too
+DOT_BASE += $(BASE_PACKAGES_REGEXP)
+
 # args: name, suffix, command
 define dump-THEM
 if [ -n "$($(1)_$(2))" ]; then echo -e "\n## $(1)_$(2)"; $(3) $($(1)_$(2)); fi;

features.in/pack/config.mk

@@ -1,3 +1,6 @@
+### this might really belong to build-*...
+
+# distributions
 DISTRO_EXTS := .iso
 
 use/pack:
@@ -12,6 +15,7 @@ else
 	@$(call set,IMAGE_PACKTYPE,isodata)
 endif
 
+# virtual environments
 VE_ARCHIVES := tar cpio
 VE_COMPRESSORS := gz xz# there's no sense in bzip2 by now
 VE_ZIPS := $(call addsuffices, \
@@ -34,3 +38,8 @@ $(foreach c,$(VE_ARCHIVES), \
 	$(eval $(call PACK_containers,$(c))) \
 	$(foreach z,$(VE_COMPRESSORS), \
 		$(eval $(call PACK_compressors,$(c),$(z)))))
+
+# virtual machines
+VM_EXTS := .img .qcow2 .vdi .vmdk .vhd
+
+$(VM_EXTS:.%=use/pack/%): use/pack; @:

features.in/plymouth/README

@@ -0,0 +1,5 @@
+Эта фича предназначена для добавления поддержки plymouth
+-- современной реализации bootsplash.  Плотно взаимодействует
+с фичей branding по объективным причинам, но оформлена отдельно
+для возможности собирать образы с частичным брендированием либо
+"без излишеств".

features.in/plymouth/config.mk

@@ -0,0 +1,28 @@
++plymouth: use/plymouth/full; @:
+
+# and a few silent aliases
+use/plymouth/live: use/plymouth/stage2
+use/plymouth/install2: use/plymouth/stage2
+
+use/plymouth:
+	@$(call add_feature)
+
+# NB: *_REGEXP due to branding() using regexp and the
+#     dependency resolution having to occur within a
+#     single transaction (due to plymouth-system-theme)
+
+# looks like there's no sense to pull in progressbars
+# while leaving the very basic text bootloader screen
+use/plymouth/stage2: use/plymouth use/branding \
+	use/syslinux/ui/gfxboot use/stage2/kms
+	@$(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/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)
+
+use/plymouth/full: use/plymouth/stage2 use/plymouth/base; @:

features.in/plymouth/stage1/scripts.d/11-initrd-plymouth

@@ -0,0 +1,7 @@
+#!/bin/sh
+CONFIG=/etc/plymouth/plymouthd.conf
+
+if [ -f "$CONFIG" ]; then
+	grep -q '^Theme=' "$CONFIG" || sed -i 's/#\([T\[]\)/\1/' "$CONFIG"
+	echo 'FEATURES += plymouth' >> /etc/initrd.mk
+fi

features.in/plymouth/stage2/image-scripts.d/10-plymouth

@@ -0,0 +1,3 @@
+#!/bin/sh
+
+cp -a /usr/share/plymouth/default-install-duration /var/lib/plymouth/boot-duration

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/config.mk

@@ -13,6 +13,7 @@ use/slinux: use/x11/xfce use/x11/gdm2.20
 	@$(call add,THE_LISTS,slinux/network)
 	@$(call add,THE_LISTS,slinux/xfce)
 	@$(call add,THE_LISTS,$(call tags,base l10n))
+	@$(call set,META_VOL_SET,Simply Linux)
 
 use/slinux/full: use/isohybrid use/slinux use/systemd \
 	use/firmware/wireless use/branding/complete \

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/stage2/config.mk

@@ -3,6 +3,9 @@ use/stage2: sub/stage1
 	@$(call add_feature)
 	@$(call add,STAGE1_PACKAGES,file make-initrd make-initrd-propagator)
 
+use/stage2/kms:
+	@$(call add,STAGE1_KMODULES_REGEXP,drm.*)
+
 # NB: sub/stage2 isn't used standalone but rather
 #     as a base for various livecd modifications
 #     (currently install2, live, rescue)

features.in/stage2/stage1/scripts.d/11-initrd-misc

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

features.in/stage2/stage1/scripts.d/80-make-initfs

@@ -1,15 +1,26 @@
 #!/bin/sh -efu
 # NB: /etc/initrd.mk carefully prepared by earlier scripts
 
-kver="$(rpm -qa 'kernel-image*' --qf '%{installtime} %{version}-%{name}-%{release}\n' \
+kver="$(rpm -qa 'kernel-image*' \
+	    --qf '%{installtime} %{version}-%{name}-%{release}\n' \
 	| sort -n \
 	| tail -n 1 \
 	| cut -f 2 -d ' ' \
 	| sed 's/kernel-image-//')"
 
-make-initrd --no-checks -k $kver \
-&& gzip < /boot/initrd-$kver.img > $(getconf LIBDIR)/propagator/initfs \
-|| exit 1
+MAKE_INITRD_OPTS="--no-checks -k $kver"
+MAKE_INITRD_VER="`make-initrd -V \
+	| sed -rn 's/^make-initrd version ([0-9.]+)/\1/p'`"
+
+if [ "`rpmvercmp "$MAKE_INITRD_VER" "0.7.8"`" != "-1" ]; then
+	MAKE_INITRD_OPTS="$MAKE_INITRD_OPTS --no-depmod"
+fi
+
+if make-initrd $MAKE_INITRD_OPTS; then
+	gzip < /boot/initrd-$kver.img > $(getconf LIBDIR)/propagator/initfs
+else
+	exit 1
+fi
 
 [ -h /boot/vmlinuz ] || ln -s vmlinuz-$kver /boot/vmlinuz
 [ -h /boot/initrd.img ] || ln -s initrd-$kver.img /boot/initrd.img

features.in/syslinux/README

@@ -1,6 +1,10 @@
 Добавление поддержки syslinux; требуется для инсталяторов, live/rescue;
 реализуется в рамках stage1.
 
+Самостоятельное творческое использование на данный момент подразумевает
+знакомство с /usr/share/doc/syslinux-*/syslinux.txt и изучение кусочков
+конфигурации, которые уже существуют.
+
 Цели config.mk:
 * use/syslinux/ui/% -- конфигурирование интерфейса (см. cfg.in/00*.cfg);
   при использовании автоматически добавляют syslinux в FEATURES;
@@ -17,8 +21,3 @@
 
 Здесь производится первичная обработка конфигурационных данных,
 окончательно проверяемых и используемых уже в инструментальном чруте.
-
-TODO: может потребоваться обобщение механизма генерации с учётом
-многоуровневых меню и включаемых файлов (которыми лучше не злоупотреблять
-из соображений скорости инициализации загрузчика); требуется обеспечить
-брендирование заголовков.

features.in/syslinux/cfg.in/01none.cfg

@@ -0,0 +1 @@
+prompt 0

features.in/syslinux/cfg.in/02noescape.cfg

@@ -0,0 +1,2 @@
+noescape 1
+

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
+  append initrd=alt0/full.cz fastboot live lowmem showopts automatic=method:cdrom ramdisk_size=@live_size@ stagename=live vga=0x314 @bootargs@
 

features.in/syslinux/cfg.in/20install2.cfg

@@ -1,10 +1,10 @@
 label linux
-  menu label ^Install ALT Linux
+  menu label ^Install @distro@
   kernel alt0/vmlinuz
-  append initrd=alt0/full.cz changedisk fastboot showopts automatic=method:cdrom quiet=1 ramdisk_size=@altinst_size@ vga=0x314
+  append initrd=alt0/full.cz changedisk fastboot showopts automatic=method:cdrom ramdisk_size=@altinst_size@ vga=0x314 @bootargs@
 
 label noapic
   menu label ^Failsafe install
   kernel alt0/vmlinuz
-  append initrd=alt0/full.cz changedisk lowmem noapic nolapic showopts ramdisk_size=@altinst_size@
+  append initrd=alt0/full.cz changedisk lowmem noapic nolapic showopts ramdisk_size=@altinst_size@ xdriver=vesa @bootargs@
 

features.in/syslinux/generate.mk

@@ -17,8 +17,8 @@ endif
 ifdef SYSLINUX_UI
 SYSLINUX_MODULES := $(SYSLINUX_MODULES) $(SYSLINUX_UI)
 else
-$(warning no syslinux ui configured, default is plain text prompt)
-SYSLINUX_UI := prompt
+$(warning no syslinux ui configured, default is now none)
+SYSLINUX_UI := none
 endif
 
 # SUBPROFILES are considered SYSLINUX_CFG too
@@ -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}
@@ -55,7 +54,7 @@ all: debug timeout
 	@echo $(SYSLINUX_FILES) > $(DSTDIR)/syslinux.list
 
 # integerity check
-timeout: copy
+timeout: distro
 	@if [ "$(SYSLINUX_TIMEOUT)" -ge 0 ] 2>/dev/null; then \
 		TIMEOUT="$(SYSLINUX_TIMEOUT)"; \
 	else \
@@ -63,6 +62,26 @@ timeout: copy
 	fi; \
 	sed -i "s,@timeout@,$$TIMEOUT," $(DSTDIR)/*.cfg
 
+distro: bootargs
+	@if [ -n "$(META_VOL_SET)" ]; then \
+		DISTRO="$(META_VOL_SET)"; \
+	else \
+		DISTRO="ALT Linux"; \
+	fi; \
+	sed -i "s,@distro@,$$DISTRO," $(DSTDIR)/*.cfg
+
+# pass over additional parameters, if any
+bootargs: clean
+	@if [ -n "$(STAGE2_BOOTARGS)" ]; then \
+		sed -i "s,@bootargs@,$(STAGE2_BOOTARGS)," $(DSTDIR)/*.cfg; \
+	fi; \
+	sed -i "s,@bootargs@,," $(DSTDIR)/*.cfg
+
+clean: copy
+	@if [ "$(SYSLINUX_UI)" = gfxboot ]; then \
+		sed -i "s,\^,," $(DSTDIR)/*.cfg; \
+	fi
+
 copy: prep
 	@cp -pLt $(DSTDIR) -- $(sort \
 		$(foreach C,$(SYSLINUX_CFG),$(call cfg,$(C))) \

features.in/syslinux/stage1/scripts.d/01-syslinux

@@ -3,6 +3,7 @@
 # copy modules; see also ../../generate.mk
 
 MODDIR="/usr/lib/syslinux"
+CFG="$GLOBAL_BOOTLOADER.cfg"
 
 mkdir -p "$WORKDIR/syslinux"
 cd "$WORKDIR/syslinux"
@@ -30,7 +31,18 @@ if [ -n "$SYSLINUX_MODULES" ]; then
 fi
 
 # number ordering sponsored by shell's pathname expansion
-grep -hv '^#' .in/[0-9][0-9]*.cfg > "$GLOBAL_BOOTLOADER.cfg"
+grep -hv '^#' .in/[0-9][0-9]*.cfg > "$CFG"
+
+# there should be either DEFAULT or UI directive there
+if ! egrep -i '^(default|ui)' "$CFG"; then
+	DEFAULT="$(grep -i '^label ' "$CFG" | head -1 | cut -f2 -d' ')"
+	if [ -n "$DEFAULT" ]; then
+		echo "default $DEFAULT" >> "$CFG"
+	else
+		echo "error: no DEFAULT or UI directive and cannot guess" >&2
+		exit 1
+	fi
+fi
 
 # snippets are not going into the actual image
 if [ "$DEBUG" != 2 ]; then rm -r .in/; fi

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

@@ -32,11 +32,11 @@ IMAGE_SORTDIR := $(SORTDIR)
 
 # reconstruct instead of passing yet another variable
 IMAGE_OUTDIR   := $(IMAGEDIR)$(IMAGE_SORTDIR:%=/%)
-IMAGE_OUTFILE  := $(IMAGE_NAME)-$(DATE)-$(ARCH).$(IMAGE_TYPE)
+IMAGE_OUTFILE  := $(IMAGE_NAME)-$(STATUS)$(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)
@@ -23,7 +23,8 @@ SPACE := $(NULL) # the officially documented way of getting a space
 list2re = $(subst $(SPACE),|,$(strip $(1)))
 
 # args: KMODULES, KFLAVOURS
-kpackages = ^kernel-(image|modules-($(call list2re,$(1))))-($(call list2re,$(2)))$$
+kpackages = $(and $(1),$(2), \
+	^kernel-(image|modules-($(call list2re,$(1))))-($(call list2re,$(2)))$$)
 
 # arg: branding subpackages
-branding = ^branding-$(BRANDING)-($(call list2re,$(1)))$$
+branding = $(and $(1),^branding-$(BRANDING)-($(call list2re,$(1)))$$)

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/common.mk

@@ -7,10 +7,17 @@ BUILD_LOG = build.log
 SYMLINK = build
 
 # brevity postprocessor; not exported, for toplevel use only
-SHORTEN = $(shell \
-	echo -n "| sed"; \
+SHORTEN = $(shell FILTER=; \
 	if [ -s "$(SYMLINK)" ]; then \
-		echo -n " -e 's,$(BUILDDIR),$(SYMLINK),'"; \
+		FILTER=" -e 's,$(BUILDDIR),$(SYMLINK),'"; \
+	fi; \
+	if [ -n "$$TMP" ]; then \
+		FILTER="$$FILTER -e 's,$$TMP,\$$TMP,'"; \
+	fi; \
+	if [ -n "$$HOME" ]; then \
+		FILTER="$$FILTER -e 's,$$HOME,~,'"; \
+	fi; \
+	if [ -n "$$FILTER" ]; then \
+		echo -n "| sed $$FILTER"; \
 	fi; \
-	echo -n " -e 's,$(TMP),\$$TMP,' -e 's,$(HOME),~,'"; \
 )

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/help.mk

@@ -6,7 +6,7 @@ define help_body
 endef
 else
 define help_body
-	@echo '** available $(1) targets:'; \
+	echo '** available $(1) targets:'; \
 	columnize $(2)
 endef
 endif
@@ -14,11 +14,15 @@ endif
 help = $(and $(2),$(help_body))
 
 help/distro:
-	$(call help,distribution,$(sort $(DISTROS:distro/%=%)))
+	@$(call help,distribution,$(sort $(DISTROS:distro/%=%)))
 
 help/ve:
-	@echo '** available virtual environment targets:'; \
-	columnize $(sort $(VES))
+	@[ -n "$(SPACE)" ] && echo; \
+	$(call help,virtual environment,$(sort $(VES)))
 
-help: | help/distro help/space help/ve; @:
-help/space:; @echo
+help/vm:
+	@[ -n "$(SPACE)" ] && echo; \
+	$(call help,virtual machine,$(sort $(VMS)))
+
+help: SPACE = 1
+help: help/distro help/ve help/vm; @:

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

@@ -0,0 +1,16 @@
+# step 2: build up virtual machine's configuration
+
+ifndef MKIMAGE_PROFILES
+$(error this makefile is designed to be included in toplevel one)
+endif
+
+ifeq (vm,$(IMAGE_CLASS))
+
+vm/.bare: profile/bare
+	@$(call add,BASE_PACKAGES,interactivesystem lilo shadow-utils e2fsprogs)
+	@$(call set,KFLAVOURS,std-def)
+
+vm/bare: vm/.bare
+	@$(call add,BASE_PACKAGES,apt)
+
+endif

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
 
@@ -34,15 +34,19 @@ include lib/*.mk
 include conf.d/*.mk
 include features.in/*/config.mk
 
+# starts to look copypastey
 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)
+VM_TARGETS := $(shell sed -n 's,^\(vm/[^:.]\+\):.*$$,\1,p' \
+		lib/vm.mk $(wildcard conf.d/*.mk) | sort -u)
 DISTROS := $(call addsuffices,$(DISTRO_EXTS),$(DISTRO_TARGETS))
 VES     := $(call addsuffices,$(VE_EXTS),$(VE_TARGETS))
-IMAGES  := $(DISTROS) $(VES)
+VMS     := $(call addsuffices,$(VM_EXTS),$(VM_TARGETS))
+IMAGES  := $(DISTROS) $(VES) $(VMS)
 
-.PHONY: $(IMAGES) $(DISTRO_TARGETS) $(VE_TARGETS)
+.PHONY: $(IMAGES) $(DISTRO_TARGETS) $(VE_TARGETS) $(VM_TARGETS)
 .PHONY: debug everything help space
 
 ### duplicate but still needed

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