0.7.0-alt1

- new features:
  + initial build-vm
  + plymouth

.gear/mkimage-profiles.spec

@@ -1,5 +1,5 @@
 Name: mkimage-profiles
-Version: 0.6.4
+Version: 0.7.0
 Release: alt1
 
 Summary: ALT Linux based distribution metaprofile
@@ -61,6 +61,24 @@ cp -a * %buildroot%mpdir
 %doc README QUICKSTART
 
 %changelog
+* 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
+
+* Mon May 14 2012 Michael Shigorin <mike@altlinux.org> 0.6.6-alt1
+- build helpers refactored
+- initial frontend support
+
+* Mon May 07 2012 Michael Shigorin <mike@altlinux.org> 0.6.5-alt1
+- branding feature
+
 * Mon Apr 23 2012 Michael Shigorin <mike@altlinux.org> 0.6.4-alt1
 - simply better (tm)
 

.gear/tags/5090c03579f3fc620063211417b18e9a57a0eb8d

@@ -1,6 +0,0 @@
-object d190759717b97a39e5d0de0ffb555424d6b1c335
-type commit
-tag v0.6.3
-tagger Michael Shigorin <mike@altlinux.org> 1334001608 +0300
-
-squash!

.gear/tags/5c3b721d4cfae520e1fae593de6dd128da862699

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

.gear/tags/list

@@ -1 +1 @@
-5090c03579f3fc620063211417b18e9a57a0eb8d v0.6.3
+5c3b721d4cfae520e1fae593de6dd128da862699 v0.6.8

Makefile

@@ -2,6 +2,9 @@
 # iterate over multiple goals/arches,
 # collect proceedings
 
+# preferences
+-include $(HOME)/.mkimage/profiles.mk
+
 # for immediate assignment
 ifndef ARCHES
 ifdef ARCH
@@ -23,15 +26,20 @@ endif
 # recursive make considered useful for m-p
 MAKE += -r --no-print-directory
 
-.PHONY: clean distclean help
-clean distclean help:
+DIRECT_TARGETS := clean distclean check help help/distro help/ve
+.PHONY: $(DIRECT_TARGETS)
+$(DIRECT_TARGETS):
 	@$(MAKE) -f main.mk $@
 
 export NUM_TARGETS := $(words $(MAKECMDGOALS))
 
+# for pipefail
+SHELL = /bin/bash
+
 # real targets need real work
 %:
 	@n=1; \
+	set -o pipefail; \
 	say() { echo "$$@" >&2; }; \
 	if [ "$(NUM_TARGETS)" -gt 1 ]; then \
 		n="`echo $(MAKECMDGOALS) \

README

@@ -32,7 +32,7 @@ Most docs are in Russian, welcome to learn it or ask for English.
 - сборка образа
 
 Объекты:
-- дистрибутивы и виртуальные окружения:
+- дистрибутивы и виртуальные среды/машины:
   + описываются в conf.d/*.mk или соответственно lib/{distro,ve}.mk
   + могут основываться на предшественниках, расширяя их
   + дистрибутивы также:
@@ -43,7 +43,7 @@ Most docs are in Russian, welcome to learn it or ask for English.
   + базовые комплекты помещены в подкаталогах под sub.in/;
     их наборы скриптов могут расширяться фичами
 - фичи:
-  + список собирается в $(FEATURES)
+  + накопительный список собирается в $(FEATURES)
   + законченные блоки функциональности (или наборы таковых)
   + описываются в индивидуальных features.in/*/config.mk
   + могут требовать другие фичи, а также субпрофили

bin/tar2vm

@@ -0,0 +1,130 @@
+#!/bin/sh -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="$(expr 3 '*' "$TARSIZE" '/' 2)"
+DISKSIZE="${3:-${DEFSIZE:-268435456}}"
+# ...and in megabytes
+DISKSIZEM="$(expr "$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" bs=1 count=1 seek="$DISKSIZE" conv=notrunc
+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

@@ -21,6 +21,7 @@
   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 (дополнительные пакеты)

conf.d/desktop.mk

@@ -7,12 +7,14 @@ 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,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; @:
+distro/desktop-plymouth: distro/icewm +plymouth; @:
 
 endif

conf.d/live.mk

@@ -9,7 +9,7 @@ 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
@@ -28,15 +28,13 @@ 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/syslinux/localboot.cfg
-	@$(call add,LIVE_PACKAGES,live-install)
-
-distro/.livecd-install: distro/.live-base
-	@$(call add,LIVE_PACKAGES,livecd-install)
+distro/live-install: distro/.live-base use/live/textinst; @:
+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 +razorqt; @:
-distro/live-tde: distro/.live-desktop use/live/ru +tde; @:
+distro/live-razorqt: distro/.live-desktop use/live/autologin +razorqt; @:
+distro/live-tde: distro/.live-desktop use/live/ru use/live/install +tde; @:
+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)))
@@ -55,6 +53,20 @@ 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-free
+	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
+	@$(call add,LIVE_PACKAGES,enlightenment)
+
+distro/live-gimp: distro/live-icewm use/x11/3d-free use/live/ru
+	@$(call add,LIVE_PACKAGES,gimp tintii immix fim)
+	@$(call add,LIVE_PACKAGES,cvltonemap darktable geeqie rawstudio ufraw)
+	@$(call add,LIVE_PACKAGES,macrofusion python-module-pygtk-libglade)
+	@$(call add,LIVE_PACKAGES,qtfm openssh-clients rsync)
+	@$(call add,LIVE_PACKAGES,design-graphics-sisyphus2)
 
 endif

conf.d/server.mk

@@ -17,7 +17,8 @@ distro/server-mini: distro/.server-base use/cleanup/x11-alterator
 		$(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-systemd: distro/server-mini use/systemd
+	@$(call set,KFLAVOURS,std-def)
 
 distro/server-ovz: distro/server-mini use/install2/net use/hdt use/rescue \
 	use/firmware/server use/firmware/wireless use/power/acpi/button
@@ -27,7 +28,6 @@ distro/server-ovz: distro/server-mini use/install2/net use/hdt use/rescue \
 	@$(call add,MAIN_KMODULES,ipset ipt-netflow opendpi pf_ring xtables-addons)
 	@$(call add,MAIN_KMODULES,drbd83 kvm)
 	@$(call add,BASE_LISTS,ovz-server)
-	@$(call add,MAIN_LISTS,kernel-wifi)
 	@$(call add,MAIN_GROUPS,dns-server http-server ftp-server kvm-server)
 	@$(call add,MAIN_GROUPS,ipmi mysql-server dhcp-server mail-server)
 	@$(call add,MAIN_GROUPS,monitoring diag-tools)

conf.d/simply.mk

@@ -2,8 +2,10 @@
 
 ifeq (distro,$(IMAGE_CLASS))
 
-distro/live-simply: distro/.livecd-install use/isohybrid use/slinux-live use/systemd \
-	use/firmware/wireless use/x11/drm use/x11/3d-proprietary use/syslinux/ui/gfxboot
-	@$(call set,BRANDING,simply-linux)
+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)
 
 endif

doc/features.txt

@@ -1,8 +1,9 @@
 фичи
 ~~~~
 Особенности дистрибутива, не учитываемые в пакетной базе
-или зависящие от переменных времени сборки/установки образа,
-могут быть оформлены как:
+или зависящие от переменных времени сборки/установки образа;
+по необходимости влияют на конфигурацию, приносят с собой
+или запрашивают скрипты, которые могут быть оформлены как:
 
 * scripts.d/ или image-scripts.d/ различных стадий;
 * пакеты installer-feature-*
@@ -27,3 +28,12 @@
 Стоит избегать изменения пакетных умолчаний в случае, когда их
 представляется осмысленным и возможным скорректировать в пакете:
 таким образом они станут более дистрибутивными.
+
+Обратите внимание, что фичи включаются в комплект инкрементально:
+что добавили, то уже не убрать; поэтому при необходимости следует
+выделять промежуточные цели сборки, собирающие необходимые фичи
+и оставляющие те, по которым есть расхождения, на включение ближе
+к конечной дистрибутивной цели.
+
+Соглашение по именованию таково, что цели use/ФИЧА и use/ФИЧА/...
+определяются в файле features.in/ФИЧА/config.mk и только в нём.

doc/variables.txt

@@ -39,7 +39,7 @@
   + см. ../lib/log.mk
 
 - CHECK
-  + включает режим проверки сборки конфигурации
+  + включает режим проверки сборки конфигурации (без сборки образа)
   + значение: пусто (по умолчанию) либо любая строка
   + см. ../lib/build.mk
 
@@ -76,6 +76,11 @@
   + NB: в силу специфики обработки передаётся только явно
   + см. ../Makefile, ../report.mk, ../lib/report.mk
 
+- ROOTPW
+  + устанавливает пароль root по умолчанию для образов виртуальных машин
+  + значение: пусто (по умолчанию root) либо строка
+  + см. ../features.in/build-vm/image-scripts.d/00root
+
 - SAVE_PROFILE
   + сохраняет архив сгенерированного профиля в .disk/
   + значение: пусто (по умолчанию) либо любая строка

doc/vm.txt

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

features.in/Makefile

@@ -65,11 +65,9 @@ $(FEATURES):
 	for sub in / $(SUBPROFILES); do \
 		dirtags=; \
 		if [ "$$sub" = / ]; then \
-			parts=lib; \
 			srcdirs="."; \
 			dst="."; \
 		else \
-			parts=; \
 			src="$${sub%/*}"; \
 			dst="$${sub#*/}"; \
 			srcdirs=; \
@@ -92,7 +90,7 @@ $(FEATURES):
 		for srcdir in $$srcdirs; do \
 			[ -d "$$srcdir" ] || continue; \
 			pushd "$$srcdir" >&/dev/null; \
-			for part in $$parts {image-,}scripts.d; do \
+			for part in lib {image-,}scripts.d; do \
 				destdir="$(BUILDDIR)/$$dst/$$part"; \
 				[ -d "$$destdir" ] || continue; \
 				if [ "$$sub" = / -a -d "$$part" ]; then \

features.in/branding/README

@@ -0,0 +1,21 @@
+Эта фича врезается в makefile субпрофилей и обеспечивает
+добавление задающих внешний вид и сообщения дистрибутива
+пакетов; см. тж. http://www.altlinux.org/Branding
+
+Назначение и возможные значения (если требуются):
+
+- 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

@@ -0,0 +1,11 @@
+# NB: release part of branding goes to install2 feature
+use/branding:
+	@$(call add_feature)
+
+# 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/plymouth/full
+	@$(call add,INSTALL2_BRANDING,notes slideshow)

features.in/branding/install2/lib/50branding.mk

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

features.in/branding/lib/20-branding.mk

@@ -0,0 +1,4 @@
+# step 4: build the distribution image
+# NB: this comes just before build-distro.mk
+
+DOT_BASE += $(call branding,$(THE_BRANDING))

features.in/branding/live/lib/50branding.mk

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

features.in/branding/main/lib/50branding.mk

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

features.in/branding/stage1/lib/50branding.mk

@@ -0,0 +1 @@
+CHROOT_PACKAGES_REGEXP += $(call branding,$(STAGE1_BRANDING))

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

@@ -16,33 +16,13 @@ BOOT_ABST := $(META_ABSTRACT)
 
 BOOT_TYPE := isolinux
 
-# Metadata/ needed only for installers (and not for e.g. syslinux.iso)
-# FIXME: installable live needs it too, don't move to install2 feature
-### see also .../pkg.in/lists/Makefile
-ifneq (,$(findstring install2,$(FEATURES)))
-METADATA = metadata
-endif
-
 # see also ../scripts.d/01-isosort; needs mkimage-0.2.2+
 MKI_SORTFILE := /tmp/isosort
 
 all: $(GLOBAL_DEBUG) prep copy-subdirs copy-tree run-scripts pack-image \
 	postprocess $(GLOBAL_CLEAN_WORKDIR)
 
-prep: $(GLOBAL_DEBUG) dot-disk $(METADATA) imagedir
-
-metadata: dot-base
-	@mkdir -p files/Metadata
-	@rm -f files/Metadata/pkg-groups.tar
-# see also alterator-pkg (backend3/pkg-install); we only tar up what's up to it
-	@tar -cvf files/Metadata/pkg-groups.tar -C $(PKGDIR) \
-		$$(echo $(call list,$(MAIN_GROUPS) .base) \
-			$(call group,$(MAIN_GROUPS)) \
-		   | sed 's,$(PKGDIR)/*,,g')
-
-dot-base:
-	@p="$(call kpackages,$(THE_KMODULES) $(BASE_KMODULES),$(KFLAVOURS))"; \
-	echo -e "\n## added by build-distro.mk\n$$p" >> $(call list,.base)
+prep: $(GLOBAL_DEBUG) dot-disk $(WHATEVER) imagedir
 
 dot-disk:
 	@mkdir -p files/.disk

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,3 @@
+# hooked from ../../lib/sugar.mk
+use/build-vm:
+	@$(call add_feature)

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

@@ -0,0 +1,7 @@
+#!/bin/sh
+
+ROOTPW="${GLOBAL_ROOTPW:-root}"
+
+if type -t chpasswd >&/dev/null; then
+	echo "root:$ROOTPW" | chpasswd
+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,16 @@
+#!/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)
+# 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/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,33 @@
+# 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
+
+check-sudo:
+	@if ! type -t sudo >&/dev/null; then \
+		echo "** error: sudo not available, see doc/vm.txt" >&2; \
+		exit 1; \
+	fi
+
+convert-image: check-sudo
+	@if ! sudo $(TOPDIR)/bin/tar2vm \
+		"$(VM_TARBALL)" "$(IMAGE_OUTPATH)" $$VM_SIZE; then \
+		echo "** error: sudo tar2vm failed, see also doc/vm.txt" >&2; \
+		exit 1; \
+	fi
+
+run-image-scripts: GLOBAL_ROOTPW := $(ROOTPW)
+
+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/install2/config.mk

@@ -1,4 +1,5 @@
-use/install2: use/stage2 sub/stage2/install2 use/cleanup/installer
+# alterator-based installer, second (livecd) stage
+use/install2: use/stage2 sub/stage2/install2 use/metadata use/cleanup/installer
 	@$(call add_feature)
 	@$(call set,INSTALL2_PACKAGES,installer-distro-$$(INSTALLER)-stage2)
 	@$(call add,INSTALL2_PACKAGES,branding-$$(BRANDING)-alterator)
@@ -8,6 +9,10 @@ use/install2: use/stage2 sub/stage2/install2 use/cleanup/installer
 use/install2/net: use/install2
 	@$(call add,INSTALL2_PACKAGES,curl)
 
+# modern free xorg drivers for mainstream hardware requires KMS support
+use/install2/kms: use/stage2/kms
+	@$(call add,BASE_KMODULES_REGEXP,drm.*)
+
 # see also use/vm/kvm/guest; 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/kernel/README

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

features.in/kernel/config.mk

@@ -0,0 +1,4 @@
+###
+use/kernel:
+	@$(call add_feature)
+	@$(call set,KFLAVOURS,std-def)

features.in/kernel/lib/10-kernel.mk

@@ -0,0 +1,6 @@
+# step 4: build the distribution image
+#         take care for kernel bits
+
+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)))
@@ -16,11 +20,22 @@ use/live/desktop: use/live/base use/x11/wacom use/live/sound +vmguest +power
 	@$(call add,LIVE_PACKAGES,fonts-ttf-dejavu fonts-ttf-droid)
 	@$(call add,SYSLINUX_CFG,localboot)
 
+# alterator-based permanent installation
+use/live/install: use/metadata use/syslinux/localboot.cfg
+	@$(call add,LIVE_PACKAGES,livecd-install)
+
+# text-based installation script
+use/live/textinstall: use/syslinux/localboot.cfg
+	@$(call add,LIVE_PACKAGES,live-install)
+
 # 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/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,14 @@ fi
 
 USER=altlinux
 
-# setup runlevel
+## 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,7 +22,7 @@ AUTOLOGIN=yes
 E_O_F
 fi
 
-# lightdm autologin
+## lightdm autologin
 LIGHTDM_CONF=/etc/lightdm/lightdm.conf
 if [ -f "$LIGHTDM_CONF" ]; then
 	sed -i \
@@ -31,14 +31,14 @@ if [ -f "$LIGHTDM_CONF" ]; then
 		"$LIGHTDM_CONF"
 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"
 fi
 
-# kdm3 autologin
+## kdm3 autologin
 # TODO: iterate over kdm{,4} if feasible
 KDMRC=/etc/X11/kdm/kdmrc
 if [ -f "$KDMRC" ]; then
@@ -47,3 +47,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/stage2cfg.mk

@@ -12,3 +12,7 @@ IMAGE_PACKAGES = $(COMMON_PACKAGES) $(THE_PACKAGES) $(LIVE_PACKAGES) \
 		 interactivesystem
 
 MKI_PACK_RESULTS = squash:live
+
+debug::
+	@echo "** live: IMAGE_PACKAGES: $(IMAGE_PACKAGES)"
+	@echo "** live: IMAGE_PACKAGES_REGEXP: $(IMAGE_PACKAGES_REGEXP)"

features.in/metadata/README

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

features.in/metadata/config.mk

@@ -0,0 +1,2 @@
+use/metadata:
+	@$(call add_feature)

features.in/metadata/lib/50-metadata.mk

@@ -0,0 +1,40 @@
+# step 4: build the distribution image
+
+# package lists are needed for installer and live-install images
+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;
+endef
+
+dump-PACKAGES = $(call dump-THEM,$(1),PACKAGES,echo)
+dump-LISTS = $(call dump-THEM,$(1),LISTS,cat)
+
+# BASE_PACKAGES, BASE_LISTS and whatever else goes into base install;
+# thus construct requisite .base packagelist for alterator-pkg
+metadata-.base:
+	@cd $(call list,/); \
+	{ \
+		echo "## generated by features.in/metadata/lib/metadata.mk"; \
+		$(foreach p,SYSTEM COMMON THE BASE,$(call dump-PACKAGES,$(p))) \
+		$(foreach l,THE BASE,$(call dump-LISTS,$(l))) \
+		if [ -n "$(DOT_BASE)" ]; then \
+			echo -e "\n## DOT_BASE\n$(DOT_BASE)"; \
+		fi; \
+	} | sed -re '/^[^[:space:]#]/ s/[[:space:]]+/\n/g' > .base
+
+# see also alterator-pkg (backend3/pkg-install);
+# we only tar up what's up to it
+metadata: metadata-.base
+	@mkdir -p $(METADIR); \
+	tar -C $(PKGDIR) -cvf - \
+		$(call rlist,$(MAIN_GROUPS) .base) \
+		$(call rgroup,$(MAIN_GROUPS)) \
+	> $(METADIR)/pkg-groups.tar

features.in/pack/config.mk

@@ -1,3 +1,4 @@
+# distributions
 DISTRO_EXTS := .iso
 
 use/pack:
@@ -12,6 +13,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 +36,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
+
+use/pack/img: 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)
+
+use/plymouth/base: use/plymouth use/install2/kms
+	@$(call add,INSTALL2_BOOTARGS,quiet splash)
+	@$(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/slinux/config.mk

@@ -1,5 +1,7 @@
 use/slinux: use/x11/xfce use/x11/gdm2.20
 	@$(call add_feature)
+	@$(call set,BRANDING,simply-linux)
+	@$(call add,THE_BRANDING,menu xfce-settings)
 	@$(call add,THE_LISTS,gnome-p2p)
 	@$(call add,THE_LISTS,slinux/$(ARCH))
 	@$(call add,THE_LISTS,slinux/games)
@@ -11,7 +13,8 @@ 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 add,THE_PACKAGES,apt-conf-sisyphus)
 
-use/slinux-live: use/slinux
-	@$(call add,THE_LISTS,slinux/live-install)
+use/slinux/full: use/isohybrid use/slinux use/systemd \
+	use/firmware/wireless use/branding/complete \
+	use/x11/drm use/x11/3d-proprietary
+	@$(call add,THE_PACKAGES,apt-conf-sisyphus)

features.in/slinux/live/image-scripts.d/50services

@@ -1,38 +1,29 @@
-#!/bin/sh -x
+#!/bin/sh
+# see also m-p-d::profiles/live/image-scripts.d/init3-services
 
-SYSTEMCTL=/bin/systemctl
-CHKCONFIG=/sbin/chkconfig
+#[ -x /bin/systemctl ] || exit 0
+#[ -x /bin/systemctl ] || exit 0
 
-turn_on() {
-	if [ -x $SYSTEMCTL ]; then
-		$SYSTEMCTL enable ${*}.service
-	else if [ -x $CHKCONFIG ]; then
-		$CHKCONFIG $* on
-	else
-		exit 0
-	fi
-fi
-}
+ENABLE="
+network
+NetworkManager
+lvm2-monitor
+mdadm
+"
 
-turn_off() {
-	if [ -x $SYSTEMCTL ]; then
-		$SYSTEMCTL disable ${*}.service
-	else if [ -x $CHKCONFIG ]; then
-		$CHKCONFIG $* off
-	else
-		exit 0
-	fi
-fi
-}
+# NB: dnsmasq: https://bugzilla.altlinux.org/show_bug.cgi?id=18799
+# NB: sshd might be needed for some particular cases
+DISABLE="
+sshd
+"
 
-SERVICES_TO_ENABLE="NetworkManager"
-SERVICES_TO_DISABLE=
-
-for i in $SERVICES_TO_ENABLE; do
-	turn_on $i;
+for i in $ENABLE;  do
+	[ -x /bin/systemctl ] && /bin/systemctl enable ${i}.service
+	[ -x /sbin/chkconfig ] && /sbin/chkconfig $i on
 done
 
-for i in $SERVICES_TO_DISABLE; do
-	turn_off $i;
+for i in $DISABLE; do
+	[ -x /bin/systemctl ] && /bin/systemctl disable ${i}.service
+	[ -x /sbin/chkconfig ] && /sbin/chkconfig $i off
 done
 :

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/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 splash quiet=1 vga=0x314
 

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

@@ -1,10 +1,10 @@
 label linux
   menu label ^Install ALT Linux
   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/config.mk

@@ -9,7 +9,7 @@ use/syslinux/ui/%: use/syslinux
 	@$(call set,SYSLINUX_UI,$*)
 	@if [ "$*" == gfxboot ]; then \
 		$(call add,STAGE1_PACKAGES,gfxboot); \
-		$(call add,STAGE1_PACKAGES,branding-$$(BRANDING)-bootloader); \
+		$(call add,STAGE1_BRANDING,bootloader); \
 	fi
 
 # modules and config snippets just add up

features.in/syslinux/generate.mk

@@ -55,7 +55,7 @@ all: debug timeout
 	@echo $(SYSLINUX_FILES) > $(DSTDIR)/syslinux.list
 
 # integerity check
-timeout: copy
+timeout: bootargs
 	@if [ "$(SYSLINUX_TIMEOUT)" -ge 0 ] 2>/dev/null; then \
 		TIMEOUT="$(SYSLINUX_TIMEOUT)"; \
 	else \
@@ -63,6 +63,18 @@ timeout: copy
 	fi; \
 	sed -i "s,@timeout@,$$TIMEOUT," $(DSTDIR)/*.cfg
 
+# pass over additional parameters, if any
+bootargs: clean
+	@if [ -n "$(INSTALL2_BOOTARGS)" ]; then \
+		sed -i "s,@bootargs@,$(INSTALL2_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/vm/README

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

features.in/vm/config.mk

@@ -2,7 +2,7 @@
 
 use/vm/virtualbox/guest:
 	@$(call add_feature)
-	@$(call add,THE_KMODULES,virtualbox-addition)
+	@$(call add,THE_KMODULES,virtualbox-addition drm)
 	@$(call add,THE_PACKAGES,virtualbox-guest-additions)
 
 # NB: only reasonable for X11-bearing images

features.in/x11/config.mk

@@ -1,5 +1,5 @@
 +icewm: use/x11/icewm; @:
-+razorqt: use/x11/razorqt use/x11/lightdm; @:
++razorqt: use/x11/razorqt use/x11/lightdm/qt; @:
 +tde: use/x11/tde use/x11/kdm; @:
 
 use/x11/xorg:
@@ -30,8 +30,8 @@ use/x11/xdm: use/x11/runlevel5
 	@$(call add,THE_PACKAGES,xdm installer-feature-no-xconsole)
 
 ### : some set()-like thing might be better?
-use/x11/lightdm: use/x11/runlevel5
-	@$(call add,THE_PACKAGES,lightdm)
+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)

image.in/functions.mk

@@ -5,11 +5,13 @@ PKGDIR := $(GLOBAL_BUILDDIR)/pkg
 ARCH ?= $(shell arch | sed 's/i686/i586/')
 DATE ?= $(shell date +%Y%m%d)
 
-# prefix pkglist name with its directory to form a path
-list = $(1:%=$(PKGDIR)/lists/%)
+# prefix pkglist name with its directory to form a path (relative/absolute)
+rlist = $(1:%=lists/%)
+list  = $(addprefix $(PKGDIR)/,$(call rlist,$(1)))
 
-# prefix/suffix group name to form a path
-group = $(1:%=$(PKGDIR)/groups/%.directory)
+# prefix/suffix group name to form a path (relative/absolute)
+rgroup = $(1:%=groups/%.directory)
+group  = $(addprefix $(PKGDIR)/,$(call rgroup,$(1)))
 
 # map first argument (a function) onto second one (an argument list)
 map = $(foreach a,$(2),$(call $(1),$(a)))
@@ -19,5 +21,10 @@ NULL :=
 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 = $(and $(1),^branding-$(BRANDING)-($(call list2re,$(1)))$$)

lib/build.mk

@@ -2,7 +2,8 @@
 ANSI_OK   ?= 1;32
 ANSI_FAIL ?= 1;31
 
-GOTCHA := ^(((\*\* )?(E:|[Ee]rror|[Ww]arning).*)|(.* (Stop|failed)\.))$$
+MAX_ERRORS = 3
+GOTCHA := ^(((\*\* )?(E:|[Ee]rror|[Ww]arning).*)|(.* (conflicts|Depends:) .*)|(.* (Stop|failed)\.))$$
 
 ifndef MKIMAGE_PROFILES
 $(error this makefile is designed to be included in toplevel one)
@@ -51,7 +52,9 @@ build-image: profile/populate
 		tail -200 "$(BUILDLOG)" $(SHORTEN) \
 		| GREP_COLOR="$(ANSI_OK)" GREP_OPTIONS="--color=auto" \
 		  grep '^\*\* image: .*$$' ||:; \
+		RETVAL=0; \
 	else \
+		RETVAL=$$?; \
 		echo -n "$(TIME) failed, see log"; \
 		if [ -z "$(DEBUG)" ]; then \
 			echo ": $(BUILDLOG)" $(SHORTEN); \
@@ -61,9 +64,10 @@ build-image: profile/populate
 		fi; \
 		tail -200 "$(BUILDLOG)" \
 		| GREP_COLOR="$(ANSI_FAIL)" GREP_OPTIONS="--color=auto" \
-		  egrep "$(GOTCHA)"; \
+		  egrep -m "$(MAX_ERRORS)" "$(GOTCHA)"; \
 		df -P $(BUILDDIR) | awk 'END { if ($$4 < $(LOWSPACE)) \
 			{ print "NB: low space on "$$6" ("$$5" used)"}}'; \
 	fi; \
 	if [ -n "$(BELL)" ]; then echo -ne '\a'; fi; \
+	exit $$RETVAL; \
 	} >&2

lib/check.mk

@@ -0,0 +1,17 @@
+ifndef MKIMAGE_PROFILES
+$(error this makefile is designed to be included in toplevel one)
+endif
+
+check:
+	@find sub.in features.in \
+		-path '*scripts.d/*' \
+		\! \( -perm 755 -o -name .gitignore \) \
+	| while read line; do \
+		echo "chmod 755 $$line"; \
+	done
+	@find features.in -maxdepth 1 -type d \
+	| while read dir; do \
+		if [ ! -s "$$dir/README" ]; then \
+			echo "$$dir: missing README"; \
+		fi; \
+	done

lib/clean.mk

@@ -53,7 +53,7 @@ distclean: clean
 # than BUILDDIR is -- usually it's unneeded afterwards so just zap it
 postclean: build-image
 	@{ \
-	if [ "$(NUM_TARGETS)" -gt 1 -a -z "$(DEBUG)" ] || \
+	if [ "$(NUM_TARGETS)" -gt 1 -a -z "$(DEBUG)" -a -z "$(__frontend)" ] ||\
 	    [ ! -L "$(SYMLINK)" -a "0$(DEBUG)" -lt 2 ]; then \
 		echo "$(TIME) cleaning up after build"; \
 		$(MAKE) -C "$(BUILDDIR)" distclean \

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

@@ -23,18 +23,16 @@ distro/.init: profile/bare
 
 # NB: the last flavour in KFLAVOURS gets to be the default one;
 # the kernel packages regexp evaluation has to take place at build stage
-distro/.base: distro/.init
-	@$(call set,KFLAVOURS,std-def)
+distro/.base: distro/.init use/kernel
 	@$(call set,META_SYSTEM_ID,LINUX)
-	@$(call set,META_VOL_ID,ALT Linux $(ARCH))
+	@$(call set,META_VOL_ID,ALT Linux $(IMAGE_NAME)/$(ARCH))
 	@$(call set,META_VOL_SET,ALT Linux)
 
 # something marginally useful (as a network-only installer)
 # NB: doesn't carry stage3 thus cannot use/bootloader
-distro/installer: distro/.base use/install2 use/install2/kvm \
-	use/syslinux/localboot.cfg
+distro/installer: distro/.base use/syslinux/localboot.cfg \
+	use/install2 use/install2/kms use/install2/kvm
 	@$(call set,INSTALLER,altlinux-generic)
-	@$(call set,STAGE1_KMODULES_REGEXP,drm.*)	# for KMS
 
 distro/.installer: distro/installer use/bootloader/grub use/repo/main; @:
 

lib/help.mk

@@ -1,12 +1,28 @@
 # this makefile holds the most helpful bits for the toplevel one
 
+ifdef __frontend
+define help_body
+	@for i in $(2); do echo $$i; done
+endef
+else
+define help_body
+	echo '** available $(1) targets:'; \
+	columnize $(2)
+endef
+endif
+
+help = $(and $(2),$(help_body))
+
 help/distro:
-	@echo '** available distribution targets:'; \
-	columnize $(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/vm.mk

@@ -0,0 +1,17 @@
+# 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 use/bootloader/grub
+vm/.bare: profile/bare
+	@$(call add,BASE_PACKAGES,basesystem interactivesystem lilo passwd shadow-utils e2fsprogs mingetty)
+	@$(call set,KFLAVOURS,std-def)
+
+vm/bare: vm/.bare
+	@$(call add,BASE_PACKAGES,apt)
+
+endif

main.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/Makefile

@@ -18,13 +18,6 @@ include $(BUILDDIR)/distcfg.mk
 SUFFIX := pkg/lists
 TARGET := $(BUILDDIR)/$(SUFFIX)
 
-# Metadata/ needed only for installers (and not for e.g. syslinux.iso)
-# FIXME: installable live needs it too, don't move to install2 feature
-### see also .../features.in/build-distro/lib/build-distro.mk
-ifneq (,$(findstring install2,$(FEATURES)))
-DOTBASE := dot-base
-endif
-
 all: $(TARGET) $(GLOBAL_DEBUG) $(DOTBASE) copy-lists copy-groups
 	@if type -t git >&/dev/null && cd $(TARGET); then \
 		if [ -n "`git status -s`" ]; then \
@@ -47,23 +40,6 @@ copy-groups:
 		cp -at $(TARGET) -- $(THE_GROUPS) $(MAIN_GROUPS); \
 	fi
 
-# args: name, suffix, command
-define dump-THEM
-if [ -n "$($(1)_$(2))" ]; then echo -e "\n## $(1)_$(2)"; $(3) $($(1)_$(2)); fi;
-endef
-
-dump-PACKAGES = $(call dump-THEM,$(1),PACKAGES,echo)
-dump-LISTS = $(call dump-THEM,$(1),LISTS,cat)
-
-# BASE_PACKAGES, BASE_LISTS and whatever else goes into base install
-dot-base:
-	@# construct .base packagelist for alterator-pkg
-	@{ \
-		echo "## generated by pkg.in/lists/Makefile"; \
-		$(foreach p,SYSTEM COMMON THE BASE,$(call dump-PACKAGES,$(p))) \
-		$(foreach l,THE BASE,$(call dump-LISTS,$(l))) \
-	} | sed -re '/^[^[:space:]#]/ s/[[:space:]]+/\n/g' >$(TARGET)/.base
-
 # do beforehand as foreach gets expanded before recipe execution
 $(TARGET):
 	@mkdir -p $(TARGET)

pkg.in/lists/slinux/misc

@@ -20,23 +20,6 @@ gdm2.20-help
 ntfsprogs-
 driconf-
 
-# Branding things
-branding-simply-linux-xfce-settings
-branding-simply-linux-menu
-branding-simply-linux-alterator
-branding-sisyphus-server-light-alterator-
-
-#branding-simply-linux-bootloader
-#branding-simply-linux-bootsplash
-branding-simply-linux-graphics
-branding-simply-linux-indexhtml
-branding-simply-linux-notes
-#branding-simply-linux-release
-branding-simply-linux-slideshow
-
-
-#added through use/syslinux/gfx... ?
-#branding-simply-linux-bootloader
 gdm-theme-simply
 
 kde4libs-
@@ -122,3 +105,7 @@ libreoffice-langpack-ru
 evince
 stardict-gtk
 stardict-mueller7
+
+# disks
+lvm2
+mdadm

pkg.in/lists/tagged/desktop+mate

@@ -0,0 +1,20 @@
+altlinux-freedesktop-menu-mate
+mate-conf-gtk
+mate-control-center
+mate-desktop
+mate-dialogs
+mate-file-manager
+mate-icon-theme
+mate-keyring
+mate-menus
+mate-mime-data
+mate-notification-daemon
+mate-panel
+mate-polkit
+mate-session
+#mate-session-manager
+mate-settings-daemon
+mate-themes
+mate-vfs
+mate-vfs-smb
+mate-window-manager

pkg.in/lists/tagged/mobile+mate

@@ -0,0 +1,18 @@
+NetworkManager
+NetworkManager-gnome
+wpa_gui
+rfkill
+dbus-tools-gui
+fonts-ttf-droid
+xdg-user-dirs
+#gnome-minimal
+#gnome-mobile
+ConsoleKit
+ConsoleKit-x11
+pam-ck-connector
+notification-daemon
+powermgmt-base
+acpi
+acpid
+acpid-events-power
+eeepc-acpi-scripts

reports.mk

@@ -6,7 +6,7 @@ include lib/common.mk
 
 BUILDDIR := $(shell sed -n 's/^.* BUILDDIR = \(.*\)/\1/p' "$(REPORT_PATH)")
 BUILDLOG := $(BUILDDIR)/$(BUILD_LOG)
-REPORTDIR := $(BUILDDIR)/reports/
+REPORTDIR := $(BUILDDIR)/reports
 IMAGE_OUTPATH := $(shell sed -n 's/^IMAGE_OUTPATH = \(.*\)/\1/p' $(BUILDLOG))
 
 # for a multi-image build there's no sense to refer to buildroot
@@ -16,31 +16,39 @@ SHORTEN := >/dev/null
 endif
 
 all: reports/targets reports/scripts
-	@cp -a $(REPORTDIR) $(IMAGE_OUTPATH).reports
+	@if [ -n "$(IMAGE_OUTPATH)" ]; then \
+		cp -a $(REPORTDIR) $(IMAGE_OUTPATH).reports; \
+	fi
 
 reports/prep:
 	@mkdir -p "$(REPORTDIR)"
 
 reports/scripts: reports/prep
-	@grep "^mki.*scripts: Run: " $(BUILDLOG) \
-	| sed -rn "s,^.*($(BUILDDIR)|$(SYMLINK))/(.*)'$$,\2,p" \
-	> "$(REPORTDIR)/$*.log" \
-	&& echo "** scripts report: $(BUILDDIR)/$(@F).log" $(SHORTEN)
+	@OUT="$(REPORTDIR)/$(@F).log"; \
+	grep "^mki.*scripts: Run: " $(BUILDLOG) \
+	| sed -rn "s,^.*($(BUILDDIR)|$(SYMLINK))/(.*)'$$,\2,p" > "$$OUT" \
+	&& if [ -s "$$OUT" ]; then \
+		echo "** scripts report: $$OUT" $(SHORTEN); \
+	fi
 
 reports/targets: reports/prep
 	@if ! [ -n "$(REPORT_PATH)" -a -s "$(REPORT_PATH)" ]; then \
 		exit 0; \
 	fi; \
 	if type -t dot >&/dev/null; then \
-		REPORT_IMAGE="$(BUILDDIR)/$@.png"; \
+		OUT="$(REPORTDIR)/$(@F).png"; \
 		report-targets < "$(REPORT_PATH)" \
-		| dot -Tpng -o "$$REPORT_IMAGE" \
-		&& echo "** target graph report: $$REPORT_IMAGE"; \
+		| dot -Tpng -o "$$OUT" \
+		&& if [ -s "$$OUT" ]; then \
+			echo "** target graph report: $$OUT"; \
+		fi; \
 	else \
-		REPORT_DOT="$(BUILDDIR)/targets.dot"; \
-		report-targets < "$(REPORT_PATH)" > "$$REPORT_DOT" \
-		&& echo "** graphviz missing, " \
-			"target graph dot file: $$REPORT_DOT"; \
+		OUT="$(BUILDDIR)/targets.dot"; \
+		report-targets < "$(REPORT_PATH)" > "$$OUT" \
+		&& if [ -s "$$OUT" ]; then \
+			echo "** graphviz missing, " \
+				"target graph dot file: $$OUT"; \
+		fi; \
 	fi $(SHORTEN); \
 	mv "$(REPORT_PATH)" "$(REPORTDIR)/$(@F).log"
 

sub.in/main/Makefile

@@ -18,6 +18,7 @@ IMAGE_PACKAGES_REGEXP = $(THE_PACKAGES_REGEXP) \
 			$(call kpackages, \
 			       $(THE_KMODULES) \
 			       $(BASE_KMODULES) \
+			       $(BASE_KMODULES_REGEXP) \
 			       $(MAIN_KMODULES), \
 			       $(KFLAVOURS))
 
@@ -28,6 +29,8 @@ IMAGE_PACKAGES = $(call map,list, \
 		 $(SYSTEM_PACKAGES) $(COMMON_PACKAGES) \
 		 $(THE_PACKAGES) $(BASE_PACKAGES) $(MAIN_PACKAGES)
 
+-include lib/*.mk
+
 MKI_DESTDIR = ALTLinux/RPMS.main
 MKI_PACK_RESULTS = data
 

sub.in/stage1/Makefile

@@ -41,6 +41,8 @@ CHROOT_PACKAGES = $(STAGE1_PACKAGES) $(SYSTEM_PACKAGES)
 # pass for use/stage2
 GLOBAL_SQUASHFS := $(SQUASHFS)
 
+-include lib/*.mk
+
 # scripts prepare bootloader configuration, too
 # NB: we pass tested squashfs options for ../stage2/Makefile to include
 all: | debug prepare-workdir copy-tree run-scripts $(BUILD_PROPAGATOR) \

sub.in/stage2/Makefile

@@ -20,7 +20,7 @@ include $(MKIMAGE_PREFIX)/config.mk
 include stage2cfg.mk
 
 # requisite stuff
-IMAGE_PACKAGES += $(SYSTEM_PACKAGES)
+IMAGE_PACKAGES += $(SYSTEM_PACKAGES) $(STAGE2_PACKAGES)
 
 # here we also try and come up with the stage1 kernel/modules, if any;
 # no kernel flavour specified will result in no modules for stage1 vmlinuz
@@ -33,9 +33,12 @@ endif
 # need kernel modules only (which require corresponding kernel-image);
 # these go into work chroot; NB: no vmlinuz there (unless live-install)
 IMAGE_PACKAGES_REGEXP += $(call kpackages, \
-			 $(STAGE1_KMODULES) $(STAGE2_KMODULES), \
+			 $(STAGE1_KMODULES) $(STAGE1_KMODULES_REGEXP) \
+			 $(STAGE2_KMODULES) $(STAGE2_KMODULES_REGEXP), \
 			 $(STAGE1_KFLAVOUR))
 
+-include lib/*.mk
+
 # see also scripts.d/99-elf-stats
 ifdef GLOBAL_SQUASHFS_SORT
 ifeq (tight,$(SQUASHFS))