server-v: add control-sshd-permit-root-login for PVE

installer-feature-bootloader-$BOOTLOADER dependency of alterator-$BOOTLOADER.
This is necessary so that alterator-$BOOTLOADER is deleted after installation,
if it was not installed explicitly.
This will reduce the minimum installation of alt-server.

.gear/mkimage-profiles.spec

@@ -1,5 +1,5 @@
 Name: mkimage-profiles
-Version: 1.3.2
+Version: 1.3.15
 Release: alt1
 
 Summary: ALT based distribution metaprofile
@@ -128,6 +128,79 @@ mv %buildroot%mpdir/doc/mkimage-profiles.7 %buildroot%_man7dir/
 %endif
 
 %changelog
+* Mon Nov 18 2019 Michael Shigorin <mike@altlinux.org> 1.3.15-alt1
+- autoinstall fix (sin@)
+- Baikal-M support, @ARM, elogind removal, other tweaks (antohami@)
+- factored out archdep-filter, pulled in check-pkg-list (me)
+
+* Mon Oct 21 2019 Michael Shigorin <mike@altlinux.org> 1.3.14-alt1
+- make bails out on single image build error, see also make -k (iv@)
+- mipsel support (iv@, antohami@)
+- regular-vm.mk, refactoring, cleanups (antohami@)
+
+* Mon Sep 16 2019 Michael Shigorin <mike@altlinux.org> 1.3.13-alt1
+- recovery.tar support (iv@)
+- mixin/mixin deps, aarch64 EFI, mcom02 & jetson nano support,
+  multikernel & portability fixes, refactoring & cleanups (antohami@)
+- document STAGE1_MODLISTS (me)
+
+* Mon Aug 19 2019 Michael Shigorin <mike@altlinux.org> 1.3.12-alt1
+- ppc64le support (glebfm@)
+- build-vm hacked to build tarballs too (iv@ et al)
+- p8.mk: dropped; along with other cleanups/fixups (antohami@)
+
+* Tue Jul 09 2019 Michael Shigorin <mike@altlinux.org> 1.3.11.1-alt1
+- x11: reverted vulkan changes (need more testing)
+
+* Mon Jul 08 2019 Michael Shigorin <mike@altlinux.org> 1.3.11-alt1
+- pkg.in/profiles subdirs support (shaba@)
+- repo fixup regarding target arch (obirvalger@)
+- switch back to yandex mirror by default,
+  portability fixes, refactoring, cleanups (antohami@)
+- x11 amdgpu/radeon and dm fixups, vmguest refactoring (me)
+
+* Mon Jun 17 2019 Michael Shigorin <mike@altlinux.org> 1.3.10-alt1
+- add server-v profile, drop groups/openstack (shaba@)
+
+* Mon Jun 10 2019 Michael Shigorin <mike@altlinux.org> 1.3.9-alt1
+- uboot feature, bootloader refactoring, etc (antohami@)
+- cleanlog factored out from reports.mk (me)
+
+* Mon Jun 03 2019 Michael Shigorin <mike@altlinux.org> 1.3.8-alt1
+- p9.mk, office feature and other enhancements/fixes (antohami@)
+- education (cas@)
+- simply (sem@)
+- minor tidbits and major merge-up (me)
+
+* Mon May 06 2019 Michael Shigorin <mike@altlinux.org> 1.3.7-alt1
+- docker, vm, browser fixups (obirvalger@)
+- elogind support, refactoring, cleanups (antohami@)
+- a couple more improvements (me)
+
+* Mon Apr 01 2019 Michael Shigorin <mike@altlinux.org> 1.3.6-alt1
+- no joke!
+
+* Mon Mar 04 2019 Michael Shigorin <mike@altlinux.org> 1.3.5-alt1
+- Spring 2019 patch queue cleanup
+  + antohami@, jqt4@, iv@, obirvalger@, zerg@, me
+  + tar2fs fixes for mipsel, qemu etc
+  + lots of pkglist updates
+
+* Mon Jan 14 2019 Michael Shigorin <mike@altlinux.org> 1.3.4-alt1
+- new 2019 year release ;-)
+- tar2fs related security fix (iv@) iff sudo's been configured
+- use/x11/dm rework (antohami@)
+- archfixes (antohami@, iv@)
+- pre-p8 bits cleanup (me)
+
+* Mon Dec 24 2018 Michael Shigorin <mike@altlinux.org> 1.3.3-alt1
+- aarch64/armh portability fixups (antohami@)
+- grub-based vm images (shaba@)
+- even smaller images (glebfm@)
+- lxc/lxd lists/feature/image (dans@)
+- updated robotics lists/image (dd@)
+- e2k: 801/101/jeos tweaks (me)
+
 * Mon Dec 10 2018 Michael Shigorin <mike@altlinux.org> 1.3.2-alt1
 - sisyphus drops
 

.gear/tags/c63e94b72fd43f6fa162ed26a9a80570e77d18c0

@@ -0,0 +1,6 @@
+object 56d7944222db0f1981ce3ad5f49de7b39f2ba6b9
+type commit
+tag v1.3.15
+tagger Michael Shigorin <mike@altlinux.org> 1574093404 +0300
+
+v1.3.15

.gear/tags/ca7455c6104540e2073cca673043ededb3b96a85

@@ -1,6 +0,0 @@
-object 21f8054f955de22bf0bfb2854f0128770d0ad489
-type commit
-tag v1.3.1
-tagger Michael Shigorin <mike@altlinux.org> 1541443415 +0300
-
-fixes&tweaks

.gear/tags/list

@@ -1 +1 @@
-ca7455c6104540e2073cca673043ededb3b96a85 v1.3.1
+c63e94b72fd43f6fa162ed26a9a80570e77d18c0 v1.3.15

.gitignore

@@ -1,3 +1,4 @@
 *~
 .*.swp
 build
+image.in/files/*

Makefile

@@ -8,7 +8,7 @@
 # for immediate assignment
 ifndef ARCH
 ARCH := $(shell arch \
-	| sed 's/i686/i586/; s/armv7.*/armh/; s/armv.*/arm/; s/ppc.*/ppc/')
+	| sed 's/i686/i586/; s/armv7.*/armh/; s/armv.*/arm/')
 endif
 
 ifndef ARCHES
@@ -66,6 +66,8 @@ SHELL = /bin/bash
 			if [ -n "$$REPORT" ]; then \
 				$(MAKE) -f reports.mk ARCH=$$ARCH; \
 			fi; \
+		else \
+			exit 1; \
 		fi; \
 	done; \
 	if [ "$$n" -lt "$(NUM_TARGETS)" ]; then say; fi

bin/archdep-filter

@@ -0,0 +1,49 @@
+#!/bin/sh
+# filter stdin or file for words related to
+# the specified target architecture
+#
+# args: -a arch [-i file]
+
+if [ "$1" = "-a" -a -n "$2" ]; then
+	a="$2"
+	shift 2
+else
+	cat
+	exit
+fi
+
+if [ "$1" = "-i" -a -w "$2" ]; then
+	f="$2"
+	t="`mktemp`"
+fi
+
+# map meta-arches for prefiltering
+# NB: biarch gets special expansion later
+case "$a" in
+i586)
+	A="(IA32|X86)";;
+x86_64)
+	A="X86";;
+e2k*)
+	A="E2K";;
+aarch64|arm*)
+	A="ARM";;
+*)
+	A=;;
+esac
+
+# NB: pipe runs in parallel => faster than -e -e
+cat ${f:+"$f"} |
+sed -rn "s/\<([^@ ]*)\>|\<([^@ ]*)@$A\>/\1\2/pg" |
+sed -rn "s/\<([^@ ]*)\>|\<[^@ ]*@\!$A\> */\1/pg" |
+sed -r  "s/\<([^@ ]*)@IA32\>/\1@i586 i586-\1@x86_64/g" |
+sed -rn "s/\<([^@ ]*)\>|\<([^@ ]*)@$a\>/\1\2/pg" |
+sed -rn "s/\<([^@ ]*)\>|\<[^@ ]*@\!$a\> */\1/pg" |
+sed -r  "s/\<([^@ ]*)@\![^@ ]+\>/\1/g" |
+sed -r  "s/\<([^@ ]*)@[^@ ]+\> *//g" |
+sed -r  "s/^ +//;s/ +$//" |
+if [ -n "$f" ]; then
+	cat > "$t" && mv "$t" "$f"
+else
+	cat
+fi

bin/check-pkg-list

@@ -0,0 +1,101 @@
+#!/bin/sh
+# script based on initial implementation
+# by Vitaly Gusach (http://gusach.org.ua)
+#
+# purpose: warn on those entries in given packagelists(s)
+# which are definitely absent; the build might still bail out
+# but at least 80% of failures can be predicted early now
+#
+# usage: check-pkg-list [-n pkgnames] pkglist ...
+# (pkgnames file should contain `apt-cache pkgnames`)
+# NB: -n pkgnames MUST go first, if given
+
+error() { echo `basename $0`: $* >&2; exit 1; }
+debug() { [ -n "$GLOBAL_VERBOSE" ] && echo `basename $0`: $* >&2; }
+
+exit_handler() {
+	local rc=$?
+	trap - EXIT
+	rm -f -- "$ftemp" "$fpkgnames" "$fpkgwildcards" "$favaillist"
+	exit $rc
+}
+
+# find the most recent apt.conf in workdirs
+apt_conf() {
+	debug "looking for workdirs with aptboxes..."
+	find -maxdepth 3 -name .work \
+	| while read dir; do
+		file="$dir/aptbox/etc/apt/apt.conf"
+		[ -f "$file" ] && echo "$file"
+	done \
+	| xargs -r ls -t -- \
+	| head -1
+}
+
+# figure out apt.conf from recent aptbox or fallback to system one
+# TODO: would be nice to cache the dump inside aptbox
+dump_pkgnames() {
+	conf="`apt_conf`"
+	debug "autodetected apt.conf: ${conf:-<system>}, dumping pkgnames"
+	apt-cache ${conf:+-c $conf} pkgnames | sort > "$favaillist"
+}
+
+check_pkglist() {
+	fprofilelist="$1"
+	[ -f "$fprofilelist" ] || error "invalid packagelist filename: $fprofilelist"
+	[ -n "$MULTI" ] && echo "-- $fprofilelist"
+	debug "checking $fprofilelist against $favaillist"
+
+	# cleaning pkg list from comments, empty lines,
+	# splitting several pkgnames on the same line
+	sed -e '/^#/d' -e '/^[ 	]*$/d' -e 's/ \+$//' -e 's/[ 	]\+/\n/g' \
+	< "$fprofilelist" \
+	| sed 's/-$//' \
+	| sort -u \
+	> "$ftemp" # got list of pkgnames we need
+
+	# split pkgnames without wildcards and with wildcards
+	fgrep -v '*' "$ftemp" > "$fpkgnames"
+	fgrep 	 '*' "$ftemp" > "$fpkgwildcards"
+
+	# return unavailable packages
+	debug "unavailable packagenames, if any:"
+	comm -23 "$fpkgnames" "$ftemp"
+
+	# return unavailable wildcards
+	debug "unavailable wildcards, if any:"
+	while read i; do
+		# replacing * with regexp's \.+
+		pattern="^`echo ${i#^} | sed -e 's/\*/.\\\\+/'`$"
+		grep -q "$pattern" "$favaillist" || echo "$i"
+	done < "$fpkgwildcards"
+}
+
+[ "$#" -gt 0 ] || error "need at least one argument, a packagelist to check"
+
+# reusable temporary files with self-cleanup at exit
+TEMP="${TMP:-/tmp}"
+trap exit_handler HUP INT QUIT TERM EXIT
+favaillist="`mktemp $TEMP/pkgchecker.avail.XXXXX`"
+fpkgnames="`mktemp $TEMP/pkgchecker.names.XXXXX`"
+fpkgwildcards="`mktemp $TEMP/pkgchecker.wildcards.XXXXX`"
+ftemp="`mktemp $TEMP/pkgchecker.XXXXX`"
+
+# make sure pkgnames dump is handy
+case "$1" in
+"-n"|"--pkgnames")
+	[ -f "$2" ] && {
+		sort "$2" > "$favaillist"
+		shift; shift
+	} || error "-n needs valid pkgnames filename"
+	;;
+esac
+
+[ -s "$favaillist" ] || dump_pkgnames
+
+# now on to the real job; Q: skip *.in or not?
+[ "$#" -eq 1 ] && MULTI= || MULTI=1
+
+for list in "$@"; do
+	check_pkglist "$list"
+done

bin/cleanlog

@@ -0,0 +1,24 @@
+#!/bin/sh
+# try making build logs more diffable
+# see also reports.mk
+
+[ -n "$BUILDDIR" ] || exit 1
+
+sed -r \
+	-e "s,$BUILDDIR,,g" \
+	-e '/\/var\/lib\/apt\/lists/d' \
+	-e 's/... .. ..:..:..//g' \
+	-e 's/\[[0-9]+\]//g' \
+	-e '/^(Reading Package Lists|Building Dependency Tree)/d' \
+	-e '/^(Fetched|Need to get|After unpacking) /d' \
+	-e '/^(Preparing packages for installation|Done\.)/d' \
+	-e '/^hsh(|-(initroot|install|fakedev|(mk|rm)chroot|run)): /d' \
+	-e '/^(hasher-priv|mkaptbox|(mk|rm)dir): /d' \
+	-e '/^mki-((invalidate-|)cache|check-obsolete|prepare): /d' \
+	-e '/^(mode of|changed (group|ownership)|removed) /d' \
+	-e '/^chroot\/.in\//d' \
+	-e '/ has started executing\.$/d' \
+	-e '/\/var\/log\/apt\.log$/d' \
+	-e '/\/usr\/share\/apt\/scripts\/log\.lua/d' \
+	-e '/\.rpm$/d' \
+	-e "/' -> '/d"

bin/tar2fs

@@ -24,36 +24,59 @@ MB=1048576		# a parted's "megabyte" in bytes is *broken*
 
 SIZE_FACTOR=2		# multiply the sizes found by this value
 BOOT_SIZE_FACTOR=2	# multiply /boot size by this value additionally
+BOOTLOADERPARTSIZEM=0	# PReP partition size (ppc*)
 
 CUR_BOUNDARY=0		# align first partition at 1MB for performance (+1)
 
-INITRD_MODULES=
 BOOTFSTYPE=
 BOOTPART=
+EFIPARTFSTYPE=
+EFIPART=
 
-ARCH="$(arch)"		# NB: sudo => no GLOBAL_ will do either; mind qemu-*
+BOOTLOADER="$5"
+
+if [ -n "$6" ]; then
+	ARCH="$6"
+else
+	ARCH="$(arch)"
+fi
 
 case "$ARCH" in
-*86*)
-	# NB: different storage modules might be needed for non-kvm
-	INITRD_MODULES="sd_mod ata_piix ahci virtio-scsi virtio-blk"
-	BLOCKDEV="/dev/sda"	# might be /dev/vda for virtio
-	ROOTPART="1"
-	;;
-arm*)
-	BOOTFSTYPE="ext2"	# support expected in every sane target uboot
-	BLOCKDEV="/dev/mmcblk0p"	# ...hopefully...
-	BOOTPART="1"
-	ROOTPART="2"
-	;;
 e2k)
 	BOOTFSTYPE="ext2"       # firmware knows it
 	BLOCKDEV="/dev/sda"     # ...hopefully...
 	BOOTPART="1"
 	ROOTPART="2"
 	;;
+ppc*)
+	BOOTFSTYPE="ext4"
+	BLOCKDEV="/dev/sda"
+	BOOTLOADERPART="1"
+	BOOTLOADERPARTSIZEM="8"
+	ROOTPART="2"
+	;;
+*)
+	if [ "$BOOTLOADER" == grub-efi ]; then
+		EFIPART="1"
+		EFIPARTSIZEM="256"
+		EFIPARTFSTYPE="fat"
+		ROOTPART="2"
+	else
+		ROOTPART="1"
+	fi
+	BLOCKDEV="/dev/sda"
+	;;
 esac
 
+PARTTABLE="$7"
+if [ -z "$PARTTABLE" ]; then
+	if [ "$BOOTLOADER" == grub-efi ]; then
+		PARTTABLE=gpt
+	else
+		PARTTABLE=msdos
+	fi
+fi
+
 # figure out the part taken by /boot in the given tarball
 boot_size() {
 	if [ -n "$BOOTPART" ]; then
@@ -81,9 +104,14 @@ mkpart() {
 		CUR_BOUNDARY="$(($start + $1))"
 		local end="$CUR_BOUNDARY"MiB
 	else
-		local end="-1s"	# last sector of the image
+		local end="$OFFSET"MiB
 	fi
-	parting mkpart primary ext2 "$start"MiB "$end"
+	if [ -n "$2" ]; then
+		CUR_FS="$2"
+	else
+		CUR_FS=ext2
+	fi
+	parting mkpart primary "$CUR_FS" "$start"MiB "$end"
 }
 
 # a tarball containing chroot with a kernel
@@ -117,7 +145,8 @@ ROOTFSTYPE="${4:-ext4}"
 ROOTDEV="$BLOCKDEV$ROOTPART"
 
 # last preparations...
-MKFS="mkfs.$ROOTFSTYPE ${BOOTFSTYPE:+mkfs.$BOOTFSTYPE}"
+MKFS="mkfs.$ROOTFSTYPE ${BOOTFSTYPE:+mkfs.$BOOTFSTYPE} \
+  ${EFIPARTFSTYPE:+mkfs.$EFIPARTFSTYPE}"
 for i in losetup sfdisk parted kpartx $MKFS; do
 	if ! type -t "$i" >&/dev/null; then
 		fatal "$i required but not found in host system"
@@ -128,15 +157,20 @@ LOOPDEV="$(losetup --find)"	# would be sad about non-binary megabytes too
 ROOTFS="$WORKDIR/chroot"
 
 BOOTFS=
+EFIPARTFS=
 if [ -n "$BOOTPART" ]; then
 	BOOTFS="$ROOTFS/boot"
 fi
+if [ -n "$EFIPART" ]; then
+	EFIPARTFS="$ROOTFS/boot/efi"
+fi
 
 exit_handler() {
 	rc=$?
 	cd /
 	if [ -n "$ROOTFS" ]; then
-		umount ${BOOTFS:+"$BOOTFS"} "$ROOTFS"{/dev,/proc,/sys,}
+		umount ${EFIPARTFS:+"$EFIPARTFS"} ${BOOTFS:+"$BOOTFS"} \
+		  "$ROOTFS"{/dev,/proc,/sys,}
 
 		if [ -n "$LOOPDEV" ]; then
 			kpartx -d -s "$LOOPDEV" || {
@@ -156,11 +190,36 @@ trap exit_handler EXIT ERR
 
 # prepare disk image and a filesystem inside it
 rm -f -- "$IMG"
-OFFSET="$(($CUR_BOUNDARY + $BOOTSIZEM + $ROOTSIZEM - 1))"
+OFFSET="$(($CUR_BOUNDARY + $EFIPARTSIZEM + $BOOTLOADERPARTSIZEM + $BOOTSIZEM + $ROOTSIZEM - 1))"
 dd if=/dev/zero of="$IMG" conv=notrunc bs=$MB count=1 seek="$OFFSET"
 losetup "$LOOPDEV" "$IMG"
 
-parting mklabel msdos
+parting mklabel "$PARTTABLE"
+
+if [ -n "$BOOTLOADERPART" ] && [ -n "$BOOTLOADERPARTSIZEM" ]; then
+	case "$ARCH" in
+		ppc*)
+			parting mkpart primary ext2 2048s $((BOOTLOADERPARTSIZEM + 1))MiB
+			CUR_BOUNDARY="$BOOTLOADERPARTSIZEM"
+			parting set 1 prep on
+			parting set 1 boot on
+			;;
+	esac
+fi
+
+if [ -n "$EFIPART" ]; then
+	EFIDEV="$EFIDEV$EFIPART"
+	if [ "$PARTTABLE" == gpt ]; then
+		parting mkpart fat32 2048s $(($EFIPARTSIZEM + 1))MiB
+	else
+		parting mkpart primary fat32 2048s $(($EFIPARTSIZEM + 1))MiB
+	fi
+	CUR_BOUNDARY="$EFIPARTSIZEM"
+	parting set 1 boot on
+	if [ "$PARTTABLE" == gpt ]; then
+		parting set 1 esp on
+	fi
+fi
 
 if [ -n "$BOOTPART" ]; then
 	BOOTDEV="$BLOCKDEV$BOOTPART"
@@ -180,6 +239,15 @@ if [ -n "$BOOTPART" ]; then
 	mkfs."$BOOTFSTYPE" "$LOOPBOOT"
 fi
 
+if [ -n "$BOOTLOADERPART" ] && [ -n "$BOOTLOADERPARTSIZEM" ]; then
+	LOOPBOOTLOADER="/dev/mapper/$(basename "$LOOPDEV")p$BOOTLOADERPART"
+fi
+
+if [ -n "$EFIPART" ]; then
+	LOOPEFI="/dev/mapper/$(basename "$LOOPDEV")p$EFIPART"
+	mkfs.fat -F32 "$LOOPEFI"
+fi
+
 ROOTUUID="$(blkid -s UUID -o value -c /dev/null "$LOOPROOT")"
 if [ -n "$ROOTUUID" ]; then
        ROOTDEV="UUID=$ROOTUUID"
@@ -189,11 +257,18 @@ fi
 
 if [ -n "$BOOTPART" ]; then
 	BOOTUUID="$(blkid -s UUID -o value -c /dev/null "$LOOPBOOT")"
-	if [ -n "$ROOTUUID" ]; then
+	if [ -n "$BOOTUUID" ]; then
 		BOOTDEV="UUID=$BOOTUUID"
 	fi
 fi
 
+if [ -n "$EFIPART" ]; then
+	EFIUUID="$(blkid -s UUID -o value -c /dev/null "$LOOPEFI")"
+	if [ -n "$EFIUUID" ]; then
+		EFIDEV="UUID=$EFIUUID"
+	fi
+fi
+
 # mount and populate it
 mkdir -pm755 "$ROOTFS"
 mount "$LOOPROOT" "$ROOTFS"
@@ -203,27 +278,31 @@ if [ -n "$BOOTPART" ]; then
 	mount "$LOOPBOOT" "$BOOTFS"
 fi
 
+if [ -n "$EFIPART" ]; then
+	mkdir -pm751 "$EFIPARTFS"
+	mount "$LOOPEFI" "$EFIPARTFS"
+fi
+
 tar -C "$ROOTFS" --numeric-owner -xf "$TAR"
 for i in /dev /proc /sys; do mount --bind "$i" "$ROOTFS$i"; done
 
 # loop device so lilo could work...
-echo "$ROOTDEV / $ROOTFSTYPE relatime 1 1" >> "$ROOTFS/etc/fstab"
+if grep -qe "[[:space:]]/[[:space:]]" "$ROOTFS/etc/fstab"; then \
+	sed -i "s/LABEL=ROOT/$ROOTDEV/" "$ROOTFS/etc/fstab"
+else
+	echo "$ROOTDEV / $ROOTFSTYPE relatime 1 1" >> "$ROOTFS/etc/fstab"
+fi
 
 # target device at once
 if [ -n "$BOOTPART" ]; then
 	echo "$BOOTDEV /boot $BOOTFSTYPE defaults 1 2" >> "$ROOTFS/etc/fstab"
 fi
+if [ -n "$EFIPART" ]; then
+	echo "$EFIDEV /boot/efi vfat umask=0,quiet,showexec,iocharset=utf8,codepage=866 1 2" >> "$ROOTFS/etc/fstab"
+fi
 
-echo "MODULES_PRELOAD += $INITRD_MODULES $ROOTFSTYPE" >> "$ROOTFS/etc/initrd.mk"
-
-case "$ARCH" in
-*86*)
-	echo "FEATURES += qemu" >> "$ROOTFS/etc/initrd.mk"
-	;;
-e2k)
-	echo "FEATURES += usb"  >> "$ROOTFS/etc/initrd.mk"
-	;;
-esac
+# Query ARCH in chroot and redefine arch-dependent variable
+ARCH="$(chroot "$ROOTFS" rpm --eval '%_host_cpu')"
 
 # NB: don't stick BOOTFS here, it has slightly different semantics
 pushd $ROOTFS/boot
@@ -232,15 +311,16 @@ pushd $ROOTFS/boot
 get_label() { echo "${1# *}" | sed -r 's,.*elbrus-([0-9a-z]+)-.*$,\1,'; }
 
 KVERSIONS=
-if [ -s .origver ]; then
-	while read kver; do
-		chroot "$ROOTFS" make-initrd -k "$kver"
-		KVERSIONS="$KVERSIONS $kver"
-	done < .origver
-fi
+KVERSIONS="$(chroot "$ROOTFS" rpm -qa 'kernel-image*' \
+            --qf '%{installtime} %{version}-%{name}-%{release}\n' \
+        | sort -n \
+        | cut -f 2 -d ' ' \
+        | sed 's/kernel-image-//')"
 [ -n "$KVERSIONS" ] || fatal "unable to deduce kernel version"
 rm -f .origver
 
+# clean fstab
+sed -i "/LABEL=ROOT/d" "$ROOTFS/etc/fstab"
 # ...target device too
 sed -i "s,$LOOPROOT,$ROOTDEV," "$ROOTFS/etc/fstab"
 
@@ -269,7 +349,13 @@ echo "** end of boot.conf"
 
 popd
 
-if [ -x "$ROOTFS"/sbin/lilo ]; then
+# Setup bootloader
+case "$BOOTLOADER" in
+uboot)
+	EXTLINUX_CONF="$ROOTFS/boot/extlinux/extlinux.conf"
+	sed -i "s/LABEL=ROOT/$ROOTDEV/g" "$EXTLINUX_CONF"
+	;;
+lilo)
 	# configure and install bootloader
 	REGEXP='^.*: ([0-9]+) cylinders, ([0-9]+) heads, ([0-9]+) sectors/track*$'
 	set -- $(sfdisk -g "$LOOPDEV" | grep -E "$REGEXP" | sed -r "s@$REGEXP@\1 \2 \3@")
@@ -300,8 +386,54 @@ image=/boot/vmlinuz
 	boot=$BLOCKDEV
 	$LILO_COMMON
 	EOF
-fi
+	;;
+grub-efi)
+	chroot "$ROOTFS" grub-mkconfig -o /boot/grub/grub.cfg
+	case "$ARCH" in
+		*86)
+			chroot "$ROOTFS" grub-install --target=i386-efi --recheck \
+			  --removable  --no-uefi-secure-boot
+			sed -i 's/initrd16/initrdefi/g' "$ROOTFS/boot/grub/grub.cfg"
+			sed -i 's/linux16/linuxefi/g' "$ROOTFS/boot/grub/grub.cfg"
+		;;
+		x86_64)
+			chroot "$ROOTFS" grub-install --target=i386-efi --recheck \
+			  --removable  --no-uefi-secure-boot
+			chroot "$ROOTFS" grub-install --target=x86_64-efi --recheck \
+			  --removable  --no-uefi-secure-boot
+			sed -i 's/initrd16/initrdefi/g' "$ROOTFS/boot/grub/grub.cfg"
+			sed -i 's/linux16/linuxefi/g' "$ROOTFS/boot/grub/grub.cfg"
+		;;
+		aarch64)
+			chroot "$ROOTFS" grub-install --target=arm64-efi --recheck \
+			  --removable  --no-uefi-secure-boot
+		;;
+		armh)
+			chroot "$ROOTFS" grub-install --target=arm-efi --recheck \
+			  --removable  --no-uefi-secure-boot
+		;;
+	esac
+	;;
+grub)
+	chroot "$ROOTFS" grub-mkconfig -o /boot/grub/grub.cfg
+	case "$ARCH" in
+		*86*)
+			chroot "$ROOTFS" grub-install --target=i386-pc "$LOOPDEV"
+			sed -i 's/initrdefi/initrd16/g' "$ROOTFS/boot/grub/grub.cfg"
+			sed -i 's/linuxefi/linux16/g' "$ROOTFS/boot/grub/grub.cfg"
+			;;
+		ppc*)
+			[ -z "$LOOPBOOTLOADER" ] ||
+				chroot "$ROOTFS" grub-install --target=powerpc-ieee1275 \
+				--no-nvram "$LOOPBOOTLOADER"
+			;;
+	esac
+	;;
+esac
 
 if [ -n "$SUDO_USER" ]; then
-	chown "$SUDO_USER:$(id -g "$SUDO_USER")" "$IMG" "$ROOTFS" "$WORKDIR" ||:
+	chown "$SUDO_USER:$(id -g "$SUDO_USER")" "$IMG" ||:
 fi
+# maybe qemu interpreter was copied to chroot;
+# this is no longer necessary, remove
+rm -rf "$ROOTFS"/.host ||:

conf.d/basealt.mk

@@ -2,30 +2,40 @@ ifeq (distro,$(IMAGE_CLASS))
 
 ifeq (,$(filter-out i586 x86_64,$(ARCH)))
 distro/alt-workstation: workstation_groups_x86 = $(addprefix workstation/,\
-	3rdparty blender clamav cloud-clients freecad gnome-peer-to-peer \
-	gtk-dictionary kvm smartcard virtualbox voip-clients)
+	3rdparty blender clamav cloud-clients freecad \
+	gtk-dictionary kvm smartcard voip-clients)
+endif
 
-distro/alt-workstation: distro/.base +power +vmguest +wireless +efi \
+distro/alt-workstation: distro/.base +vmguest +wireless +efi \
 	mixin/desktop-installer mixin/alt-workstation \
+	mixin/alt-workstation-install \
         use/memtest use/rescue/base use/bootloader/grub use/luks \
         use/efi/refind use/efi/memtest86 use/efi/shell \
 	use/install2/repo use/install2/suspend use/live/suspend \
         use/live/install use/live/x11 use/live/repo use/live/rw \
+        use/vmguest/kvm/x11 use/stage2/kms \
 	use/branding/complete use/docs/license \
         use/domain-client/full use/x11/amdgpu use/x11/lightdm/gtk
 	@$(call add,INSTALL2_PACKAGES,open-iscsi)
-	@$(call add,INSTALL2_PACKAGES,xorg-conf-synaptics)
+	@$(call add,INSTALL2_PACKAGES,xorg-conf-libinput-touchpad)
+	@$(call add,INSTALL2_PACKAGES,installer-feature-quota-stage2)
 	@$(call add,MAIN_PACKAGES,solaar)
+ifeq (,$(filter-out i586 x86_64,$(ARCH)))
 	@$(call add,MAIN_GROUPS,$(workstation_groups_x86))
+endif
+ifeq (,$(filter-out x86_64,$(ARCH)))
+	@$(call add,MAIN_GROUPS,workstation/virtualbox)
+	@$(call add,BASE_KMODULES,kvm virtualbox)
+endif
 	@$(call add,MAIN_LISTS,workstation/extras)
 	@$(call add,MAIN_LISTS,$(call tags,xorg vaapi))
 	@$(call add,THE_LISTS,$(call tags,archive extra))
 	@$(call add,THE_LISTS,$(call tags,mobile mate))
-	@$(call add,BASE_KMODULES,kvm virtualbox)
-	@$(call add,CLEANUP_BASE_PACKAGES,acpid-events-power)
+	@$(call add,LIVE_PACKAGES,installer-feature-quota-stage2)
+	@$(call add,LIVE_PACKAGES,livecd-installer-features)
+	@$(call add,LIVE_PACKAGES,installer-feature-lightdm-stage3)
 	@$(call add,RESCUE_BOOTARGS,nomodeset vga=0)
 	@$(call add,EFI_BOOTARGS,lang=ru_RU)
-endif
 
 ifeq (,$(filter-out e2k%,$(ARCH)))
 distro/.alt-workstation-base: distro/.e2k-installer mixin/alt-workstation
@@ -40,15 +50,35 @@ distro/.alt-workstation-base: distro/.e2k-installer mixin/alt-workstation
 distro/.alt-workstation: distro/.alt-workstation-base use/x11/lightdm/gtk; @:
 
 distro/alt-workstation-101: distro/.alt-workstation use/e2k/101
-	@$(call set,META_VOL_ID,ALT Workstation/101)
+	@$(call set,META_VOL_ID,ALT Workstation 101)
+	@$(call add,MAIN_GROUPS,workstation/e101-modesetting)
+	@$(call add,MAIN_GROUPS,workstation/e101-mga2)
 
 distro/alt-workstation-401: distro/.alt-workstation use/e2k/401; @:
-	@$(call set,META_VOL_ID,ALT Workstation/401)
+	@$(call set,META_VOL_ID,ALT Workstation 401)
 
 # avoid lightdm; NB: mate-settings pulls it in (hence the dummy)
 distro/alt-workstation-801: distro/.alt-workstation-base use/e2k/install2/801
-	@$(call set,META_VOL_ID,ALT Workstation/801)
+	@$(call set,META_VOL_ID,ALT Workstation 801)
 	@$(call add,MAIN_GROUPS,workstation/e801-1seat workstation/e801-2seat)
+	@$(call add,INSTALL2_PACKAGES,installer-feature-e2k-801-dualseat)
 endif
 
 endif
+
+ifeq (vm,$(IMAGE_CLASS))
+ifeq (,$(filter-out aarch64 armh,$(ARCH)))
+
+vm/alt-workstation: vm/systemd use/x11/armsoc use/x11/lightdm/gtk \
+	use/oem use/repo use/bootloader/uboot mixin/alt-workstation
+	@$(call add,THE_PACKAGES,rootfs-installer-features)
+	@$(call add,THE_PACKAGES,installer-feature-lightdm-stage3)
+	@$(call add,THE_PACKAGES,installer-feature-quota-stage2)
+
+vm/alt-workstation-tegra: vm/alt-workstation use/aarch64-tegra; @:
+
+endif
+vm/alt-workstation-cloud: vm/alt-p9-cloud use/x11/lightdm/gtk \
+	mixin/alt-workstation
+	@$(call add,THE_PACKAGES,cloud-init-config-netplan)
+endif

conf.d/desktop.mk

@@ -4,15 +4,11 @@ ifeq (distro,$(IMAGE_CLASS))
 distro/.desktop-base: distro/.installer use/syslinux/ui/vesamenu use/x11/xorg
 	@$(call set,INSTALLER,desktop)
 
-distro/.desktop-mini: distro/.desktop-base use/x11/xdm +power; @:
+distro/.desktop-mini: distro/.desktop-base use/x11/xdm; @:
 
 distro/.desktop-network: distro/.desktop-mini mixin/desktop-installer; @:
 
-distro/.desktop-extra:
-	@$(call add,BASE_LISTS,$(call tags,(archive || base) && (extra)))
-
 distro/icewm: distro/.desktop-network use/lowmem use/install2/fs +icewm; @:
-distro/ltsp-tde: distro/tde +ltsp; @:
 distro/ltsp-icewm: distro/icewm +ltsp; @:
 
 endif

conf.d/e2k.mk

@@ -13,8 +13,8 @@ vm/.e2k-rescue: vm/e2k-live \
 	@$(call add,THE_LISTS,$(call tags,server && (network || extra)))
 	@$(call add,DEFAULT_SERVICES_DISABLE,gpm mdadm smartd)
 
-vm/e2k-rescue: vm/.e2k-rescue +sysvinit
-	@$(call add,KFLAVOURS,elbrus-1cp elbrus-8c elbrus-4c)
+vm/alt-rescue: vm/.e2k-rescue +sysvinit
+	@$(call add,KFLAVOURS,elbrus-def)
 
 vm/e2k-xfce: vm/.e2k-rescue mixin/e2k-desktop use/x11/xfce
 	@$(call add,THE_PACKAGES,pnmixer)
@@ -69,6 +69,7 @@ distro/.e2k-installer-base: distro/.base mixin/e2k-base \
 	@$(call add,INSTALL2_BRANDING,alterator)
 	@$(call add,THE_PACKAGES,agetty gpm fdisk parted smartmontools pv sshfs)
 	@$(call add,THE_PACKAGES,make-initrd dhcpcd hdparm nfs-clients vim-console)
+	@$(call add,THE_PACKAGES,python-module-serial)
 	@$(call add,THE_LISTS,$(call tags,server && (network || extra)))
 	@$(call add,DEFAULT_SERVICES_DISABLE,gpm mdadm smartd)
 	@$(call add,THE_BRANDING,alterator)
@@ -80,9 +81,14 @@ distro/.e2k-installer: distro/.e2k-installer-base +systemd; @:
 distro/e2k-801-builder: distro/.e2k-installer-sysv \
 	use/e2k/install2/801 use/dev/groups/builder; @:
 
-distro/alt-jeos-401: distro/.e2k-installer-sysv use/e2k/install2/401; @:
-distro/alt-jeos-801: distro/.e2k-installer-sysv use/e2k/install2/801; @:
-distro/alt-jeos-101: distro/.e2k-installer-sysv use/e2k/install2/101; @:
+distro/alt-jeos-401: distro/.e2k-installer-sysv use/e2k/install2/401
+	@$(call set,META_VOL_ID,ALT JeOS 401)
+
+distro/alt-jeos-801: distro/.e2k-installer-sysv use/e2k/install2/801
+	@$(call set,META_VOL_ID,ALT JeOS 801)
+
+distro/alt-jeos-101: distro/.e2k-installer-sysv use/e2k/install2/101
+	@$(call set,META_VOL_ID,ALT JeOS 101)
 
 distro/e2k-101-mate: distro/.e2k-installer use/e2k/101 \
 	mixin/e2k-desktop mixin/e2k-mate

conf.d/education.mk

@@ -1,12 +1,101 @@
-# Education Set
+# ALT Education
+
+mixin/education: use/kernel use/firmware \
+	+systemd \
+	use/services \
+	use/ntp/chrony \
+	use/x11/xorg use/x11/lightdm/gtk +pulse \
+	+nm use/x11/gtk/nm use/net-eth/dhcp \
+	use/xdg-user-dirs/deep
+	@$(call set,BRANDING,alt-education)
+	@$(call add,THE_BRANDING,indexhtml)
+	@$(call add,THE_BRANDING,menu xfce-settings system-settings)
+	@$(call add,THE_LISTS,slinux/xfce-base)
+	@$(call add,THE_LISTS,slinux/misc-base)
+	@$(call add,THE_LISTS,gnome-p2p)
+	@$(call add,THE_LISTS,$(call tags,base l10n))
+	@$(call add,BASE_LISTS,education/base)
+	@$(call add,BASE_LISTS,workstation/3rdparty)
+	@$(call add,THE_LISTS,education/misc)
+	@$(call add,THE_PACKAGES,usbutils pv lftp links2 openssh-server xinput xorg-drv-libinput)
+	@$(call add,THE_PACKAGES,net-tools fdisk gdisk parted partclone)
+	@$(call add,THE_PACKAGES,disable-usb-autosuspend)
+	@$(call add,THE_LISTS,$(call tags,base regular))
 
 ifeq (distro,$(IMAGE_CLASS))
 
-distro/education-junior: distro/.installer use/slinux/full \
-	use/l10n/default/ru_RU +vmguest
-	@$(call set,INSTALLER,junior)
-	@$(call set,BRANDING,school-junior)
-	@$(call set,META_VOL_SET,Education Junior)
-	@$(call add,THE_LISTS,education/desktop)
+distro/education: distro/alt-education; @:
+distro/alt-education: distro/.installer mixin/education \
+	use/memtest \
+	use/branding/complete \
+	use/live/install use/live/suspend \
+	use/live/repo use/live/x11 use/live/rw \
+	use/install2/vnc use/install2/full \
+	use/l10n/default/ru_RU +vmguest \
+	+efi use/efi/refind use/efi/shell \
+	use/isohybrid use/luks \
+	+plymouth +wireless \
+	use/install2/fonts \
+	use/stage2/fs use/stage2/hid use/stage2/md \
+	use/stage2/mmc use/stage2/net use/stage2/net-nfs \
+	use/stage2/rtc use/stage2/sbc use/stage2/scsi use/stage2/usb
+	@$(call set,INSTALLER,education)
+	@$(call set,META_VOL_ID,ALT Education 9.0 $(ARCH))
+	@$(call set,META_PUBLISHER,BaseALT Ltd)
+	@$(call set,META_APP_ID,$(DISTRO_VERSION) $(ARCH))
+	@$(call set,META_VOL_SET,ALT)
+	@$(call add,INSTALL2_PACKAGES,disable-usb-autosuspend)
+	@$(call add,INSTALL2_PACKAGES,installer-feature-samba-usershares-stage2)
+	@$(call add,MAIN_LISTS,slinux/not-install-full)
+	@$(call add,MAIN_GROUPS,education/01_preschool)
+	@$(call add,MAIN_GROUPS,education/02_gradeschool)
+	@$(call add,MAIN_GROUPS,education/03_highschool)
+	@$(call add,MAIN_GROUPS,education/04_secondary_vocational)
+	@$(call add,MAIN_GROUPS,education/05_university)
+	@$(call add,MAIN_GROUPS,education/teacher)
+	@$(call add,MAIN_GROUPS,education/kde5)
+	@$(call add,MAIN_GROUPS,education/server-apps-edu)
+ifeq (,$(filter-out i586 x86_64,$(ARCH)))
+	@$(call set,KFLAVOURS,un-def std-def)
+	@$(call add,MAIN_PACKAGES,kernel-headers-std-def kernel-headers-modules-std-def)
+	@$(call add,MAIN_PACKAGES,kernel-headers-un-def kernel-headers-modules-un-def)
+	@$(call add,THE_KMODULES,virtualbox)
+	@$(call add,THE_KMODULES,nvidia)
+	@$(call add,THE_KMODULES,lsadrv bbswitch)
+	@$(call add,THE_KMODULES,staging)
+	@$(call add,MAIN_KMODULES,bbswitch)
+	@$(call add,THE_PACKAGES,xorg-drv-vmware xorg-drv-vmmouse)
+	@$(call add,THE_PACKAGES,syslinux)
+	@$(call add,MAIN_PACKAGES,owamp-server)
+endif
+	@$(call add,THE_PACKAGES,bluez pulseaudio-bluez)
+	@$(call add,THE_PACKAGES,alterator-fbi)
+	@$(call add,THE_PACKAGES,alt-rootfs-installer)
+	@$(call add,BASE_PACKAGES,os-prober)
+	@$(call add,BASE_PACKAGES,guest-account)
+	@$(call add,BASE_PACKAGES,nextcloud-client)
+	@$(call add,MAIN_PACKAGES,iperf3)
+	@$(call add,MAIN_PACKAGES,stellarium)
+	@$(call add,MAIN_PACKAGES,libreoffice-block-macros)
+	@$(call add,MAIN_PACKAGES,lmms)
+	@$(call set,GLOBAL_LIVE_NO_CLEANUPDB,true)
+	@$(call add,LIVE_PACKAGES,livecd-timezone)
+	@$(call add,LIVE_LISTS,slinux/net-base)
+	@$(call add,LIVE_LISTS,$(call tags,base rescue))
+	@$(call add,STAGE2_PACKAGES,xorg-conf-libinput-touchpad)
+	@$(call add,STAGE2_PACKAGES,chrony)
+	@$(call add,STAGE1_MODLISTS,stage2-mmc)
+endif
+
+ifeq (vm,$(IMAGE_CLASS))
+ifeq (,$(filter-out aarch64 armh,$(ARCH)))
+
+vm/education: vm/alt-education; @:
+vm/alt-education: vm/systemd use/repo use/x11/armsoc \
+	use/oem use/bootloader/uboot mixin/education
+	@$(call add,DEFAULT_SERVICES_DISABLE,multipathd)
+
+vm/alt-education-tegra: vm/alt-education use/aarch64-tegra; @:
 
 endif
+endif

conf.d/live.mk

@@ -13,9 +13,9 @@ distro/rescue-remote: distro/.base use/rescue/base use/stage2/net-eth
 	@$(call add,RESCUE_PACKAGES,livecd-net-eth)
 
 distro/syslinux: distro/.boot \
-	use/syslinux/localboot.cfg use/syslinux/ui/vesamenu use/hdt; @:
+	use/syslinux/ui/vesamenu use/hdt; @:
 
-distro/.live-base: distro/.base use/live/base use/power/acpi/button; @:
+distro/.live-base: distro/.base use/live/base; @:
 distro/.live-x11: distro/.live-base use/live/x11; @:
 
 distro/.live-desktop: distro/.base +live use/live/install use/stage2/net-eth \
@@ -24,7 +24,7 @@ distro/.live-desktop-ru: distro/.live-desktop use/live/ru; @:
 
 distro/.live-kiosk: distro/.base use/live/base use/live/autologin \
 	use/syslinux/timeout/1 use/cleanup use/stage2/net-eth \
-	use/fonts/otf/adobe +power
+	use/fonts/otf/adobe
 	@$(call add,CLEANUP_PACKAGES,'alterator*' 'guile*' 'vim-common')
 	@$(call set,SYSLINUX_UI,none)
 	@$(call set,SYSLINUX_CFG,live)
@@ -43,7 +43,6 @@ 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/x11/lightdm/gtk +icewm; @:
-distro/live-tde: distro/.live-desktop-ru use/live/install +tde; @:
 distro/live-fvwm: distro/.live-desktop-ru use/x11/lightdm/gtk use/x11/fvwm; @:
 
 distro/live-rescue: distro/live-icewm +efi
@@ -115,10 +114,8 @@ distro/live-gimp: distro/live-icewm use/live/ru
 	@$(call add,LIVE_PACKAGES,qtfm openssh-clients rsync usbutils)
 	@$(call add,LIVE_PACKAGES,design-graphics-sisyphus2)
 
-distro/live-robo: distro/live-icewm +robotics use/live/ru; @:
-
 # NB: use/browser won't do as it provides a *single* browser ATM
-distro/live-privacy: distro/.base +power +efi +systemd +vmguest \
+distro/live-privacy: distro/.base +efi +systemd +vmguest \
 	use/live/base use/live/privacy use/live/ru \
 	use/x11/xorg use/x11/lightdm/gtk use/x11/mate use/x11-autologin \
 	use/browser/firefox/esr use/browser/firefox/i18n use/sound \

conf.d/mixin-basealt.mk

@@ -1,15 +1,14 @@
 # shared across all supported arches, can be complemented per arch
 
-mixin/alt-workstation: workstation_groups = $(addprefix workstation/,\
+mixin/alt-workstation-install: workstation_groups = $(addprefix workstation/,\
 	10-office 20-networking 30-multimedia 40-virtualization 50-publishing \
-	agents emulators ganttproject graphics-editing libreoffice \
-	mate-usershare pidgin raccess scanning scribus sound-editing \
-	thunderbird vlc freeipa-client)
+	agents emulators ganttproject gnome-peer-to-peer graphics-editing \
+	libreoffice mate-usershare pidgin raccess scanning scribus \
+	sound-editing thunderbird vlc freeipa-client)
 
-mixin/alt-workstation: +installer +systemd +pulse +nm \
+mixin/alt-workstation: +systemd +systemd-optimal +pulse +nm \
 	use/kernel/net use/l10n/default/ru_RU \
 	use/x11/xorg use/x11-autostart use/x11/gtk/nm \
-	use/install2/fs use/install2/fat use/install2/vnc \
 	use/apt-conf/branch use/volumes/regular \
 	use/fonts/install2 \
 	use/fonts/otf/adobe use/fonts/otf/mozilla \
@@ -21,12 +20,7 @@ mixin/alt-workstation: +installer +systemd +pulse +nm \
 	use/browser/firefox use/browser/firefox/esr
 	@$(call set,BRANDING,alt-workstation)
 	@$(call add,THE_BRANDING,mate-settings)
-	@$(call add,STAGE1_MODLISTS,stage2-mmc)
-	@$(call set,INSTALLER,altlinux-desktop)
-	@$(call add,INSTALL2_PACKAGES,alterator-notes)
-	@$(call add,INSTALL2_PACKAGES,fdisk)
 	@$(call add,COMMON_PACKAGES,vim-console)
-	@$(call add,MAIN_GROUPS,$(workstation_groups))
 	@$(call add,BASE_LISTS,workstation/base.pkgs)
 	@$(call add,BASE_LISTS,$(call tags,desktop cups))
 	@$(call add,LIVE_LISTS,workstation/live.pkgs)
@@ -42,12 +36,28 @@ mixin/alt-workstation: +installer +systemd +pulse +nm \
 	@$(call add,CLEANUP_PACKAGES,xterm)
 	@$(call set,GLOBAL_LIVE_NO_CLEANUPDB,true)
 	@$(call add,CONTROL,xdg-user-dirs:enabled)
-	@$(call add,SERVICES_ENABLE,sshd)
+	@$(call add,SERVICES_DISABLE,sshd)
+	@$(call add,SERVICES_DISABLE,auditd)
 	@$(call add,SERVICES_ENABLE,cups smb nmb httpd2 bluetoothd libvirtd)
-	@$(call add,DEFAULT_SERVICES_ENABLE,fstrim.timer)
-	@$(call add,DEFAULT_SERVICES_DISABLE,powertop bridge gpm)
+	@$(call add,SERVICES_ENABLE,chronyd)
+	@$(call add,SERVICES_ENABLE,crond)
+	@$(call add,SERVICES_ENABLE,fstrim.timer)
+	@$(call add,SERVICES_DISABLE,powertop bridge gpm)
 	@$(call set,META_PUBLISHER,BaseALT Ltd)
 	@$(call set,META_VOL_SET,ALT)
-	@$(call set,META_VOL_ID,ALT Workstation)
-	@$(call set,META_APP_ID,$(DISTRO_VERSION)/$(ARCH))
+	@$(call set,META_VOL_ID,ALT Workstation $(DISTRO_VERSION) $(ARCH))
+	@$(call set,META_APP_ID,ALT Workstation $(DISTRO_VERSION) $(ARCH) $(shell date +%F))
 	@$(call set,DOCS,alt-workstation)
+
+mixin/alt-workstation-install: +installer \
+	use/install2/fat use/install2/vnc \
+	use/stage2/fs use/stage2/hid use/stage2/md \
+	use/stage2/mmc use/stage2/net use/stage2/net-nfs \
+	use/stage2/rtc use/stage2/sbc use/stage2/scsi use/stage2/usb
+	@$(call set,INSTALLER,alt-workstation)
+	@$(call add,INSTALL2_PACKAGES,installer-feature-slideshow)
+	@$(call add,INSTALL2_PACKAGES,alterator-notes)
+	@$(call add,INSTALL2_PACKAGES,fdisk)
+	@$(call add,INSTALL2_PACKAGES,btrfs-progs)
+	@$(call add,STAGE2_PACKAGES,chrony)
+	@$(call add,MAIN_GROUPS,$(workstation_groups))

conf.d/mixin.mk

@@ -38,14 +38,31 @@ mixin/e2k-mate: use/e2k/x11 use/x11/xorg use/fonts/install2 \
 	@$(call add,THE_PACKAGES,zsh bash-completion)
 
 ### regular.mk
+mixin/regular-x11: use/luks use/volumes/regular \
+	use/browser/firefox/i18n use/browser/firefox/h264 \
+	use/branding use/ntp/chrony use/services/lvm2-disable
+	@$(call add,THE_LISTS,$(call tags,(base || desktop) && regular))
+	@$(call add,THE_PACKAGES,disable-usb-autosuspend)
+	@$(call add,THE_PACKAGES,btrfs-progs)
+	@$(call add,THE_PACKAGES,gpm)
+	@$(call add,DEFAULT_SERVICES_DISABLE,gpm powertop)
+
 # common WM live/installer bits
-mixin/regular-desktop: use/x11/xorg +alsa use/xdg-user-dirs
-	@$(call add,THE_PACKAGES,pam-limits-desktop beesu)
-	@$(call add,THE_PACKAGES,installer-feature-desktop-other-fs-stage2)
+mixin/regular-desktop: use/x11/xorg +alsa use/xdg-user-dirs use/l10n \
+	use/fonts/otf/adobe use/fonts/otf/mozilla use/net-eth
+	@$(call add,THE_PACKAGES,pam-limits-desktop beesu polkit)
 	@$(call add,THE_PACKAGES,alterator-notes dvd+rw-tools)
 	@$(call add,THE_BRANDING,alterator graphics indexhtml notes)
 	@$(call add,THE_PACKAGES,$$(THE_IMAGEWRITER))
-	@$(call set,THE_IMAGEWRITER,imagewriter)
+	@$(call set,THE_IMAGEWRITER,altmediawriter)
+	@$(call add,THE_PACKAGES,upower bluez udev-rules-rfkill-uaccess)
+	@$(call add,DEFAULT_SERVICES_DISABLE,gssd idmapd krb5kdc rpcbind)
+	@$(call add,DEFAULT_SERVICES_ENABLE,bluetoothd)
+	@$(call add,DEFAULT_SERVICES_ENABLE,cups)
+	@$(call add,DEFAULT_SERVICES_ENABLE,alteratord)
+
+mixin/desktop-extra:
+	@$(call add,BASE_LISTS,$(call tags,(archive || base) && extra))
 
 mixin/regular-wmaker: use/efi/refind use/syslinux/ui/gfxboot \
 	use/fonts/ttf/redhat use/x11/wmaker
@@ -53,35 +70,66 @@ mixin/regular-wmaker: use/efi/refind use/syslinux/ui/gfxboot \
 	@$(call add,LIVE_PACKAGES,installer-feature-no-xconsole-stage3)
 	@$(call add,MAIN_PACKAGES,wmgtemp wmhdaps wmpomme wmxkbru xxkb)
 
+mixin/regular-icewm: use/fonts/ttf/redhat +icewm +nm-gtk
+	@$(call add,THE_LISTS,$(call tags,regular icewm))
+	@$(call add,THE_LISTS,$(call tags,desktop nm))
+	@$(call add,THE_PACKAGES,icewm-startup-networkmanager)
+	@$(call add,THE_PACKAGES,mnt)
+
 # gdm2.20 can reboot/halt with both sysvinit and systemd, and is slim
 mixin/regular-gnustep: use/x11/gnustep use/x11/gdm2.20 use/mediacheck \
-	use/browser/firefox/classic
+	use/browser/seamonkey/i18n
 	@$(call add,THE_BRANDING,graphics)
 
-mixin/regular-xfce: use/x11/xfce use/x11/gtk/nm +nm \
-	use/fonts/ttf/redhat use/fonts/ttf/google/extra; @:
+mixin/regular-cinnamon: use/x11/cinnamon use/x11/lightdm/slick +nm-gtk \
+	use/fonts/ttf/google use/net/nm/mmgui use/im; @:
 
-mixin/regular-xfce-sysv: use/init/sysv/polkit use/deflogin/sysv/nm \
-	use/x11/lightdm/gtk \
-	use/browser/palemoon/i18n \
+mixin/regular-gnome3: use/x11/gnome3 use/fonts/ttf/redhat +nm-gtk
+	@$(call add,THE_PACKAGES,gnome3-regular xcalib templates)
+	@$(call add,THE_PACKAGES,chrome-gnome-shell)
+	@$(call add,THE_PACKAGES,firefox-gnome_shell_integration)
+	@$(call add,THE_PACKAGES,gnome-software-disable-updates)
+
+mixin/regular-kde5: use/x11/kde5 use/browser/falkon \
+	use/fonts/ttf/google use/fonts/ttf/redhat use/fonts/zerg \
+	+nm +pulse
+	@$(call add,THE_PACKAGES,kde5-telepathy falkon-kde5)
+
+mixin/xfce-base: use/x11/xfce +nm-gtk \
+	use/fonts/ttf/redhat use/fonts/ttf/google/extra
+	@$(call add,THE_BRANDING,xfce-settings)
+	@$(call add,THE_PACKAGES,xreader)
+	@$(call add,THE_PACKAGES,xdg-user-dirs-gtk)
+
+mixin/regular-xfce: mixin/xfce-base use/x11/xfce/full \
+	use/domain-client; @:
+
+mixin/regular-xfce-sysv: mixin/xfce-base \
 	use/fonts/otf/adobe use/fonts/otf/mozilla
 	@$(call add,THE_PACKAGES,pnmixer pm-utils elinks mpg123)
 	@$(call add,THE_PACKAGES,alsa-oss ossp whdd wget cdrkit)
-	@$(call add,THE_PACKAGES,xscreensaver)
+	@$(call add,THE_PACKAGES,qasmixer)
+	@$(call add,THE_PACKAGES,xfce4-screensaver)
+	@$(call add,THE_PACKAGES,sysstat leafpad)
+	@$(call add,THE_PACKAGES,nload)
+	@$(call add,THE_PACKAGES,NetworkManager-tui)
+	@$(call add,THE_PACKAGES,apt-conf-ignore-systemd)
+	@$(call add,THE_PACKAGES,pandoc)
 
-mixin/regular-lxde: use/x11/lxde use/x11/gtk/nm use/im +nm
-	@$(call add,LIVE_LISTS,$(call tags,desktop gvfs))
+mixin/regular-lxde: use/x11/lxde use/im +nm-gtk
 	@$(call add,THE_PACKAGES,qasmixer qpdfview)
-	@$(call set,THE_IMAGEWRITER,rosa-imagewriter)
 
-mixin/regular-tde: +tde \
-	use/syslinux/ui/gfxboot use/browser/firefox/classic use/fonts/ttf/redhat
-	@$(call add,THE_PACKAGES_REGEXP,kdeedu-kalzium.* kdeedu-ktouch.*)
-	@$(call add,DEFAULT_SERVICES_DISABLE,upower bluetoothd)
+mixin/regular-lxqt: use/x11/lxqt +nm-gtk; @:
 
-mixin/regular-lxqt: use/x11/lxqt use/x11/sddm \
-	use/browser/falkon use/x11/gtk/nm +nm +plymouth
-	@$(call set,THE_IMAGEWRITER,rosa-imagewriter)
+mixin/mate-base: use/x11/mate use/fonts/ttf/google +nm-gtk
+	@$(call add,THE_LISTS,$(call tags,mobile mate))
+
+mixin/regular-mate: mixin/mate-base use/domain-client
+	@$(call add,THE_LISTS,$(call tags,base smartcard))
+
+mixin/office: use/fonts/ttf/google use/fonts/ttf/xo
+	@$(call add,THE_LISTS,$(call tags,desktop && (cups || office)))
+	@$(call add,THE_PACKAGES,apt-indicator)
 
 # NB: never ever use/syslinux/ui/gfxboot here as gfxboot mangles
 #     kernel cmdline resulting in method:disk instead of method:cdrom
@@ -92,11 +140,17 @@ mixin/regular-rescue: use/rescue use/isohybrid use/luks use/branding \
 	use/syslinux/ui/menu use/syslinux/timeout/600 \
 	use/firmware/qlogic test/rescue/no-x11 +sysvinit; @:
 
+mixin/regular-builder: use/dev/builder/base use/net-eth/dhcp use/ntp/chrony
+	@$(call add,THE_PACKAGES,bash-completion elinks gpm lftp openssh)
+	@$(call add,THE_PACKAGES,rpm-utils screen tmux wget zsh)
+	@$(call add,DEFAULT_SERVICES_ENABLE,gpm)
+
 ### vm.mk
 mixin/cloud-init:
 	@$(call add,BASE_PACKAGES,cloud-init)
 	@$(call add,DEFAULT_SERVICES_ENABLE,cloud-config cloud-final)
 	@$(call add,DEFAULT_SERVICES_ENABLE,cloud-init cloud-init-local)
+	@$(call set,GLOBAL_NET_ETH,)
 
 mixin/opennebula-context:
 	@$(call add,BASE_PACKAGES,opennebula-context)

conf.d/p8.mk

@@ -1,60 +0,0 @@
-# p8 base kits
-
-mixin/p8: use/browser/firefox/esr
-	@$(call set,BRANDING,alt-starterkit)
-	@$(call set,IMAGE_FLAVOUR,$(subst alt-p8-,,$(IMAGE_NAME)))
-	@$(call set,META_VOL_ID,ALT p8 $$(IMAGE_FLAVOUR)/$(ARCH))
-
-# missing in sisyphus but not in p8
-mixin/p8/unikey:
-	@$(call add,THE_PACKAGES,ibus-unikey)
-
-ifeq (distro,$(IMAGE_CLASS))
-
-distro/alt-p8-cinnamon: distro/regular-cinnamon mixin/p8 mixin/p8/unikey; @:
-distro/alt-p8-icewm: distro/regular-icewm mixin/p8; @:
-distro/alt-p8-gnome3: distro/regular-gnome3 mixin/p8; @:
-distro/alt-p8-gnustep: distro/regular-gnustep mixin/p8; @:
-distro/alt-p8-kde4: distro/regular-kde4 mixin/p8; @:
-distro/alt-p8-kde5: distro/regular-kde5 mixin/p8; @:
-distro/alt-p8-lxde: distro/regular-lxde mixin/p8 mixin/p8/unikey; @:
-distro/alt-p8-lxde-sysv: distro/regular-lxde-sysv mixin/p8; @:
-distro/alt-p8-lxqt: distro/regular-lxqt mixin/p8; @:
-distro/alt-p8-lxqt-sysv: distro/regular-lxqt-sysv mixin/p8; @:
-distro/alt-p8-mate: distro/regular-mate mixin/p8; @:
-distro/alt-p8-rescue: distro/regular-rescue mixin/p8; @:
-distro/alt-p8-tde: distro/regular-tde mixin/p8; @:
-distro/alt-p8-tde-sysv: distro/regular-tde-sysv mixin/p8; @:
-distro/alt-p8-wmaker: distro/regular-wmaker mixin/p8; @:
-distro/alt-p8-xfce: distro/regular-xfce mixin/p8; @:
-distro/alt-p8-xfce-sysv: distro/regular-xfce-sysv mixin/p8; @:
-distro/alt-p8-enlightenment: distro/regular-enlightenment mixin/p8; @:
-distro/alt-p8-sysv-tde: distro/regular-sysv-tde mixin/p8; @:
-distro/alt-p8-sysv-xfce: distro/regular-sysv-xfce mixin/p8; @:
-
-distro/alt-p8-jeos: distro/regular-jeos mixin/p8; @:
-distro/alt-p8-jeos-ovz: distro/regular-jeos-ovz mixin/p8; @:
-distro/alt-p8-server: distro/regular-server mixin/p8; @:
-distro/alt-p8-server-ovz: distro/regular-server-ovz mixin/p8; @:
-distro/alt-p8-server-hyperv: distro/regular-server-hyperv mixin/p8; @:
-distro/alt-p8-server-samba4: distro/regular-server-samba4 mixin/p8; @:
-distro/alt-p8-server-openstack: distro/regular-server-openstack mixin/p8; @:
-distro/alt-p8-server-pve: distro/regular-server-pve mixin/p8; @:
-
-distro/alt-p8-builder: distro/regular-builder mixin/p8; @:
-
-distro/alt-p8-engineering: distro/regular-engineering mixin/p8; @:
-endif
-
-ifeq (ve,$(IMAGE_CLASS))
-ve/alt-p8-ovz-generic: ve/generic mixin/p8; @:
-
-ve/docker-p8: ve/docker; @:
-	@$(call set,BRANDING,alt-starterkit)
-endif
-
-ifeq (vm,$(IMAGE_CLASS))
-vm/alt-p8-vm-net: vm/net mixin/p8; @:
-vm/alt-p8-cloud: vm/cloud-systemd mixin/p8; @:
-vm/alt-p8-opennebula: vm/opennebula-systemd mixin/p8; @:
-endif

conf.d/p9.mk

@@ -0,0 +1,100 @@
+# p9 base kits
+
+mixin/p9: use/browser/firefox/esr
+	@$(call set,BRANDING,alt-starterkit)
+	@$(call set,IMAGE_FLAVOUR,$(subst alt-p9-,,$(IMAGE_NAME)))
+	@$(call set,META_VOL_ID,ALT p9 $$(IMAGE_FLAVOUR)/$(ARCH))
+
+ifeq (distro,$(IMAGE_CLASS))
+
+distro/alt-p9-cinnamon distro/alt-p9-enlightenment \
+	distro/alt-p9-gnome3 distro/alt-p9-gnustep-sysv \
+	distro/alt-p9-icewm-sysv distro/alt-p9-kde5 \
+	distro/alt-p9-lxde distro/alt-p9-lxqt \
+	distro/alt-p9-mate distro/alt-p9-rescue \
+	distro/alt-p9-wmaker-sysv distro/alt-p9-xfce \
+	distro/alt-p9-xfce-sysv distro/alt-p9-xfce-sysv-install: \
+	distro/alt-p9-%: distro/regular-% mixin/p9; @:
+
+distro/alt-p9-jeos-sysv distro/alt-p9-jeos-ovz distro/alt-p9-jeos-systemd \
+	distro/alt-p9-server-systemd distro/alt-p9-server-sysv \
+	distro/alt-p9-server-ovz \
+	distro/alt-p9-server-hyperv distro/alt-p9-server-samba4 \
+	distro/alt-p9-server-pve distro/alt-p9-server-lxd: \
+	distro/alt-p9-%: distro/regular-% mixin/p9; @:
+
+distro/alt-p9-builder: distro/regular-builder mixin/p9; @:
+
+distro/alt-p9-engineering: distro/regular-engineering mixin/p9; @:
+
+ifeq (,$(filter-out x86_64,$(ARCH)))
+distro/alt-p9-cnc-rt: distro/cnc-rt mixin/p9; @:
+endif
+endif
+
+ifeq (ve,$(IMAGE_CLASS))
+ve/alt-p9-ovz-generic: ve/generic mixin/p9; @:
+
+ve/docker-p9: ve/docker; @:
+	@$(call set,BRANDING,alt-starterkit)
+endif
+
+ifeq (vm,$(IMAGE_CLASS))
+vm/alt-p9-vm-net: vm/net mixin/p9; @:
+vm/alt-p9-cloud: vm/cloud-systemd mixin/p9; @:
+vm/alt-p9-opennebula: vm/opennebula-systemd mixin/p9; @:
+
+# universal builds rootfs and image for all platforms
+vm/alt-p9-jeos-systemd vm/alt-p9-jeos-sysv vm/alt-p9-builder \
+	vm/alt-p9-cinnamon vm/alt-p9-gnome3 vm/alt-p9-kde5 \
+	vm/alt-p9-icewm-sysv vm/alt-p9-lxde \
+	vm/alt-p9-lxqt vm/alt-p9-mate \
+	vm/alt-p9-xfce: \
+	vm/alt-p9-%: vm/regular-% mixin/p9; @:
+
+ifeq (,$(filter-out aarch64,$(ARCH)))
+vm/alt-p9-jeos-systemd-rpi4 vm/alt-p9-jeos-sysv-rpi4 \
+	vm/alt-p9-lxde-rpi4 vm/alt-p9-lxqt-rpi4 \
+	vm/alt-p9-mate-rpi4 vm/alt-p9-xfce-rpi4: \
+	vm/alt-p9-%-rpi4: vm/regular-%-rpi4 mixin/p9; @:
+
+vm/alt-p9-cinnamon-tegra vm/alt-p9-kde5-tegra \
+	vm/alt-p9-lxde-tegra vm/alt-p9-lxqt-tegra \
+	vm/alt-p9-mate-tegra vm/alt-p9-xfce-tegra: \
+	vm/alt-p9-%-tegra: vm/regular-%-tegra mixin/p9; @:
+
+# DBM BE-M1000
+vm/alt-p9-gnome3-dbm vm/alt-p9-xfce-dbm: \
+	vm/alt-p9-%-dbm: vm/regular-%-dbm mixin/p9; @:
+endif
+
+ifeq (,$(filter-out armh,$(ARCH)))
+vm/alt-p9-lxde-mcom02 vm/alt-p9-lxqt-mcom02 \
+	vm/alt-p9-mate-mcom02 vm/alt-p9-xfce-mcom02: \
+	vm/alt-p9-%-mcom02: vm/regular-%-mcom02 mixin/p9; @:
+
+vm/alt-p9-lxde-mcom02-mali vm/alt-p9-lxqt-mcom02-mali \
+	vm/alt-p9-mate-mcom02-mali vm/alt-p9-xfce-mcom02-mali: \
+	vm/alt-p9-%-mcom02-mali: vm/regular-%-mcom02-mali mixin/p9; @:
+endif
+
+ifeq (,$(filter-out mipsel,$(ARCH)))
+vm/tavolga-alt-p9-jeos-systemd vm/tavolga-alt-p9-jeos-sysv \
+	vm/tavolga-alt-p9-builder: \
+	vm/tavolga-alt-p9-%: vm/tavolga-regular-% mixin/p9; @:
+
+vm/tavolga-alt-p9-lxde vm/tavolga-alt-p9-lxqt \
+	vm/tavolga-alt-p9-mate vm/tavolga-alt-p9-xfce \
+	vm/tavolga-alt-p9-icewm-sysv: \
+	vm/tavolga-alt-p9-%: vm/tavolga-regular-% mixin/p9; @:
+
+vm/bfk3-alt-p9-jeos-systemd vm/bfk3-alt-p9-jeos-sysv \
+	vm/bfk3-alt-p9-builder: \
+	vm/bfk3-alt-p9-%: vm/bfk3-regular-% mixin/p9; @:
+
+vm/bfk3-alt-p9-lxde vm/bfk3-alt-p9-lxqt vm/bfk3-alt-p9-mate \
+	vm/bfk3-alt-p9-xfce vm/bfk3-alt-p9-icewm-sysv: \
+	vm/bfk3-alt-p9-%: vm/bfk3-regular-% mixin/p9; @:
+endif
+
+endif

conf.d/realtime.mk

@@ -0,0 +1,20 @@
+mixin/cnc-rt: use/cleanup +nm-gtk
+	@$(call set,KFLAVOURS,rt)
+	@$(call add,THE_LISTS,realtime/tests)
+	@$(call add,THE_LISTS,engineering/cnc)
+	@$(call add,THE_LISTS,engineering/misc)
+	@$(call add,CLEANUP_PACKAGES,virtualbox-guest-common)
+	@$(call add,CLEANUP_PACKAGES,open-vm-tools)
+	@$(call add,CLEANUP_PACKAGES,xorg-drv-vboxvideo xorg-drv-qxl)
+	@$(call add,CLEANUP_PACKAGES,spice-vdagent qemu-guest-agent)
+	@$(call add,CLEANUP_PACKAGES,xorg-drv-vmware xorg-drv-vmmouse open-vm-tools-desktop)
+
+ifeq (distro,$(IMAGE_CLASS))
+distro/cnc-rt: distro/regular-lxde mixin/cnc-rt
+	@$(call add,EFI_BOOTARGS,efi=runtime)
+endif
+
+ifeq (vm,$(IMAGE_CLASS))
+vm/cnc-rt: vm/regular-lxde mixin/vm-archdep mixin/cnc-rt; @:
+vm/cnc-rt-efi: vm/cnc-rt +efi; @:
+endif

conf.d/regular-vm.mk

@@ -0,0 +1,194 @@
+ifeq (vm,$(IMAGE_CLASS))
+
+ifeq (,$(filter-out armh aarch64,$(ARCH)))
+mixin/vm-archdep: use/bootloader/uboot use/no-sleep
+	@$(call set,KFLAVOURS,mp lts)
+else
+ifeq (,$(filter-out mipsel,$(ARCH)))
+mixin/vm-archdep: use/tty/S0
+	@$(call set,KFLAVOURS,un-malta)
+else
+mixin/vm-archdep: ; @:
+endif
+endif
+	@$(call add,KMODULES,staging)
+
+mixin/regular-vm-base: use/firmware use/ntp/chrony use/repo \
+	use/services/lvm2-disable
+ifneq (,$(filter-out i586 x86_64,$(ARCH)))
+	@$(call add,DEFAULT_SERVICES_DISABLE,multipathd)
+endif
+	@$(call add,THE_PACKAGES,vim-console)
+	@$(call add,THE_LISTS,$(call tags,base regular))
+
+mixin/regular-vm-jeos: mixin/regular-vm-base use/deflogin/root
+	@$(call add,DEFAULT_SERVICES_ENABLE,getty@tty1)
+
+mixin/regular-vm-x11: mixin/regular-vm-base mixin/regular-x11 \
+	mixin/regular-desktop use/oem +wireless; @:
+ifeq (,$(filter-out armh aarch64,$(ARCH)))
+	@$(call add,THE_PACKAGES,xorg-96dpi)
+	@$(call add,THE_LISTS,remote-access)
+endif
+
+vm/.regular-desktop: vm/systemd mixin/regular-vm-x11 +systemd +systemd-optimal \
+	+plymouth; @:
+
+vm/.regular-desktop-sysv: vm/bare mixin/regular-vm-x11 use/x11/gdm2.20 \
+	use/init/sysv/polkit +power; @:
+
+vm/.regular-gtk: vm/.regular-desktop use/x11/lightdm/gtk
+	@$(call add,THE_PACKAGES,blueberry)
+
+vm/.regular-qt: vm/.regular-desktop use/x11/sddm; @:
+
+vm/regular-jeos-systemd: vm/systemd-net \
+	mixin/regular-vm-jeos mixin/vm-archdep; @:
+
+vm/regular-jeos-sysv: vm/net mixin/regular-vm-jeos mixin/vm-archdep +power; @:
+
+vm/regular-builder: vm/regular-jeos-sysv mixin/regular-builder; @:
+
+vm/regular-icewm-sysv: vm/.regular-desktop-sysv mixin/regular-icewm \
+	mixin/vm-archdep; @:
+
+vm/regular-cinnamon: vm/.regular-gtk mixin/regular-cinnamon mixin/vm-archdep; @:
+
+vm/regular-gnome3: vm/.regular-gtk mixin/regular-gnome3 mixin/vm-archdep; @:
+
+vm/regular-lxde: vm/.regular-gtk mixin/regular-lxde mixin/vm-archdep; @:
+
+vm/regular-mate: vm/.regular-gtk mixin/mate-base mixin/vm-archdep
+	@$(call add,THE_PACKAGES,mate-reduced-resource)
+
+vm/regular-xfce: vm/.regular-gtk mixin/regular-xfce mixin/vm-archdep
+	@$(call add,THE_PACKAGES,xfce-reduced-resource)
+
+vm/regular-kde5: vm/.regular-gtk mixin/regular-kde5 mixin/vm-archdep; @:
+
+vm/regular-lxqt: vm/.regular-gtk mixin/regular-lxqt mixin/vm-archdep; @:
+
+ifeq (,$(filter-out aarch64,$(ARCH)))
+# Raspberry Pi 4
+vm/regular-jeos-systemd-rpi4: vm/systemd-net mixin/regular-vm-jeos \
+	use/aarch64-rpi4; @:
+
+vm/regular-jeos-sysv-rpi4: vm/net mixin/regular-vm-jeos \
+	use/aarch64-rpi4 +power; @:
+
+vm/regular-lxde-rpi4: vm/.regular-gtk mixin/regular-lxde use/aarch64-rpi4; @:
+
+vm/regular-lxqt-rpi4: vm/.regular-gtk mixin/regular-lxqt use/aarch64-rpi4; @:
+
+vm/regular-mate-rpi4: vm/.regular-gtk mixin/regular-mate use/aarch64-rpi4; @:
+
+vm/regular-xfce-rpi4: vm/.regular-gtk mixin/regular-xfce use/aarch64-rpi4; @:
+
+# Nvidia Tegra (Jetson Nano only)
+vm/regular-cinnamon-tegra: vm/.regular-gtk mixin/regular-cinnamon \
+	use/x11/lightdm/slick use/aarch64-tegra; @:
+
+vm/regular-kde5-tegra: vm/.regular-gtk mixin/regular-kde5 use/aarch64-tegra
+	@$(call add,THE_PACKAGES,kde5-ksplash-disabled)
+
+vm/regular-lxqt-tegra: vm/.regular-gtk mixin/regular-lxqt use/aarch64-tegra; @:
+
+vm/regular-mate-tegra: vm/.regular-gtk mixin/regular-mate use/aarch64-tegra; @:
+
+vm/regular-xfce-tegra: vm/.regular-gtk mixin/regular-xfce use/aarch64-tegra; @:
+
+# DBM BE-M1000
+vm/regular-xfce-dbm: vm/.regular-gtk mixin/regular-xfce use/aarch64-dbm; @:
+
+vm/regular-gnome3-dbm: vm/.regular-gtk mixin/regular-gnome3 use/aarch64-dbm; @:
+endif
+
+ifeq (,$(filter-out armh,$(ARCH)))
+# ELVIS mcom02 (free videodriver)
+vm/regular-lxde-mcom02: vm/.regular-gtk mixin/regular-lxde \
+	use/armh-mcom02/x11; @:
+
+vm/regular-lxqt-mcom02: vm/.regular-gtk mixin/regular-lxqt \
+	use/armh-mcom02/x11; @:
+
+vm/regular-mate-mcom02: vm/.regular-gtk mixin/regular-mate \
+	use/armh-mcom02/x11
+	@$(call add,THE_PACKAGES,mate-reduced-resource)
+
+vm/regular-xfce-mcom02: vm/.regular-gtk mixin/regular-xfce \
+	use/armh-mcom02/x11
+	@$(call add,THE_PACKAGES,xfce-reduced-resource)
+
+# ELVIS mcom02 (propietary videodriver)
+vm/regular-lxde-mcom02-mali: vm/.regular-gtk mixin/regular-lxde \
+	use/armh-mcom02/mali; @:
+
+vm/regular-lxqt-mcom02-mali: vm/.regular-gtk mixin/regular-lxqt \
+	use/armh-mcom02/mali; @:
+
+vm/regular-mate-mcom02-mali: vm/.regular-gtk mixin/mate-base \
+	use/armh-mcom02/mali
+	@$(call add,THE_PACKAGES,mate-reduced-resource)
+
+vm/regular-xfce-mcom02-mali: vm/.regular-gtk mixin/regular-xfce \
+	use/armh-mcom02/mali
+	@$(call add,THE_PACKAGES,xfce-reduced-resource)
+endif
+
+ifeq (,$(filter-out mipsel,$(ARCH)))
+# Tavolga
+vm/tavolga-regular-jeos-systemd: vm/systemd-net mixin/regular-vm-jeos \
+	use/mipsel-mitx; @:
+
+vm/tavolga-regular-jeos-sysv: vm/net mixin/regular-vm-jeos \
+	use/mipsel-mitx +power; @:
+
+vm/tavolga-regular-builder: vm/tavolga-regular-jeos-sysv \
+	mixin/regular-builder; @:
+
+vm/tavolga-regular-icewm-sysv: vm/.regular-desktop-sysv mixin/regular-icewm \
+	use/mipsel-mitx/x11; @:
+
+vm/tavolga-regular-lxde: vm/.regular-gtk mixin/regular-lxde \
+	use/mipsel-mitx/x11; @:
+
+vm/tavolga-regular-lxqt: vm/.regular-gtk mixin/regular-lxqt \
+	use/mipsel-mitx/x11; @:
+
+vm/tavolga-regular-mate: vm/.regular-gtk mixin/regular-mate \
+	use/mipsel-mitx/x11
+	@$(call add,THE_PACKAGES,mate-reduced-resource)
+
+vm/tavolga-regular-xfce: vm/.regular-gtk mixin/regular-xfce \
+	use/mipsel-mitx/x11
+	@$(call add,THE_PACKAGES,xfce-reduced-resource)
+
+# bfk3
+vm/bfk3-regular-jeos-systemd: vm/systemd-net mixin/regular-vm-jeos \
+	use/mipsel-bfk3; @:
+
+vm/bfk3-regular-jeos-sysv: vm/net mixin/regular-vm-jeos \
+	use/mipsel-bfk3 +power; @:
+
+vm/bfk3-regular-builder: vm/bfk3-regular-jeos-sysv \
+	mixin/regular-builder; @:
+
+vm/bfk3-regular-icewm-sysv: vm/.regular-desktop-sysv mixin/regular-icewm \
+	use/mipsel-bfk3/x11; @:
+
+vm/bfk3-regular-lxde: vm/.regular-gtk mixin/regular-lxde \
+	use/mipsel-bfk3/x11; @:
+
+vm/bfk3-regular-lxqt: vm/.regular-gtk mixin/regular-lxqt \
+	use/mipsel-bfk3/x11; @:
+
+vm/bfk3-regular-mate: vm/.regular-gtk mixin/regular-mate \
+	use/mipsel-bfk3/x11
+	@$(call add,THE_PACKAGES,mate-reduced-resource)
+
+vm/bfk3-regular-xfce: vm/.regular-gtk mixin/regular-xfce \
+	use/mipsel-bfk3/x11
+	@$(call add,THE_PACKAGES,xfce-reduced-resource)
+endif
+
+endif

conf.d/regular.mk

@@ -2,51 +2,48 @@
 ifeq (distro,$(IMAGE_CLASS))
 
 # common ground (really lowlevel)
-distro/.regular-bare: distro/.base +net-eth use/kernel/net use/docs/license
+distro/.regular-bare: distro/.base +net-eth use/kernel/net use/docs/license \
+	use/stage2/fs use/stage2/hid use/stage2/md \
+	use/stage2/mmc use/stage2/net use/stage2/net-nfs \
+	use/stage2/rtc use/stage2/sbc use/stage2/scsi use/stage2/usb
 	@$(call try,SAVE_PROFILE,yes)
 
 # base target (for most images)
-distro/.regular-base: distro/.regular-bare use/vmguest use/memtest +efi
-	@$(call add,STAGE1_MODLISTS,stage2-mmc)
+distro/.regular-base: distro/.regular-bare use/vmguest use/memtest +efi; @:
 
 # graphical target (not enforcing xorg drivers or blobs)
-distro/.regular-x11: distro/.regular-base +vmguest +wireless \
+distro/.regular-x11: distro/.regular-base \
+	use/x11/wacom use/x11/amdgpu +vmguest +wireless \
 	use/stage2/cifs use/live/rw use/live/x11 use/live/repo \
-	use/live/install use/live/suspend use/browser/firefox/live \
-	use/browser/firefox/i18n use/browser/firefox/h264 \
-	use/branding use/x11/wacom use/x11/amdgpu \
-	use/ntp/client use/services/lvm2-disable \
-	use/luks use/volumes/regular
-	@$(call add,THE_PACKAGES,disable-usb-autosuspend)
-	@$(call add,LIVE_PACKAGES,btrfs-progs)
-	@$(call add,LIVE_LISTS,$(call tags,(base || desktop) && regular))
+	use/live/install use/live/suspend use/browser/firefox/live
+	@$(call add,LIVE_PACKAGES,livecd-install-apt-cache)
 	@$(call add,LIVE_LISTS,$(call tags,base rescue))
 	@$(call add,LIVE_PACKAGES,gpm livecd-install-apt-cache)
 	@$(call add,DEFAULT_SERVICES_DISABLE,gpm powertop)
 	@$(call add,EFI_BOOTARGS,live_rw)
 
 # WM base target
-distro/.regular-wm: distro/.regular-x11 mixin/regular-desktop; @:
+distro/.regular-wm: distro/.regular-x11 mixin/regular-x11 \
+	mixin/regular-desktop use/efi/refind
+	@$(call add,THE_BRANDING,bootloader)
 
 # DE base target
 # TODO: use/plymouth/live when luks+plymouth is done, see also #28255
-distro/.regular-desktop: distro/.regular-wm \
-	use/syslinux/ui/gfxboot use/firmware/laptop use/efi/refind +systemd
+distro/.regular-desktop: distro/.regular-wm use/branding/full \
+	use/syslinux/ui/gfxboot use/firmware/laptop +systemd +systemd-optimal
 	@$(call add,THE_BRANDING,bootloader)
-	@$(call add,THE_PACKAGES,upower bluez)
-	@$(call add,THE_PACKAGES,vconsole-setup-kludge)	#28805
-	@$(call add,DEFAULT_SERVICES_DISABLE,gssd idmapd krb5kdc rpcbind)
-	@$(call add,DEFAULT_SERVICES_ENABLE,bluetoothd)
+	@$(call add,THE_PACKAGES,installer-feature-desktop-other-fs-stage2)
 	@$(call set,KFLAVOURS,std-def)
 
-distro/.regular-gtk: distro/.regular-desktop use/x11/lightdm/slick +plymouth; @:
-distro/.regular-sysv: distro/.regular-wm +sysvinit \
-	use/init/sysv/consolekit; @:
-distro/.regular-sysv-gtk: distro/.regular-sysv use/syslinux/ui/gfxboot \
-	use/x11/gdm2.20; @:
+distro/.regular-gtk: distro/.regular-desktop use/x11/lightdm/gtk +plymouth; @:
 
-distro/.regular-install: distro/.regular-base +installer +sysvinit +power \
-	use/branding use/bootloader/grub use/luks \
+distro/.regular-desktop-sysv: distro/.regular-wm use/init/sysv/polkit; @:
+
+distro/.regular-gtk-sysv: distro/.regular-desktop-sysv \
+	use/syslinux/ui/gfxboot use/x11/gdm2.20; @:
+
+distro/.regular-install: distro/.regular-base +installer \
+	use/branding use/bootloader/grub use/luks use/stage2/kms \
 	use/install2/fs use/install2/vnc use/install2/repo
 	@$(call add,INSTALL2_PACKAGES,fdisk)
 	@$(call add,INSTALL2_PACKAGES,xorg-conf-synaptics)
@@ -55,150 +52,117 @@ distro/.regular-install: distro/.regular-base +installer +sysvinit +power \
 	@$(call add,THE_BRANDING,alterator)
 
 # common base for the very bare distros
-distro/.regular-jeos-base: distro/.regular-bare +sysvinit \
-	use/isohybrid use/branding use/bootloader/grub \
+distro/.regular-jeos-base: distro/.regular-bare \
+	use/isohybrid use/branding \
 	use/install2/repo use/install2/packages \
 	use/net/etcnet use/power/acpi/button
 	@$(call set,BOOTVGA,)
 	@$(call set,INSTALLER,altlinux-generic)
 	@$(call add,INSTALL2_BRANDING,alterator notes)
 	@$(call add,THE_BRANDING,alterator) # just to be cleaned up later on
-	@$(call add,THE_PACKAGES,apt basesystem dhcpcd vim-console)
+	@$(call add,THE_PACKAGES,apt basesystem dhcpcd vim-console su agetty)
 	@$(call add,THE_LISTS,openssh)
 
 # ...and for somewhat bare distros
-distro/.regular-jeos: distro/.regular-jeos-base \
-	use/bootloader/lilo use/syslinux/lateboot.cfg \
+distro/.regular-jeos: distro/.regular-jeos-base use/stage2/kms \
 	use/install2/cleanup/everything use/install2/cleanup/kernel/everything \
-	use/cleanup/jeos
+	use/syslinux/lateboot.cfg use/cleanup/jeos
 	@$(call add,BASE_KMODULES,guest scsi vboxguest)
 	@$(call add,BASE_PACKAGES,make-initrd-mdadm cpio)
 
-# NB:
-# - stock cleanup is not enough (or installer-common-stage3 deps soaring)
-distro/regular-jeos: distro/.regular-jeos use/cleanup/jeos/full \
-	use/volumes/jeos use/install2/vmguest use/vmguest/base
+distro/.regular-jeos-full: distro/.regular-jeos \
+	use/volumes/jeos use/install2/vmguest use/vmguest/bare \
+	use/ntp/chrony use/bootloader/grub +efi
 	@$(call add,BASE_PACKAGES,nfs-utils gdisk)
+	@$(call add,INSTALL2_PACKAGES,fdisk)
 	@$(call add,MAIN_PACKAGES,firmware-linux)
 	@$(call add,CLEANUP_PACKAGES,libffi 'libltdl*')
 	@$(call add,CLEANUP_PACKAGES,bridge-utils)
 	@$(call add,DEFAULT_SERVICES_DISABLE,fbsetfont)
-	@$(call add,STAGE2_BOOTARGS,quiet)
 	@$(call set,KFLAVOURS,un-def)
+	@$(call add,BASE_KMODULES,staging)
 
+# NB:
+# - stock cleanup is not enough (or installer-common-stage3 deps soaring)
+distro/regular-jeos-sysv: distro/.regular-jeos-full use/cleanup/jeos/full \
+	+sysvinit; @:
+
+distro/regular-jeos-systemd: distro/.regular-jeos-full \
+	+systemd +systemd-optimal
+	@$(call add,BASE_PACKAGES,glibc-locales)
+
+ifeq (,$(filter-out i586 x86_64,$(ARCH)))
 # NB: no +efi as it brings in grub2 (no ELILO support for system boot)
-distro/regular-jeos-ovz: distro/.regular-jeos \
-	use/server/ovz-base use/control/server/ldv use/firmware
+distro/regular-jeos-ovz: distro/.regular-jeos use/cleanup/jeos/full +sysvinit \
+	use/server/ovz-base use/control/server/ldv use/firmware use/bootloader/lilo
 	@$(call add,THE_PACKAGES,ipmitool lm_sensors3 mailx)
+endif
 
-distro/.regular-install-x11: distro/.regular-install \
-	use/install2/suspend mixin/regular-desktop +vmguest +wireless \
-	use/ntp/client
+distro/.regular-install-x11: distro/.regular-install +vmguest +wireless \
+	use/install2/suspend mixin/regular-desktop mixin/regular-x11 \
+	use/branding/complete use/branding/slideshow/once use/efi/refind
 	@$(call set,INSTALLER,altlinux-desktop)
-	@$(call add,THE_PACKAGES,disable-usb-autosuspend)
-	@$(call add,THE_LISTS,$(call tags,regular desktop))
 
-# assumes somewhat more experienced user, mostly for sysv variants
+# assumes somewhat more experienced user
 distro/.regular-install-x11-full: distro/.regular-install-x11 \
-	mixin/desktop-installer mixin/regular-desktop use/install2/fs \
 	use/fonts/otf/adobe use/fonts/otf/mozilla use/fonts/chinese \
-	use/branding/complete use/branding/slideshow/once \
-	use/net-eth/dhcp use/efi/refind use/efi/shell use/rescue/base \
-	use/init/sysv/consolekit
+	mixin/desktop-installer use/install2/fs use/efi/shell use/rescue/base
 	@$(call add,RESCUE_LISTS,$(call tags,rescue misc))
 	@$(call add,MAIN_PACKAGES,anacron man-whatis usb-modeswitch)
-	@$(call add,DEFAULT_SERVICES_ENABLE,alteratord)
 
-distro/regular-icewm: distro/.regular-sysv-gtk +icewm \
-	use/x11/lightdm/slick use/init/sysv/polkit \
-	use/browser/chromium use/fonts/ttf/redhat use/efi/refind
-	@$(call add,LIVE_LISTS,$(call tags,regular icewm))
-	@$(call add,LIVE_PACKAGES,mnt)
+distro/regular-icewm-sysv: distro/.regular-gtk-sysv mixin/regular-icewm \
+	use/browser/chromium
 	@$(call set,KFLAVOURS,un-def)
 
 # wdm can't do autologin so add standalone one for livecd
-distro/regular-wmaker: distro/.regular-sysv \
-	mixin/regular-wmaker use/live/autologin use/browser/palemoon/i18n
+distro/regular-wmaker-sysv: distro/.regular-desktop-sysv \
+	mixin/regular-wmaker use/live/autologin
 	@$(call add,LIVE_PACKAGES,wdm wmxkbru)
 
-distro/regular-gnustep: distro/.regular-sysv \
+distro/regular-gnustep-sysv: distro/.regular-desktop-sysv \
 	mixin/regular-wmaker mixin/regular-gnustep; @:
 distro/regular-gnustep-systemd: distro/.regular-wm +systemd \
 	mixin/regular-wmaker mixin/regular-gnustep; @:
 
-distro/regular-xfce: distro/.regular-gtk mixin/regular-xfce \
-	use/x11/xfce/full use/domain-client
+distro/regular-xfce: distro/.regular-gtk mixin/regular-xfce; @:
 	@$(call set,KFLAVOURS,un-def)
 
-distro/regular-xfce-sysv: distro/.regular-sysv-gtk \
-	mixin/regular-xfce mixin/regular-xfce-sysv; @:
+distro/regular-xfce-sysv: distro/.regular-gtk-sysv mixin/regular-xfce-sysv; @:
 
-distro/regular-lxde: distro/.regular-gtk mixin/regular-lxde
-	@$(call add,THE_PACKAGES,lxde)
+distro/regular-xfce-sysv-install: distro/.regular-install-x11-full \
+	mixin/regular-xfce-sysv use/init/sysv/polkit use/x11/gdm2.20; @:
 
-distro/regular-lxde-sysv: distro/.regular-sysv-gtk mixin/regular-lxde
-	@$(call add,THE_PACKAGES,lxde-sysvinit)
+distro/regular-lxde: distro/.regular-gtk mixin/regular-lxde; @:
 
 distro/regular-xmonad: distro/.regular-gtk use/x11/xmonad
 	@$(call add,LIVE_PACKAGES,livecd-regular-xmonad)
 
-distro/regular-mate: distro/.regular-gtk +nm \
-	use/x11/mate use/fonts/ttf/google use/domain-client
-	@$(call add,LIVE_LISTS,$(call tags,mobile mate))
-	@$(call add,LIVE_LISTS,$(call tags,base smartcard))
+distro/regular-mate: distro/.regular-gtk mixin/regular-mate; @:
 
-distro/regular-mate-sysv: distro/.regular-sysv-gtk use/x11/mate +nm
-	@$(call add,LIVE_LISTS,$(call tags,mobile mate))
+distro/regular-enlightenment: distro/.regular-gtk use/x11/enlightenment +power; @:
 
-distro/regular-enlightenment: distro/.regular-gtk use/x11/enlightenment; @:
-
-distro/regular-enlightenment-sysv: distro/.regular-sysv-gtk \
-	use/x11/enlightenment
-	@$(call set,META_VOL_ID,ALT regular-E-SysV/$(ARCH)) # see also #28271
-
-distro/regular-cinnamon: distro/.regular-gtk use/x11/cinnamon \
-	use/fonts/ttf/google use/net/nm/mmgui use/im
-	@$(call add,THE_PACKAGES,thunderbird-ru)	### l10n
+distro/regular-cinnamon: distro/.regular-gtk mixin/regular-cinnamon; @:
 
 # not .regular-gtk due to gdm vs lightdm
-distro/regular-gnome3: distro/.regular-desktop +plymouth +nm \
-	use/x11/gnome3 use/browser/epiphany use/fonts/ttf/redhat
+distro/regular-gnome3: distro/.regular-desktop mixin/regular-gnome3 +plymouth
 	@$(call set,KFLAVOURS,un-def)
 	@$(call add,LIVE_PACKAGES,livecd-gnome3-setup-done)
-	@$(call add,LIVE_PACKAGES,gnome3-regular xcalib templates)
 	@$(call add,LIVE_PACKAGES,gnome-flashback screenpen)
-	@$(call add,DEFAULT_SERVICES_ENABLE,gdm)
 
-distro/regular-tde: distro/.regular-desktop mixin/regular-tde +plymouth \
-	use/x11/gtk/nm use/net/nm/mmgui
+distro/regular-lxqt: distro/.regular-gtk mixin/regular-lxqt +plymouth \
+	use/browser/falkon
+	@$(call add,THE_LISTS,$(call tags,lxqt desktop))
 
-distro/regular-tde-sysv: distro/.regular-sysv mixin/regular-tde \
-	use/net-eth/dhcp use/efi/refind; @:
+distro/regular-kde5: distro/.regular-desktop \
+	mixin/regular-kde5 use/domain-client use/x11/sddm +plymouth; @:
 
-distro/regular-kde4: distro/.regular-desktop use/x11/kde4/nm use/x11/kdm4 \
-	use/browser/falkon use/fonts/zerg use/domain-client \
-	use/net/nm/mmgui +pulse +plymouth
-	@$(call add,THE_LISTS,$(call tags,regular kde4))
-	@$(call add,THE_PACKAGES,fonts-ttf-levien-inconsolata)
-	@$(call set,THE_IMAGEWRITER,rosa-imagewriter)
-	@$(call add,DEFAULT_SERVICES_ENABLE,prefdm)
-
-distro/regular-lxqt: distro/.regular-desktop mixin/regular-lxqt; @:
-
-distro/regular-lxqt-sysv: distro/.regular-sysv mixin/regular-lxqt \
-	use/net-eth/dhcp use/efi/refind; @:
-
-distro/regular-kde5: distro/.regular-desktop use/browser/falkon \
-	use/x11/kde5 use/x11/sddm use/domain-client \
-	use/fonts/ttf/google use/fonts/ttf/redhat use/fonts/zerg \
-	+nm +pulse +plymouth
-	@$(call add,THE_PACKAGES,kde5-telepathy falkon-kde5)
-	@$(call set,THE_IMAGEWRITER,rosa-imagewriter)
+distro/regular-robo: distro/regular-mate +robotics use/live/ru; @:
 
 distro/regular-rescue: distro/.regular-base mixin/regular-rescue  \
 	use/rescue/rw use/efi/refind use/efi/shell use/efi/memtest86 \
 	use/hdt use/syslinux/rescue_fm.cfg use/syslinux/rescue_remote.cfg \
-	use/mediacheck +wireless
+	use/grub/rescue_fm.cfg use/grub/rescue_remote.cfg \
+	use/mediacheck use/stage2/kms +wireless
 	@$(call set,KFLAVOURS,un-def)
 	@$(call add,RESCUE_PACKAGES,gpm livecd-net-eth)
 	@$(call add,RESCUE_LISTS,$(call tags,base bench))
@@ -209,32 +173,20 @@ distro/regular-rescue-netbootxyz: distro/.regular-bare mixin/regular-rescue
 	@$(call set,META_VOL_ID,ALT Rescue)
 	@$(call set,META_APP_ID,$(ARCH))
 
-distro/regular-sysv-tde: distro/.regular-install-x11-full mixin/regular-tde
-	@$(call add,THE_LISTS,$(call tags,base desktop))
-	@$(call add,THE_LISTS,$(call tags,regular tde))
-	@$(call add,THE_PACKAGES,kpowersave)
-
-distro/regular-sysv-xfce: distro/.regular-install-x11-full \
-	mixin/regular-xfce mixin/regular-xfce-sysv
-	@$(call add,THE_PACKAGES,nload)
-	@$(call add,MAIN_PACKAGES,caffeine-ng sysstat leafpad)
-
-distro/.regular-server-base: distro/.regular-install \
-	use/server/base use/stage2/kms
+distro/.regular-server-base: distro/.regular-install use/server/base
 	@$(call add,THE_LISTS,$(call tags,server && (regular || network)))
 	@$(call set,INSTALLER,altlinux-server)
 	@$(call add,SYSTEM_PACKAGES,multipath-tools)
 	@$(call add,INSTALL2_PACKAGES,installer-feature-multipath)
 
-distro/.regular-server-systemd: distro/.regular-server-base +systemd; @:
-
 distro/.regular-server: distro/.regular-server-base \
 	use/server/mini use/firmware/qlogic use/rescue/base \
-	use/ntp/client use/cleanup/libs
+	use/ntp/chrony use/cleanup/libs use/bootloader/grub +efi
 	@$(call add,RESCUE_LISTS,$(call tags,rescue misc))
 	@$(call add,MAIN_PACKAGES,aptitude)
-	@$(call add,CLEANUP_PACKAGES,qt4-common)
+	@$(call add,CLEANUP_PACKAGES,qt4-common qt5-base-common)
 	@$(call add,DEFAULT_SERVICES_DISABLE,bridge)
+	@$(call add,DEFAULT_SERVICES_ENABLE,getty@tty1)
 
 distro/.regular-server-managed: distro/.regular-server
 	@$(call add,THE_PACKAGES,alterator-fbi)
@@ -242,34 +194,32 @@ distro/.regular-server-managed: distro/.regular-server
 	@$(call add,INSTALL2_PACKAGES,ntfs-3g)
 	@$(call add,DEFAULT_SERVICES_DISABLE,ahttpd alteratord)
 
-distro/regular-server: distro/.regular-server-managed \
+distro/.regular-server-full: distro/.regular-server-managed \
 	use/server/groups/base use/dev/groups/builder use/install2/vnc/full
 	@$(call add,MAIN_GROUPS,server/sambaDC)
 	@$(call add,MAIN_GROUPS,tools/hyperv)
+	@$(call add,BASE_KMODULES,staging)
 
-distro/regular-server-ovz: distro/.regular-server \
+distro/regular-server-systemd: distro/.regular-server-full \
+	+systemd +systemd-optimal; @:
+
+distro/regular-server-sysv: distro/.regular-server-full +sysvinit; @:
+
+distro/.regular-server-ovz: distro/.regular-server \
 	use/server/ovz use/server/groups/tools use/cleanup/x11-alterator
 	@$(call add,MAIN_GROUPS,tools/vzstats)
 
-distro/regular-server-hyperv: distro/.regular-server-managed
+distro/regular-server-ovz: distro/.regular-server-ovz +systemd; @:
+distro/regular-server-ovz-sysv: distro/.regular-server-ovz +sysvinit; @:
+
+distro/.regular-server-hyperv: distro/.regular-server-managed +systemd
 	@$(call set,KFLAVOURS,un-def)
 	@$(call add,THE_PACKAGES,hyperv-daemons)
 	@$(call add,DEFAULT_SERVICES_DISABLE,bridge smartd)
 	@$(call add,DEFAULT_SERVICES_DISABLE,cpufreq-simple powertop)
 
-distro/.regular-server-openstack: distro/.regular-server-base \
-	use/firmware/qlogic use/server/groups/openstack
-	@$(call add,MAIN_GROUPS,tools/ipmi tools/monitoring)
-
-distro/regular-server-openstack: distro/.regular-server-openstack +systemd; @:
-	@$(call add,THE_PACKAGES,dhcpcd)
-
-distro/regular-server-openstack-sysv: distro/.regular-server-openstack +sysvinit
-	@$(call add,DEFAULT_SERVICES_DISABLE,lvm2-lvmetad)
-
-distro/regular-server-pve: distro/.regular-server-systemd \
-	use/kernel/server use/firmware/qlogic +efi
-	@$(call set,BASE_BOOTLOADER,grub)
+distro/regular-server-pve: distro/.regular-server-base +systemd \
+	use/kernel/server use/firmware/qlogic
 	@$(call set,INSTALLER,altlinux-server)
 	@$(call add,INSTALL2_PACKAGES,installer-feature-pve)
 	@$(call add,THE_PACKAGES,pve-manager nfs-clients su)
@@ -278,31 +228,38 @@ distro/regular-server-pve: distro/.regular-server-systemd \
 		pve-firewall pve-ha-crm pve-manager pveproxy pvedaemon \
 		pvefw-logger pve-ha-lrm pvenetcommit pvestatd spiceproxy)
 
-distro/regular-builder: distro/.regular-bare \
-	use/dev/builder/full +sysvinit +efi +power \
+distro/regular-builder: distro/.regular-bare mixin/regular-builder \
+	use/dev/builder/full use/stage2/kms +sysvinit +efi +power \
 	use/live/base use/live/rw use/live/repo/online use/live/textinstall \
-	use/isohybrid use/syslinux/timeout/30 \
-	use/stage2/net-eth use/net-eth/dhcp
-	@$(call add,LIVE_PACKAGES,cifs-utils elinks lftp openssh wget)
-	@$(call add,LIVE_PACKAGES,bash-completion gpm screen tmux zsh)
-	@$(call add,LIVE_PACKAGES,ccache rpm-utils wodim)
-	@$(call add,DEFAULT_SERVICES_ENABLE,gpm)
+	use/isohybrid use/syslinux/timeout/30 use/grub/timeout/30 use/stage2/net-eth
+	@$(call add,THE_PACKAGES,ccache cifs-utils wodim)
 
-distro/regular-server-samba4: distro/.regular-server-managed
+distro/regular-server-samba4: distro/.regular-server-managed +systemd
 	@$(call add,THE_LISTS,$(call tags,server && (sambaDC || alterator)))
 	@$(call add,THE_PACKAGES,alterator-dhcp)
 	@$(call add,DEFAULT_SERVICES_DISABLE,smbd nmbd winbind)
 
+distro/regular-server-lxd: distro/.regular-bare \
+	use/isohybrid +power \
+	use/live/base use/live/rw use/live/repo/online use/live/textinstall \
+	use/lxc/lxd use/tty/S0 \
+	use/init/systemd/multiuser
+	@$(call set,KFLAVOURS,un-def)
+	@$(call add,DEFAULT_SERVICES_ENABLE,sshd)
+	@$(call add,DEFAULT_SERVICES_ENABLE,lxd-startup lxd-bridge lxcfs cgmanager)
+	@$(call add,DEFAULT_SERVICES_ENABLE,getty@tty1 getty@ttyS0)
+	@$(call add,DEFAULT_SERVICES_ENABLE,livecd-net-eth)
+
 distro/regular-engineering: distro/regular-lxde use/live/ru
-	@$(call add,THE_LISTS,$(call tags,engineering desktop))
-	@$(call add,THE_LISTS,$(call tags,desktop sane))
-	@$(call add,THE_LISTS,$(call tags,cups desktop))
-	@$(call add,THE_PACKAGES,libreofficekit LibreOffice-gnome LibreOffice-langpack-ru)
-	@$(call add,THE_PACKAGES,LibreOffice-mimetypes java)
-	@$(call add,THE_PACKAGES,gnome-disk-utility)
-	@$(call add,THE_KMODULES,staging)
-	@$(call add,DEFAULT_SERVICES_ENABLE,cups)
-	@$(call add,DEFAULT_SERVICES_ENABLE,ModemManager)
+	@$(call add,THE_LISTS,engineering/2d-cad)
+	@$(call add,THE_LISTS,engineering/3d-cad)
+	@$(call add,THE_LISTS,engineering/3d-printer)
+	@$(call add,THE_LISTS,engineering/eda)
+	@$(call add,THE_LISTS,engineering/cam)
+	@$(call add,THE_LISTS,engineering/cnc)
+	@$(call add,THE_LISTS,engineering/apcs)
+	@$(call add,THE_LISTS,engineering/scada)
+	@$(call add,THE_LISTS,engineering/misc)
 
 endif
 

conf.d/server-v.mk

@@ -0,0 +1,151 @@
+# server distributions
+ifeq (distro,$(IMAGE_CLASS))
+
+distro/server-v: cockpit = $(addprefix server-v/cockpit/,\
+	docker kvm web)
+
+distro/server-v: ceph = $(addprefix server-v/ceph/,\
+	client mgr mon osd radosgw)
+
+distro/server-v: glusterfs = $(addprefix server-v/glusterfs/,\
+	client server)
+
+distro/server-v: iscsi = $(addprefix server-v/iscsi/,\
+	initiator  scsitarget  targetcli)
+
+distro/server-v: moosefs = $(addprefix server-v/moosefs/,\
+	cgiserv chunkserver client master metalogger)
+
+distro/server-v: lizardfs = $(addprefix server-v/lizardfs/,\
+	cgiserv chunkserver client master metalogger)
+
+distro/server-v: linstor = $(addprefix server-v/linstor/,\
+	client controller satellite opennebula-addon)
+
+distro/server-v: nfs = $(addprefix server-v/,\
+	nfs nfs-ganesha)
+
+distro/server-v: opennebula = $(addprefix server-v/opennebula/,\
+	flow gate gui node-kvm node-lxd server)
+
+distro/server-v: openstack = $(addprefix server-v/openstack/,\
+	block compute controller network)
+# storage
+
+distro/server-v: container = $(addprefix server-v/,\
+	docker kubernetes podman lxd)
+
+distro/server-v: network = $(addprefix server-v/,\
+	apache2 nginx bird dhcp dns haproxy keepalived openvswitch freeipa-client)
+
+distro/server-v: monitoring = $(addprefix server-v/,\
+	zabbix-agent telegraf prometheus-node_exporter monit collectd nagios-nrpe)
+# zabbix prometheus influxdb grafana
+
+distro/server-v: backup = $(addprefix server-v/,\
+	bacula urbackup-client)
+
+distro/server-v: logging = $(addprefix server-v/,\
+	rsyslog-classic systemd-journal-remote)
+
+distro/server-v: profiles = $(addprefix server-v/,\
+	111-opennebula-node 112-opennebula-server 140-basic 201-docker)
+#121-openstack-node 122-openstack-controller 
+
+ifeq (,$(filter-out x86_64 aarch64,$(ARCH)))
+distro/server-v: profiles_arch = $(addprefix server-v/,\
+	130-pve)
+# 211-openvz
+endif
+
+distro/.server-v-base: distro/.base distro/.installer \
+	use/efi/shell use/efi/grub +efi \
+	use/memtest use/rescue/base \
+	+systemd-optimal \
+	use/services use/control \
+	use/l10n/default/ru_RU \
+	use/isohybrid \
+	use/install2/vnc/full \
+	use/install2/xfs use/install2/fat use/install2/stage3 \
+	use/kernel/server use/kernel/drm \
+	use/firmware use/firmware/cpu \
+	use/net/etcnet use/net-ssh \
+	use/stage2/fs use/stage2/hid use/stage2/md \
+	use/stage2/mmc use/stage2/net use/stage2/net-nfs \
+	use/stage2/rtc use/stage2/scsi use/stage2/usb \
+	use/stage2/kms \
+	use/server/virt use/docs/license
+	@$(call add,BASE_LISTS,server-base openssh)
+	@$(call add,EFI_BOOTARGS,lang=ru_RU)
+	@$(call set,BRANDING,alt-server-v)
+	@$(call set,INSTALLER,alt-server-v)
+	@$(call add,INSTALL2_PACKAGES,alterator-notes)
+	@$(call add,INSTALL2_PACKAGES,installer-feature-multipath)
+	@$(call add,INSTALL2_PACKAGES,installer-feature-server-raid-fixup-stage2)
+	@$(call add,INSTALL2_PACKAGES,installer-feature-quota-stage2)
+	@$(call add,INSTALL2_PACKAGES,fonts-ttf-google-croscore-arimo)
+	@$(call add,INSTALL2_PACKAGES,ntfs-3g)
+	@$(call add,INSTALL2_BRANDING,bootloader bootsplash notes slideshow)
+	@$(call add,THE_BRANDING,alterator graphics)
+	@$(call add,THE_BRANDING,indexhtml slideshow)
+	@$(call add,THE_PACKAGES,alterator-fbi alterator-notes)
+	@$(call add,THE_LISTS,$(call tags,basesystem alterator))
+	@$(call add,THE_LISTS,$(call tags,server alterator))
+	@$(call add,THE_LISTS,$(call tags,server network))
+	@$(call add,COMMON_PACKAGES,vim-console)
+	@$(call add,SYSTEM_PACKAGES,mdadm-tool lvm2 multipath-tools fdisk xfsprogs btrfs-progs file)
+
+distro/server-v: distro/.server-v-base +installer \
+	use/ntp/chrony \
+	use/install2/net use/install2/autoinstall \
+	use/apt-conf/branch use/install2/repo
+	@$(call add,RESCUE_BOOTARGS,nomodeset vga=0)
+	@$(call set,IMAGE_FLAVOUR,$(subst alt-9-,,$(IMAGE_NAME)))
+	@$(call set,META_VOL_ID,ALT Server-V 9.1.0 $(ARCH))
+	@$(call set,META_PUBLISHER,BaseALT Ltd)
+	@$(call set,META_VOL_SET,ALT)
+	@$(call set,META_APP_ID,ALT Server-V 9.1.0 $(ARCH) $(shell date +%F))
+	@$(call set,DOCS,alt-server-v)
+	@$(call add,BASE_LISTS,virt/base.pkgs)
+	@$(call add,MAIN_LISTS,virt/extra.pkgs)
+	@$(call add,MAIN_GROUPS,server-v/110-opennebula $(opennebula))
+ifeq (,$(filter-out x86_64 aarch64,$(ARCH)))
+	@$(call add,MAIN_GROUPS,server-v/130-pve server-v/pve server-v/linstor/pve-storage)
+endif
+	@$(call add,MAIN_GROUPS,server-v/140-basic server-v/kvm)
+	@$(call add,MAIN_GROUPS,server-v/200-container $(container))
+	@$(call add,MAIN_GROUPS,server-v/300-cluster server-v/corosync_pacemaker)
+	@$(call add,MAIN_GROUPS,server-v/400-storage)
+	@$(call add,MAIN_GROUPS,server-v/410-ceph $(ceph))
+	@$(call add,MAIN_GROUPS,server-v/420-glusterfs $(glusterfs))
+	@$(call add,MAIN_GROUPS,server-v/450-nfs $(nfs))
+	@$(call add,MAIN_GROUPS,server-v/460-iscsi $(iscsi))
+	@$(call add,MAIN_GROUPS,server-v/470-linstor $(linstor))
+	@$(call add,MAIN_GROUPS,server-v/500-network $(network))
+	@$(call add,MAIN_GROUPS,server-v/600-monitoring $(monitoring))
+	@$(call add,MAIN_GROUPS,server-v/700-backup $(backup))
+	@$(call add,MAIN_GROUPS,server-v/800-logging $(logging))
+	@$(call add,THE_PROFILES,$(profiles) $(profiles_arch) minimal)
+	@$(call add,DEFAULT_SERVICES_ENABLE,getty@tty1 getty@ttyS0)
+	@$(call add,DEFAULT_SERVICES_ENABLE,fstrim.timer)
+	@$(call add,DEFAULT_SERVICES_ENABLE,libvirtd)
+	@$(call add,DEFAULT_SERVICES_ENABLE,docker lxd)
+	@$(call add,DEFAULT_SERVICES_ENABLE,bind mysqld openvswitch)
+	@$(call add,DEFAULT_SERVICES_ENABLE,rsyslogd systemd-journal-gatewayd)
+	@$(call add,DEFAULT_SERVICES_DISABLE,powertop bridge gpm)
+	@$(call add,DEFAULT_SERVICES_DISABLE,consolesaver)
+	@$(call add,DEFAULT_SERVICES_DISABLE,ahttpd alteratord)
+	@$(call add,DEFAULT_SERVICES_DISABLE,systemd-networkd systemd-resolved)
+	@$(call add,DEFAULT_SERVICES_ENABLE,pve-manager pve-cluster pveproxy pvedaemon pvestatd \
+		pve-firewall pvefw-logger pve-guests pve-ha-crm pve-ha-lrm spiceproxy \
+		lxc lxcfs lxc-net lxc-monitord)
+
+#	@$(call add,MAIN_GROUPS,server-v/141-cockpit $(cockpit))
+#	@$(call add,MAIN_GROUPS,server-v/430-moosefs $(moosefs))
+#	@$(call add,MAIN_GROUPS,server-v/ocfs2)
+#	@$(call add,MAIN_GROUPS,server-v/120-openstack $(openstack))
+#ifeq (,$(filter-out x86_64,$(ARCH)))
+#	@$(call add,MAIN_GROUPS,server-v/openvz)
+#endif
+
+endif

conf.d/simply.mk

@@ -1,12 +0,0 @@
-# simply images
-
-ifeq (distro,$(IMAGE_CLASS))
-
-distro/live-simply: distro/.livecd-install use/slinux/full
-	@$(call add,THE_LISTS,slinux/live-install slinux/live)
-
-distro/simply: distro/.installer use/slinux/full
-	@$(call set,INSTALLER,simply-linux)
-	@$(call add,INSTALL2_PACKAGES,sysvinit)
-
-endif

conf.d/slinux.mk

@@ -0,0 +1,29 @@
+# Simply Linux images
+
+ifeq (distro,$(IMAGE_CLASS))
+
+distro/slinux-live: distro/.livecd-install use/slinux/base
+	@$(call add,THE_LISTS,slinux/live-install)
+	@$(call set,META_VOL_ID,Simply Linux live $(DISTRO_VERSION) $(ARCH))
+	@$(call set,META_APP_ID,Simply Linux live $(DISTRO_VERSION) $(ARCH) $(shell date +%F))
+
+distro/slinux: distro/.installer use/slinux/full use/rescue/base
+	@$(call set,INSTALLER,simply-linux)
+	@$(call add,MAIN_GROUPS,slinux/dropbox slinux/emulators-full slinux/games-base slinux/games slinux/games-full slinux/graphics-base slinux/graphics slinux/graphics-full-inkscape slinux/graphics-full-shotwell slinux/multimedia-full-audacity slinux/multimedia-base slinux/multimedia-full-cheese slinux/multimedia slinux/multimedia-full-shotcut slinux/multimedia-full-sound-juicer slinux/net-base)
+	@$(call set,META_VOL_ID,Simply Linux $(DISTRO_VERSION) $(ARCH))
+	@$(call set,META_APP_ID,Simply Linux $(DISTRO_VERSION) $(ARCH) $(shell date +%F))
+ifeq (aarch64,$(ARCH))
+	@$(call set,KFLAVOURS,lts std-def)
+endif
+endif
+
+ifeq (vm,$(IMAGE_CLASS))
+ifeq (,$(filter-out aarch64 armh,$(ARCH)))
+vm/slinux: use/slinux/vm-base use/slinux/arm-base; @:
+
+vm/slinux-tegra: use/slinux/vm-base use/slinux/arm-base \
+	use/aarch64-tegra; @:
+else
+vm/slinux: use/slinux/vm-base use/build-vm; @:
+endif
+endif

conf.d/ve.mk

@@ -14,7 +14,8 @@ ve/ldv: ve/bare use/control/server/ldv
 	@$(call add,BASE_PACKAGES,openssh-blacklist openssh-server)
 	@$(call add,BASE_PACKAGES,shadow-edit shadow-groups)
 
-ve/docker: ve/.base use/repo; @:
+ve/docker: ve/.apt use/repo
+	@$(call add,BASE_PACKAGES,iproute2)
 
 # build environment
 ve/builder: ve/base use/dev/builder/base use/repo
@@ -36,8 +37,18 @@ ve/pgsql94: ve/generic
 ve/samba-DC: ve/generic
 	@$(call add,BASE_PACKAGES,task-samba-dc glibc-locales net-tools)
 
-ve/systemd-bare: ve/.base use/net/networkd +systemd \
+ve/sysvinit-etcnet: ve/base use/net/etcnet \
+        use/control/sudo-su use/repo use/net-ssh
+	@$(call add,BASE_PACKAGES,glibc-gconv-modules glibc-locales tzdata bash-completion iptables curl)
+
+ve/systemd-bare: ve/.apt +systemd \
 	use/control/sudo-su use/repo use/net-ssh
 	@$(call add,BASE_PACKAGES,interactivesystem su)
 
+ve/systemd-networkd: ve/systemd-bare use/net/networkd
+	@$(call add,BASE_PACKAGES,glibc-gconv-modules glibc-locales tzdata bash-completion iptables curl)
+
+ve/systemd-etcnet: ve/systemd-bare use/net/etcnet
+	@$(call add,BASE_PACKAGES,glibc-gconv-modules glibc-locales tzdata bash-completion iptables curl)
+
 endif

conf.d/vm.mk

@@ -2,10 +2,19 @@
 ifeq (vm,$(IMAGE_CLASS))
 
 # NB: interactivesystem pulls in network-config-subsystem anyways
+ifeq (,$(filter-out i586 x86_64,$(ARCH)))
+vm/bare: vm/.base-lilo +sysvinit
+else
 vm/bare: vm/.bare +sysvinit
+endif
 	@$(call add,BASE_PACKAGES,apt)
 
+ifeq (,$(filter-out i586 x86_64 ppc64le,$(ARCH)))
+vm/systemd: vm/.base-grub +systemd
+else
 vm/systemd: vm/.bare +systemd
+endif
+	@$(call add,BASE_PACKAGES,glibc-gconv-modules glibc-locales tzdata)
 	@$(call add,BASE_PACKAGES,apt)
 
 # handle ROOTPW (through deflogin)
@@ -18,7 +27,7 @@ vm/systemd-net: vm/systemd use/net-eth/networkd-dhcp use/net-ssh \
 	@$(call add,BASE_PACKAGES,su)
 
 # vm/net or vm/systemd-net
-vm/cloud-systemd: vm/systemd-net mixin/cloud-init use/vmguest/kvm
+vm/cloud-systemd: vm/systemd-net mixin/cloud-init use/vmguest/kvm use/tty/S0
 	@$(call add,DEFAULT_SERVICES_DISABLE,consolesaver)
 
 vm/cloud-sysv: vm/net mixin/cloud-init use/vmguest/kvm use/power/acpi/button; @:

doc/archdep.txt

@@ -44,6 +44,9 @@
 
   haspd@IA32
 
+С версии 1.3.15 поддерживается макрос E2K ("любое поколение e2k*"),
+а также выборка "для любой архитектуры, кроме" (например, @!E2K).
+
 Для преобразования можно воспользоваться следующей командой:
 
   sed -r -e 's/@I586_ONLY@([^\t ]+)/\1@i586/g' \

doc/params.txt

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

features.in/aarch64-dbm/README

@@ -0,0 +1 @@
+Настраивает систему для загрузки на плате DBM с SoC BE-M1000 (aarch64).

features.in/aarch64-dbm/config.mk

@@ -0,0 +1,11 @@
+ifeq (,$(filter-out aarch64,$(ARCH)))
+use/aarch64-dbm: use/efi/grub use/tty/S0
+	@$(call add_feature)
+	@$(call set,KFLAVOURS,bfkm)
+	@$(call add,BASE_BOOTARGS,video=HDMI-A-1:D fbcon=map:0)
+	@$(call try,DBM_DTB,bm-bfkm)
+	@$(call xport,DBM_DTB)
+
+use/aarch64-dbm/mini-itx: use/aarch64-dbm
+	@$(call set,DBM_DTB,bm-bfkm)
+endif

features.in/aarch64-dbm/image-scripts.d/93-grub2-param-dbm

@@ -0,0 +1,15 @@
+#!/bin/sh -efu
+
+# To load a Linux kernel onto a DBM board using GRUB2,
+# you need specific parameters on the kernel command line
+# and an explicit definition the dtb file to load.
+# This script creates the required settings in the file
+# /etc/sysconfig/grub2
+
+cfgfile="/etc/sysconfig/grub2"
+
+if [ -f "$cfgfile" ]
+then
+	echo "# Configure GRUB2 Special Settings for DBM board" >> "$cfgfile"
+	echo "GRUB_FDT_LINUX=$GLOBAL_DBM_DTB.dtb" >> "$cfgfile"
+fi

features.in/aarch64-dbm/image-scripts.d/98-dbm-startup-nsh

@@ -0,0 +1,20 @@
+#!/bin/sh
+# The tar2fs script writes the contents of the /boot/efi directory
+# to a disk image partition for EFI.
+# Place the scripts executed by EFI Shell in /boot/efi
+
+mkdir -p /boot/efi
+# Script startup.nsh to boot with GRUB2 by default
+cat > /boot/efi/startup.nsh << EOF
+\EFI\BOOT\BOOTAA64.EFI
+
+EOF
+
+# The efidrvext.nsh script can be run manually from the EFI Shell
+# to boot using the ext2, ext3, ext4 driver for EFI
+cat > /boot/efi/efidrvext.nsh << EOF
+load fs0:\efi\drivers\ext2_aa64.efi
+map -r
+FS1:\boot\vmlinuz root=/dev/sda2 ro console=ttyS0,115200 video=HDMI-A-1:D fbcon=map:0 initrd=/boot/initrd.img dtb=/boot/dtb/bm-bfkm.dtb
+
+EOF

features.in/aarch64-dbm/rootfs/files/etc/modules-load.d/snd-dummy.conf

@@ -0,0 +1 @@
+snd-dummy

features.in/aarch64-rpi4/README

@@ -0,0 +1,2 @@
+Настраивает систему для Raspberry Pi 4
+

features.in/aarch64-rpi4/config.mk

@@ -0,0 +1,10 @@
+
+ifeq (,$(filter-out aarch64,$(ARCH)))
+use/aarch64-rpi4: use/bootloader/uboot
+	@$(call add_feature)
+	@$(call set,KFLAVOURS,rpi-def rpi-un)
+	@$(call add,THE_PACKAGES,u-boot-tools)
+	@$(call add,THE_PACKAGES,RPi-audioswitch)
+	@$(call add,THE_PACKAGES,rpi4-boot-switch)
+
+endif

features.in/aarch64-rpi4/image-scripts.d/96-gen-brcmfmac43455

@@ -0,0 +1,3 @@
+#!/bin/sh -efu
+
+sed 's/Raspberry Pi 3 Model B+/Raspberry Pi 4/ ; s/boardflags3=0x48200100/boardflags3=0x44200100/' /lib/firmware/brcm/brcmfmac43455-sdio.raspberrypi,3-model-b-plus.txt > /lib/firmware/brcm/brcmfmac43455-sdio.txt

features.in/aarch64-rpi4/image-scripts.d/97-gen-uboot-env

@@ -0,0 +1,58 @@
+#!/bin/sh -efu
+
+(
+cat << 'EOF'
+arch=arm
+baudrate=115200
+board=rpi
+board_name=4 Model B
+board_rev=0x11
+board_rev_scheme=1
+board_revision=0xC03111
+boot_a_script=load ${devtype} ${devnum}:${distro_bootpart} ${scriptaddr} ${prefix}${script}; source ${scriptaddr}
+boot_efi_binary=if fdt addr ${fdt_addr_r}; then bootefi bootmgr ${fdt_addr_r};else bootefi bootmgr ${fdtcontroladdr};fi;load ${devtype} ${devnum}:${distro_bootpart} ${kernel_addr_r} efi/boot/bootaa64.efi; if fdt addr ${fdt_addr_r}; then bootefi ${kernel_addr_r} ${fdt_addr_r};else bootefi ${kernel_addr_r} ${fdtcontroladdr};fi
+boot_extlinux=sysboot ${devtype} ${devnum}:${distro_bootpart} any ${scriptaddr} ${prefix}${boot_syslinux_conf}
+boot_prefixes=/ /boot/
+boot_script_dhcp=boot.scr.uimg
+boot_scripts=boot.scr.uimg boot.scr
+boot_syslinux_conf=extlinux/extlinux.conf
+boot_targets=mmc0 mmc1 pxe dhcp 
+bootcmd=run distro_bootcmd
+bootcmd_dhcp=if dhcp ${scriptaddr} ${boot_script_dhcp}; then source ${scriptaddr}; fi;setenv efi_fdtfile ${fdtfile}; setenv efi_old_vci ${bootp_vci};setenv efi_old_arch ${bootp_arch};setenv bootp_vci PXEClient:Arch:00011:UNDI:003000;setenv bootp_arch 0xb;if dhcp ${kernel_addr_r}; then tftpboot ${fdt_addr_r} dtb/${efi_fdtfile};if fdt addr ${fdt_addr_r}; then bootefi ${kernel_addr_r} ${fdt_addr_r}; else bootefi ${kernel_addr_r} ${fdtcontroladdr};fi;fi;setenv bootp_vci ${efi_old_vci};setenv bootp_arch ${efi_old_arch};setenv efi_fdtfile;setenv efi_old_arch;setenv efi_old_vci;
+bootcmd_mmc0=devnum=0; run mmc_boot
+bootcmd_mmc1=devnum=1; run mmc_boot
+bootcmd_pxe=dhcp; if pxe get; then pxe boot; fi
+bootdelay=2
+cpu=armv8
+dhcpuboot=usb start; dhcp u-boot.uimg; bootm
+distro_bootcmd=for target in ${boot_targets}; do run bootcmd_${target}; done
+efi_dtb_prefixes=/ /dtb/ /dtb/current/
+ethaddr=dc:a6:32:1a:86:f4
+fdt_addr=6000000
+fdt_addr_r=0x06000000
+fdt_high=ffffffffffffffff
+fdtcontroladdr=3af59a70
+fdtfile=bcm2711-rpi-4-b.dtb
+initrd_high=ffffffffffffffff
+kernel_addr_r=0x00080000
+load_efi_dtb=load ${devtype} ${devnum}:${distro_bootpart} ${fdt_addr_r} ${prefix}${efi_fdtfile}
+loadaddr=0x00200000
+mmc_boot=if mmc dev ${devnum}; then devtype=mmc; run scan_dev_for_boot_part; fi
+pxefile_addr_r=0x02500000
+ramdisk_addr_r=0x06100000
+scan_dev_for_boot=echo Scanning ${devtype} ${devnum}:${distro_bootpart}...; for prefix in ${boot_prefixes}; do run scan_dev_for_extlinux; run scan_dev_for_scripts; done;run scan_dev_for_efi;
+scan_dev_for_boot_part=part list ${devtype} ${devnum} -bootable devplist; env exists devplist || setenv devplist 1; for distro_bootpart in ${devplist}; do if fstype ${devtype} ${devnum}:${distro_bootpart} bootfstype; then run scan_dev_for_boot; fi; done; setenv devplist
+scan_dev_for_efi=setenv efi_fdtfile ${fdtfile}; for prefix in ${efi_dtb_prefixes}; do if test -e ${devtype} ${devnum}:${distro_bootpart} ${prefix}${efi_fdtfile}; then run load_efi_dtb; fi;done;if test -e ${devtype} ${devnum}:${distro_bootpart} efi/boot/bootaa64.efi; then echo Found EFI removable media binary efi/boot/bootaa64.efi; run boot_efi_binary; echo EFI LOAD FAILED: continuing...; fi; setenv efi_fdtfile
+scan_dev_for_extlinux=if test -e ${devtype} ${devnum}:${distro_bootpart} ${prefix}${boot_syslinux_conf}; then echo Found ${prefix}${boot_syslinux_conf}; run boot_extlinux; echo SCRIPT FAILED: continuing...; fi
+scan_dev_for_scripts=for script in ${boot_scripts}; do if test -e ${devtype} ${devnum}:${distro_bootpart} ${prefix}${script}; then echo Found U-Boot script ${prefix}${script}; run boot_a_script; echo SCRIPT FAILED: continuing...; fi; done
+scriptaddr=0x02400000
+serial#=100000000a137b9c
+soc=bcm283x
+stderr=serial,vidconsole
+stdin=serial,usbkbd
+stdout=serial,vidconsole
+usbethaddr=dc:a6:32:1a:86:f4
+vendor=raspberrypi
+
+EOF
+) | mkenvimage -s 16384 -o /usr/share/u-boot/rpi_4/uboot.env -

features.in/aarch64-tegra/README

@@ -0,0 +1,2 @@
+Настраивает систему для загрузки на компьютерах с SoC tegra (aarch64).
+Пока поддерживается только Jetson Nano.

features.in/aarch64-tegra/config.mk

@@ -0,0 +1,6 @@
+
+ifeq (,$(filter-out aarch64,$(ARCH)))
+use/aarch64-tegra: use/bootloader/uboot
+	@$(call add_feature)
+	@$(call set,KFLAVOURS,tegra)
+endif

features.in/aarch64-tegra/image-scripts.d/98-tegra-extlinux-conf

@@ -0,0 +1,17 @@
+#!/bin/sh
+
+# Rewrite extlinux.conf
+mkdir -p /boot/extlinux
+cat > /boot/extlinux/extlinux.conf << EOF
+menu title ALT Boot Options
+
+default linux
+timeout 20
+
+append ${cbootargs} rootfstype=ext4 root=LABEL=ROOT rw rootwait console=tty1
+
+label linux
+	menu label linux
+	linux /boot/vmlinuz
+	initrd /boot/initrd.img
+EOF

features.in/aarch64-tegra/image-scripts.d/99-tegra-initrd-conf

@@ -0,0 +1,4 @@
+#!/bin/sh
+
+echo 'PUT_FILES += /lib/firmware/tegra21x_xusb_firmware' \
+  >> /etc/initrd.mk

features.in/armh-mcom02/README

@@ -0,0 +1,2 @@
+Фича предназначена для обеспечения поддержки процессорного модуля
+"ЭЛВИС Салют ЭЛ24ПМ2".  Подробнее: http://altlinux.org/mcom02

features.in/armh-mcom02/config.mk

@@ -0,0 +1,14 @@
+
+ifeq (,$(filter-out armh,$(ARCH)))
+use/armh-mcom02: use/bootloader/uboot use/tty/S0 use/no-sleep
+	@$(call add_feature)
+	@$(call set,KFLAVOURS,mcom02)
+	@$(call add,THE_PACKAGES,u-boot-mcom02-firmware-tools u-boot-mcom02)
+
+use/armh-mcom02/x11: use/armh-mcom02
+	@$(call add,THE_PACKAGES,xorg-drv-fbturbo)
+
+use/armh-mcom02/mali: use/armh-mcom02/x11
+	@$(call add,THE_KMODULES,mali)
+	@$(call add,THE_PACKAGES,libmali-mcom02)
+endif

features.in/armh-mcom02/image-scripts.d/01-uboot-prepare

@@ -0,0 +1,15 @@
+#!/bin/sh
+
+# Rewrite extlinux.conf
+mkdir -p /boot/extlinux
+cat > /boot/extlinux/extlinux.conf << EOF
+menu title ALT Boot Options
+
+default linux
+timeout 20
+
+label linux
+	kernel /boot/vmlinuz
+	initrd /boot/initrd.img
+	append root=LABEL=ROOT ro console=ttyS0,115200 video=HDMI:1920x1080
+EOF

features.in/armh-mcom02/image-scripts.d/50-alsa-set-initial-options-ports

@@ -0,0 +1,5 @@
+#!/bin/sh -efu
+
+[ "$GLOBAL_ARCH" = armh ] && sed -i '/snd-seq-midi/d' /etc/firsttime.d/alsa-set-initial-options
+
+exit 0

features.in/armh-mcom02/image-scripts.d/90-fbturbo

@@ -0,0 +1,13 @@
+#!/bin/sh -x
+
+[ -d /etc/X11/xorg.conf.d ] || exit 0
+cat > /etc/X11/xorg.conf.d/10-monitor.conf << EOF
+Section "Monitor"
+    Identifier "Monitor0"
+EndSection
+
+Section "Device"
+    Identifier "Card0"
+    Driver "fbturbo"
+EndSection
+EOF

features.in/armh-mcom02/image-scripts.d/99-extlinux-conf-fix

@@ -0,0 +1,4 @@
+#!/bin/sh
+
+# Drop fdtdir PATH
+sed -i '/fdtdir/d' /boot/extlinux/extlinux.conf

features.in/bootloader/README

@@ -1,9 +1,12 @@
 Добавление установки загрузчика основной системы, затребованного
-посредством указания "grub" или "lilo" в BASE_BOOTLOADER.
+посредством указания "grub", "lilo" или "uboot" в BASE_BOOTLOADER.
 
 Соответствующий модуль alterator добавляется в устанавливаемую
 систему (он НЕ должен требоваться пакету installer-distro-*)
-и требует пакет выбранного загрузчика.
+и требует пакет выбранного загрузчика. Так как для uboot такого
+модуля нет и в тоже время uboot не используется в установочных
+дистрибутивах, то установка модуля alterator была ограничена
+целями distro/*, формирующими ISO-образы.
 
 Обратите внимание: в процессе конфигурирования дистрибутива
 "переключение" загрузчика может происходить только в одну сторону

features.in/bootloader/config.mk

@@ -6,19 +6,41 @@
 
 # NB: "mysterious" conflicts if BASE_BOOTLOADER is empty
 
+GRUB_ARCHES := i586 x86_64 aarch64 ppc64le
+
 use/bootloader: use/pkgpriorities
 	@$(call add_feature)
-	@$(call add,BASE_PACKAGES,alterator-$$(BASE_BOOTLOADER))
+	@$(call try,BASE_BOOTLOADER,grub)
+	@$(call xport,BASE_BOOTLOADER)
+	@$(call add,BASE_LISTS,$$(BASE_BOOTLOADER))
+	@$(call xport,BASE_BOOTARGS)
+ifeq (distro,$(IMAGE_CLASS))
+	@$(call add,BASE_PACKAGES,installer-feature-bootloader-$$(BASE_BOOTLOADER))
 	@$(call add,PINNED_PACKAGES,alterator-$$(BASE_BOOTLOADER))
 	@$(call add,PINNED_PACKAGES,installer-bootloader-$$(BASE_BOOTLOADER)-stage2)
+endif
 
-use/bootloader/grub use/bootloader/lilo: use/bootloader/%: use/bootloader
+ifeq (,$(filter-out i586 x86_64,$(ARCH)))
+use/bootloader/lilo: \
+	use/bootloader/%: use/bootloader
 	@$(call set,BASE_BOOTLOADER,$*)
+else
+use/bootloader/lilo: ; @:
+endif
+
+ifeq (,$(filter-out $(GRUB_ARCHES),$(ARCH)))
+use/bootloader/grub: \
+	use/bootloader/%: use/bootloader
+	@$(call set,BASE_BOOTLOADER,$*)
+else
+use/bootloader/grub: ; @:
+endif
+
+use/bootloader/uboot: use/bootloader use/uboot
+	@$(call set,BASE_BOOTLOADER,uboot)
 
 use/bootloader/live: use/bootloader
 	@$(call add,LIVE_PACKAGES,alterator-$$(BASE_BOOTLOADER))
 
 use/bootloader/os-prober: use/bootloader
-ifeq (,$(filter-out i586 x86_64 aarch64,$(ARCH)))
 	@$(call add,BASE_PACKAGES,os-prober)
-endif

features.in/bootloader/rootfs/image-scripts.d/50-bootargs

@@ -0,0 +1,9 @@
+#!/bin/sh -eu
+
+if [ -n "${GLOBAL_BASE_BOOTARGS-}" ]; then
+    if [ -s /etc/sysconfig/grub2 ]; then
+        sed -Ei \
+            "s/(GRUB_CMDLINE_LINUX_DEFAULT=)(.*)(['\"])/\1\2 $GLOBAL_BASE_BOOTARGS\3/" \
+            /etc/sysconfig/grub2
+    fi
+fi

features.in/branding/config.mk

@@ -7,8 +7,8 @@ use/branding/notes: use/branding
 	@$(call add,THE_BRANDING,notes)
 
 # NB: not every distro might have all the branding of its own
-# FIXME: syslinux is x86-specific
-use/branding/full: use/branding/notes use/syslinux/ui/gfxboot
+use/branding/full: use/branding/notes use/syslinux/ui/gfxboot \
+	use/grub/ui/gfxboot
 	@$(call add,THE_BRANDING,alterator bootloader bootsplash graphics)
 	@$(call add,THE_BRANDING,indexhtml slideshow)
 

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

@@ -2,5 +2,8 @@
 
 DOT_BASE += $(call branding,$(THE_BRANDING))
 
+# needed for refind only
+ifeq (,$(filter-out x86_64,$(ARCH)))
 CHROOT_PACKAGES_REGEXP += $(call branding,bootloader)
 CHROOT_PACKAGES += ImageMagick-tools
+endif

features.in/browser/config.mk

@@ -7,21 +7,15 @@ use/browser:
 use/browser/firefox: use/browser
 	@$(call set,THE_BROWSER,firefox$$(FX_FLAVOUR))
 
-use/browser/seamonkey use/browser/palemoon \
+use/browser/seamonkey use/browser/netsurf \
 	use/browser/chromium use/browser/epiphany \
-	use/browser/qupzilla use/browser/falkon \
+	use/browser/falkon use/browser/otter-browser \
 	use/browser/elinks use/browser/links2: \
 	use/browser/%: use/browser
 	@$(call set,THE_BROWSER,$*)
 
-use/browser/konqueror: use/browser
-	@$(call set,THE_BROWSER,kdebase-konqueror)
-
-use/browser/konqueror4: use/browser
-	@$(call set,THE_BROWSER,kde4base-konqueror)
-
 # the complete lack of dependencies is intentional
-use/browser/firefox/esr: use/browser
+use/browser/firefox/esr:
 	@$(call set,FX_FLAVOUR,-esr)
 
 use/browser/firefox/h264: use/browser/firefox
@@ -37,16 +31,9 @@ use/browser/firefox/i18n: use/browser/firefox
 	@$(call add,THE_BROWSER,firefox$$(FX_FLAVOUR)-ru)
 	@$(call add,THE_BROWSER,firefox$$(FX_FLAVOUR)-uk)
 
-# fx29+
-use/browser/firefox/classic: use/browser/firefox
-	@$(call add,THE_BROWSER,firefox-classic_theme_restorer)
-
 use/browser/seamonkey/i18n: use/browser/seamonkey
 	@$(call add,THE_BROWSER,seamonkey-ru)
 
-use/browser/palemoon/i18n: use/browser/palemoon
-	@$(call add,THE_BROWSER,palemoon-ru)
-
 # inherently insecure, NPAPI only
 use/browser/plugin/flash: use/browser
 	@$(call add,THE_PACKAGES,mozilla-plugin-adobe-flash)

features.in/build-distro/README

@@ -9,3 +9,6 @@
 META_SYSTEM_ID, META_PUBLISHER, META_PREPARER, META_APP_ID,
 META_VOL_ID, META_VOL_SET, META_BIBLIO, META_ABSTRACT;
 см. тж. genisoimagerc(5) из пакета genisoimage.
+
+При необходимости задать своё содержимое файла .disk/info,
+который также используется propagator, см. META_DISK_INFO.

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

@@ -32,6 +32,12 @@ endif
 ifeq (,$(filter-out i586 x86_64,$(ARCH)))
 BOOT_TYPE := isolinux
 endif
+ifeq (,$(filter-out aarch64,$(ARCH)))
+BOOT_TYPE := grubaa64boot
+endif
+ifeq (,$(filter-out ppc64le,$(ARCH)))
+BOOT_TYPE := ieee1275boot
+endif
 endif
 
 all: | $(GLOBAL_DEBUG) prep copy-subdirs copy-tree run-scripts pack-image \
@@ -42,7 +48,11 @@ prep: | $(GLOBAL_DEBUG) dot-disk $(WHATEVER)
 # can't use mp-showref which belongs to the metaprofile
 dot-disk:
 	@mkdir -p files/.disk
-	@echo "$(META_VOL_ID) $(DATE_F)" >files/.disk/info
+	@if [ -n "$(META_DISK_INFO)" ]; then \
+		echo "$(META_DISK_INFO)" >files/.disk/info; \
+	else \
+		echo "$(META_VOL_ID) build $(DATE_F)" >files/.disk/info; \
+	fi
 	@echo "$(ARCH)" >files/.disk/arch
 	@echo "$(DATE)" >files/.disk/date
 	@if type -t git >&/dev/null; then \

features.in/build-ve/image-scripts.d/03-services

@@ -8,6 +8,7 @@
 
 [ -x /sbin/chkconfig ] || exit 0
 
-for i in network random syslogd; do chkconfig $i on; done
+chkconfig syslogd on 2>&1
+for i in network random; do chkconfig $i on; done
 for i in fbsetfont netfs rawdevices; do chkconfig $i off; done
 :

features.in/build-vm/README

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

features.in/build-vm/config.mk

@@ -1,3 +1,3 @@
 # hooked from lib/sugar.mk
-use/build-vm: sub/rootfs@/ use/kernel
+use/build-vm: sub/rootfs@/ use/kernel/initrd-setup
 	@$(call add_feature)

features.in/build-vm/image-scripts.d/03-services

@@ -4,6 +4,7 @@
 
 [ -x /sbin/chkconfig ] || exit 0
 
-for i in network random syslogd; do chkconfig $i on; done
+chkconfig syslogd on 2>&1
+for i in network random; do chkconfig $i on; done
 for i in fbsetfont netfs rawdevices; do chkconfig $i off; done
 :

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

@@ -1,6 +0,0 @@
-#!/bin/sh -e
-# we don't need no extra gettys in VMs
-[ -s /etc/inittab ] || exit 0
-# ...except when it's a real disk image, not a VM for sure
-[ `arch` = e2k ] && exit 0
-sed -i 's,^[3-9]\+:[0-9]\+:respawn:/sbin/mingetty.*,#&,' /etc/inittab

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

@@ -1,19 +0,0 @@
-#!/bin/sh
-# predictable file locations make bootloader configuration simple;
-# this script relates to features.in/stage2/stage1/scripts.d/81-make-initfs
-
-kver="$(rpm -qa 'kernel-image*' \
-            --qf '%{installtime} %{version}-%{name}-%{release}\n' \
-        | sort -n \
-        | cut -f 2 -d ' ' \
-        | sed 's/kernel-image-//')"
-
-[ -n "$kver" ] || { echo "** unable to deduce kernel version" >&2; exit 1; }
-
-cd /boot
-echo "$kver" > .origver	# for tar2fs
-
-# NB: e2k kernel builds "image" instead of "vmlinuz"
-[ -f vmlinuz-$kver ] && ln -s vmlinuz-$kver vmlinuz ||:
-ln -s initrd-$kver.img initrd.img	# missing at this stage
-:

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

@@ -0,0 +1,45 @@
+#!/bin/sh
+# predictable file locations make bootloader configuration simple;
+# this script relates to features.in/stage2/stage1/scripts.d/81-make-initfs
+
+[ -n "$GLOBAL_KFLAVOURS" ] ||
+  { echo "** KFLAVOURS is empty" >&2; exit 0; }
+
+kver=
+echo $GLOBAL_KFLAVOURS
+for KFLAVOUR in $GLOBAL_KFLAVOURS; do
+	kver+=" $(rpm -qa 'kernel-image*' \
+		--qf '%{version}-%{name}-%{release}\n' \
+	| grep "$KFLAVOUR" \
+	| sed 's/kernel-image-//')"
+done
+
+[ ! -z "${kver#"${kver%%[! ]*}"}" ] ||
+  { echo "** unable to deduce kernel version" >&2; exit 1; }
+
+cd /boot
+
+if [ -n "$GLOBAL_VM_INITRDFEATURES" ]; then
+	for INITRDFEATURE in $GLOBAL_VM_INITRDFEATURES; do
+		echo "FEATURES += $INITRDFEATURE" >> /etc/initrd.mk
+	done
+fi
+
+for KVER in $kver; do
+	make-initrd -N -k "$KVER" AUTODETECT= \
+	  MODULES_TRY_ADD+="$GLOBAL_VM_INITRDMODULES" \
+	  || { echo "** Error: make-initrd failed" >&2; exit 1; }
+done
+
+case "$GLOBAL_ARCH" in
+e2k)
+	kname=image;;
+*)
+	kname=vmlinuz;;
+esac
+
+rm -f $kname initrd.img
+ln -s $kname-$KVER $kname ||:
+ln -s initrd-$KVER.img initrd.img
+
+:

features.in/build-vm/image-scripts.d/50-fstab

@@ -0,0 +1,4 @@
+#!/bin/sh
+
+grep -qe "[[:space:]]/[[:space:]]" /etc/fstab ||
+  printf "LABEL=ROOT\t/\t$GLOBAL_VM_FSTYPE\tdefaults\t1 1\n" >> /etc/fstab

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

@@ -10,45 +10,89 @@ IMAGE_PACKAGES = $(DOT_BASE) \
 IMAGE_PACKAGES_REGEXP = $(THE_PACKAGES_REGEXP) \
                         $(BASE_PACKAGES_REGEXP)
 
+ifdef EFI_BOOTLOADER
+VM_BOOTLOADER=$(EFI_BOOTLOADER)
+else
+VM_BOOTLOADER=$(BASE_BOOTLOADER)
+endif
+
 # intermediate chroot archive
 VM_TARBALL := $(IMAGE_OUTDIR)/$(IMAGE_NAME).tar
 VM_RAWDISK := $(IMAGE_OUTDIR)/$(IMAGE_NAME).raw
 VM_FSTYPE ?= ext4
 VM_SIZE ?= 0
 
+VM_GZIP_COMMAND ?= gzip
+VM_XZ_COMMAND ?= xz -T0
+
+# tavolga
+RECOVERY_LINE ?= Press ENTER to start
+
 check-sudo:
 	@if ! type -t sudo >&/dev/null; then \
 		echo "** error: sudo not available, see doc/vm.txt" >&2; \
+	fi
+
+check-qemu:
+	@if ! type -t qemu-img >&/dev/null; then \
+		echo "** error: qemu-img not available" >&2; \
 		exit 1; \
 	fi
 
-prepare-image: check-sudo
-	@if [ -x $(MKIMAGE_PREFIX)/bin/tar2fs ]; then \
-		TOPDIR=$(MKIMAGE_PREFIX); \
+tar2fs: check-sudo prepare-tarball-qemu
+	@if [ -x /usr/share/mkimage-profiles/bin/tar2fs ]; then \
+		TOPDIR=/usr/share/mkimage-profiles; \
 	fi; \
-	if ! sudo $(TOPDIR)/bin/tar2fs \
-		"$(VM_TARBALL)" "$(VM_RAWDISK)"  $(VM_SIZE) $(VM_FSTYPE); then \
+	if ! sudo $$TOPDIR/bin/tar2fs \
+		"$(VM_TARBALL)" "$(VM_RAWDISK)" "$(VM_SIZE)" "$(VM_FSTYPE)" \
+			"$(VM_BOOTLOADER)" "$(ARCH)" "$(VM_PARTTABLE)"; then \
 		echo "** error: sudo tar2fs failed, see build log" >&2; \
 		exit 1; \
 	fi
 
-convert-image: prepare-image
+# copy $(BUILDDIR)/.work/chroot/.host/qemu* into chroot if qemu is used
+prepare-tarball-qemu:
+	@(cd "$(BUILDDIR)/.work/chroot/"; \
+		tar -rf "$(VM_TARBALL)" ./.host/qemu*) ||:
+
+convert-image/tar:
+	mv "$(VM_TARBALL)" "$(IMAGE_OUTPATH)"
+
+convert-image/tar.gz:
+	$(VM_GZIP_COMMAND) < "$(VM_TARBALL)" > "$(IMAGE_OUTPATH)"
+
+convert-image/tar.xz:
+	$(VM_XZ_COMMAND) < "$(VM_TARBALL)" > "$(IMAGE_OUTPATH)"
+
+convert-image/img: tar2fs
+	mv "$(VM_RAWDISK)" "$(IMAGE_OUTPATH)"
+
+convert-image/qcow2 convert-image/qcow2c convert-image/vmdk \
+	convert-image/vdi convert-image/vhd: check-qemu tar2fs
 	@VM_COMPRESS=; \
 	case "$(IMAGE_TYPE)" in \
-	"img") mv "$(VM_RAWDISK)" "$(IMAGE_OUTPATH)"; exit 0;; \
 	"vhd") VM_FORMAT="vpc";; \
 	"qcow2c") VM_FORMAT="qcow2"; VM_COMPRESS="-c";; \
 	*) VM_FORMAT="$(IMAGE_TYPE)"; \
 	esac; \
-	if ! type -t qemu-img >&/dev/null; then \
-		echo "** error: qemu-img not available" >&2; \
-		exit 1; \
-	else \
-		qemu-img convert $$VM_COMPRESS -O "$$VM_FORMAT" \
-			"$(VM_RAWDISK)" "$(IMAGE_OUTPATH)"; \
-		rm "$(VM_RAWDISK)"; \
-		if [ "0$(DEBUG)" -le 1 ]; then rm "$(VM_TARBALL)"; fi; \
-	fi
+	qemu-img convert $$VM_COMPRESS -O "$$VM_FORMAT" \
+		"$(VM_RAWDISK)" "$(IMAGE_OUTPATH)"
+
+# for tavolga
+convert-image/recovery.tar:
+	build-recovery-tar \
+	    --image-name $(IMAGE_NAME) \
+	    --date $(DATE) \
+	    --compress-command '$(VM_GZIP_COMMAND)' \
+	    --rootfs "$(VM_TARBALL)" \
+	    --output "$(IMAGE_OUTPATH)" \
+	    --line '$(RECOVERY_LINE)'
+
+post-convert:
+	@rm -f "$(VM_RAWDISK)"; \
+	if [ "0$(DEBUG)" -le 1 ]; then rm -f "$(VM_TARBALL)"; fi
+
+convert-image: convert-image/$(IMAGE_TYPE) post-convert; @:
 
 run-image-scripts: GLOBAL_CLEANUP_PACKAGES := $(CLEANUP_PACKAGES)
 

features.in/cleanup/config.mk

@@ -23,22 +23,21 @@ use/cleanup/alterator: use/cleanup
 
 # for lightweight server distros
 use/cleanup/x11-alterator: use/cleanup/x11 use/cleanup/alterator
-	@$(call add,CLEANUP_PACKAGES,libmng qt4-common)
+	@$(call add,CLEANUP_PACKAGES,libmng qt4-common qt5-base-common)
 
 # "basically everything else"; this *will* change with branches and distros
 use/cleanup/jeos: use/cleanup/x11-alterator
-	@$(call add,CLEANUP_PACKAGES,liblcms libjpeg 'libpng*' 'libtiff*')
+	@$(call add,CLEANUP_PACKAGES,liblcms libjpeg 'libtiff*')
 	@$(call add,CLEANUP_PACKAGES,avahi-autoipd iw wpa_supplicant)
 	@$(call add,CLEANUP_PACKAGES,openssl libpcsclite)
 	@# a *lot* of stray things get pulled in by alterator modules
-	@$(call add,CLEANUP_PACKAGES,libfreetype fontconfig)
-	@$(call add,CLEANUP_PACKAGES,liblcms libjpeg 'libpng*' 'libtiff*')
+	@$(call add,CLEANUP_PACKAGES,fontconfig)
+	@$(call add,CLEANUP_PACKAGES,liblcms libjpeg 'libtiff*')
 	@$(call add,CLEANUP_PACKAGES,openssl libpcsclite)
 
 # mostly non-interactive system
 use/cleanup/jeos/full: use/cleanup/jeos
 	@$(call add,CLEANUP_PACKAGES,interactivesystem 'groff*' man stmpclean)
-	@$(call add,CLEANUP_PACKAGES,gettext)
 	@$(call add,CLEANUP_PACKAGES,console-scripts console-vt-tools 'kbd*')
 	@$(call add,CLEANUP_PACKAGES,libsystemd-journal libsystemd-login)
 	@$(call add,CLEANUP_PACKAGES,dbus libdbus)

features.in/deflogin/config.mk

@@ -28,6 +28,9 @@ use/deflogin/root: use/deflogin
 use/deflogin/altlinuxroot: use/deflogin/root use/deflogin/xgrp
 	@$(call add,USERS,altlinux:root:1:1)
 
+use/deflogin/altroot: use/deflogin/root use/deflogin/xgrp
+	@$(call add,USERS,alt:root:1:1)
+
 # peripherals
 use/deflogin/hardware: use/deflogin
 	@$(call add,GROUPS,cdwriter radio scanner uucp)
@@ -39,8 +42,3 @@ use/deflogin/xgrp: use/deflogin
 # potentially elevated privileges (NB: _not_ wheel)
 use/deflogin/privileges: use/deflogin
 	@$(call add,GROUPS,fuse netadmin proc users)
-
-# NM with sysvinit
-use/deflogin/sysv/nm: use/deflogin
-	@$(call add,GROUPS,_nmconnect)
-	@$(call add,THE_PACKAGES,nm-sysvinit)

features.in/domain-client/config.mk

@@ -3,6 +3,5 @@ use/domain-client: use/net/dhcp
 	@$(call add,THE_LISTS,domain-client)
 
 use/domain-client/full: use/domain-client
-	@$(call add,THE_PACKAGES,krb5-ticket-watcher)
 	@$(call add,DEFAULT_SERVICES_ENABLE,avahi-daemon)
 	@$(call add,BASE_LISTS,domain-client-i) # i-f-* shouldn't hit live

features.in/e2k/config.mk

@@ -23,12 +23,17 @@ use/e2k/x11/101/modesetting: use/e2k/x11/.101
 	@$(call add,THE_PACKAGES,xorg-conf-e101-modesetting)
 	@$(call add,THE_PACKAGES,dummy-xorg-drv-vivante)
 
-use/e2k/x11/101: use/e2k/x11/.101
+use/e2k/x11/101/mga2: use/e2k/x11/.101
 	@$(call add,THE_PACKAGES,xorg-conf-e101-mga2)
 	@$(call add,THE_PACKAGES,xorg-drv-mga2 vivante_glx)
 
+use/e2k/x11/101: use/e2k/x11/101/modesetting
+	@$(call add,MAIN_PACKAGES,xorg-conf-e101-mga2)
+	@$(call add,MAIN_PACKAGES,xorg-drv-mga2 vivante_glx)
+
 use/e2k/install2: use/e2k
 	@$(call add,INSTALL2_PACKAGES,installer-feature-e2k-fix-boot-stage2)
+	@$(call add,INSTALL2_PACKAGES,installer-feature-fstrim-stage2)
 	@$(call add,INSTALL2_CLEANUP_PACKAGES,llvm)
 
 use/e2k/install2/desktop: use/e2k/install2

features.in/efi/config.mk

@@ -1,43 +1,69 @@
+EFI_ARCHES := x86_64 aarch64
+
 +efi: use/efi/signed; @:
 
-ifeq (x86_64,$(ARCH))
+ifeq (,$(filter-out $(EFI_ARCHES),$(ARCH)))
 
 EFI_LISTS := $(call tags,base efi)
 
 use/efi:
 	@$(call add_feature)
 	@$(call set,MKI_VER_MINIMAL,0.2.12)	# it's official now
-	@$(call add,THE_LISTS,$(EFI_LISTS))
-	@$(call add,RESCUE_LISTS,$(EFI_LISTS))
-	@$(call add,THE_PACKAGES,$$(EFI_SHELL))
-	@$(call add,RESCUE_PACKAGES,refind $$(EFI_SHELL))
-	@$(call add,INSTALL2_PACKAGES,dosfstools fatresize)
-	@$(call try,EFI_BOOTLOADER,elilo)	# default one
-	@$(call add,STAGE1_KCONFIG,EFI EFI_PARTITION EFI_VARS FB_EFI)
 	@$(call set,MKI_VER_OPTIMAL,0.2.17)	# for EFI_BOOTARGS
+	@$(call try,EFI_BOOTLOADER,grub-efi)	# default one
+	@$(call add,THE_PACKAGES,$$(EFI_BOOTLOADER))
+	@$(call xport,EFI_BOOTLOADER)
+	@$(call add,THE_LISTS,$(EFI_LISTS))
+	@$(call add,THE_PACKAGES,$$(EFI_SHELL))
+ifeq (distro,$(IMAGE_CLASS))
+	@$(call add,RESCUE_LISTS,$(EFI_LISTS))
+	@$(call add,INSTALL2_PACKAGES,dosfstools fatresize)
+	@$(call add,STAGE1_KCONFIG,EFI EFI_PARTITION EFI_VARS FB_EFI)
 	@$(call add,EFI_BOOTARGS,$$(STAGE2_BOOTARGS))
+ifeq (x86_64,$(ARCH))
+	@$(call add,RESCUE_PACKAGES,refind $$(EFI_SHELL) $$(EFI_BOOTLOADER))
+endif
+endif
 
-use/efi/refind: use/efi
-	@$(call set,EFI_BOOTLOADER,refind)
+use/efi/grub: use/efi use/bootloader/grub
+	@$(call set,EFI_BOOTLOADER,grub-efi)
+
+ifeq (x86_64,$(ARCH))
+use/efi/shell: use/efi
+	@$(call try,EFI_SHELL,efi-shell)
 
 use/efi/signed: use/efi
 	@$(call set,EFI_CERT,altlinux)
 	@$(call add,COMMON_PACKAGES,shim-signed)
 	@$(call add,RESCUE_PACKAGES,openssl pesign)
 
-use/efi/shell: use/efi
-	@$(call try,EFI_SHELL,efi-shell)
+use/efi/lilo: use/efi use/bootloader/lilo
+	@$(call set,EFI_BOOTLOADER,elilo)
 
-use/efi/memtest86: use/efi/refind
+use/efi/refind: use/efi
+	@$(call set,EFI_BOOTLOADER,refind)
+
+use/efi/memtest86: use/efi
 	@$(call set,EFI_MEMTEST86,efi-memtest86)
 
+else
+
+use/efi/signed use/efi/shell \
+	use/efi/refind use/efi/memtest86 use/efi/lilo: use/efi; @:
+
+endif
+
+ifeq (distro,$(IMAGE_CLASS))
 use/efi/debug: use/efi
 	@$(call add,STAGE2_PACKAGES,efibootmgr gdisk)
+else
+use/efi/debug: use/efi; @:
+endif
 
 else
 
 # ignore on an unsupported target arch but make it hybrid at least
-use/efi use/efi/signed use/efi/debug \
+use/efi use/efi/signed use/efi/debug use/efi/grub use/efi/lilo \
   use/efi/refind use/efi/shell use/efi/memtest86: use/isohybrid; @:
 
 endif

features.in/efi/rootfs/image-scripts.d/50-efi

@@ -1,4 +0,0 @@
-#!/bin/sh
-# see also https://bugzilla.altlinux.org/27970
-
-grep -q efivars /etc/modules || echo efivars >> /etc/modules

features.in/efi/stage2/image-scripts.d/50-efi

@@ -1,4 +0,0 @@
-#!/bin/sh
-# see also https://bugzilla.altlinux.org/27970
-
-grep -q efivars /etc/modules || echo efivars >> /etc/modules

features.in/firmware/config.mk

@@ -8,20 +8,18 @@ use/firmware:
 
 use/firmware/full: use/firmware/server use/firmware/laptop; @:
 
+ifeq (,$(filter-out i586 x86_64,$(ARCH)))
 use/firmware/cpu: use/firmware
 	@$(call add,THE_PACKAGES,firmware-intel-ucode iucode_tool)
+else
+use/firmware/cpu: use/firmware; @:
+endif
 
 use/firmware/server: use/firmware
 	@$(call add,SYSTEM_PACKAGES,firmware-aic94xx-seq)
 	@$(call add,THE_PACKAGES_REGEXP,firmware-ql.*)
 
 use/firmware/qlogic: use/firmware
-	@$(call add,SYSTEM_PACKAGES,firmware-ql2100)
-	@$(call add,SYSTEM_PACKAGES,firmware-ql2200)
-	@$(call add,SYSTEM_PACKAGES,firmware-ql2300)
-	@$(call add,SYSTEM_PACKAGES,firmware-ql2322)
-	@$(call add,SYSTEM_PACKAGES,firmware-ql2400)
-	@$(call add,SYSTEM_PACKAGES,firmware-ql2500)
 	@$(call add,SYSTEM_PACKAGES,firmware-ql6312)
 
 # NB: individual firmwarez would sometimes conflict

features.in/fonts/config.mk

@@ -51,3 +51,9 @@ use/fonts/ttf/redhat:
 
 use/fonts/ttf/ubuntu:
 	@$(call add,THE_PACKAGES,fonts-ttf-ubuntu-font-family)
+
+use/fonts/ttf/xo:
+	@$(call add,THE_PACKAGES,fonts-ttf-XO)
+	@$(call add,THE_PACKAGES,fonts-ttf-PT)
+	@$(call add,THE_PACKAGES,fonts-ttf-Cormorant)
+	@$(call add,THE_PACKAGES,fonts-ttf-open-sans)

features.in/grub/cfg.in/00defaults.cfg

@@ -0,0 +1,7 @@
+insmod echo
+insmod gzio
+insmod minicmd
+insmod normal
+insmod test
+set timeout=@timeout@
+if [ ! "$lang" ]; then lang=@LOCALE@; fi

features.in/grub/cfg.in/01gfxterm.cfg

@@ -0,0 +1,37 @@
+function load_video {
+  if [ x$feature_all_video_module = xy ]; then
+    insmod all_video
+  else
+    insmod efi_gop
+    insmod efi_uga
+    insmod ieee1275_fb
+    insmod vbe
+    insmod vga
+    insmod video_bochs
+    insmod video_cirrus
+  fi
+}
+
+font=${prefix}/fonts/unicode.pf2
+if loadfont "$font" ; then
+  set gfxmode=auto
+  load_video
+  insmod gfxterm
+  terminal_output gfxterm
+  if [ -d ${prefix}/locale ]; then
+    set locale_dir=${prefix}/locale
+    insmod gettext
+  fi
+  insmod gfxmenu
+  insmod jpeg
+  insmod png
+  if [ -f ${prefix}/themes/@grubtheme@/theme.txt ]; then
+    set theme=${prefix}/themes/@grubtheme@/theme.txt;
+    export theme
+  fi
+  set timeout_style=menu
+  set menu_color_normal=white/black
+  set menu_color_highlight=black/white
+  set color_normal=white/black
+  set color_highlight=black/white
+fi

features.in/grub/cfg.in/20install2.cfg

@@ -0,0 +1,9 @@
+
+default='linux'
+
+menuentry 'Install @relname@' --hotkey 'i' --id 'linux' {
+  echo "Loading Linux vmlinuz$KFLAVOUR ..."
+  linux@linux_suffix@ @boot_path@/vmlinuz$KFLAVOUR changedisk fastboot automatic=method:cdrom ramdisk_size=@altinst_size@ vga=@bootvga@ @bootargs@ lang=$lang
+  echo 'Loading initial ramdisk ...'
+  initrd@linux_suffix@ @boot_path@/full$KFLAVOUR.cz
+}

features.in/grub/cfg.in/25install-vnc-connect.cfg

@@ -0,0 +1,5 @@
+
+menuentry 'VNC install @relname@ (edit to set server IP address)' --id 'vncconnect' {
+  linux@linux_suffix@ @boot_path@/vmlinuz$KFLAVOUR changedisk fastboot automatic=method:cdrom ramdisk_size=@altinst_size@ showopts @bootargs@ headless no_alt_virt_keyboard vncconnect=IP lang=$lang
+  initrd@linux_suffix@ @boot_path@/full$KFLAVOUR.cz
+}

features.in/grub/cfg.in/25install-vnc-listen.cfg

@@ -0,0 +1,6 @@
+
+menuentry 'VNC install @relname@ (edit to set password and connect here)' --id 'vncpasswd' {
+  linux@linux_suffix@ @boot_path@/vmlinuz$KFLAVOUR changedisk fastboot automatic=method:cdrom ramdisk_size=@altinst_size@ showopts @bootargs@ headless no_alt_virt_keyboard vncpassword=VNCPWD lang=$lang
+  initrd@linux_suffix@ @boot_path@/full$KFLAVOUR.cz
+}
+

features.in/grub/cfg.in/30live.cfg

@@ -0,0 +1,8 @@
+menuentry 'LiveCD (no hard disk needed)' --id 'live' {
+  echo "Loading Linux vmlinuz$KFLAVOUR ..."
+  linux@linux_suffix@ @boot_path@/vmlinuz$KFLAVOUR changedisk fastboot live automatic=method:cdrom ramdisk_size=@live_size@ stagename=live showopts lowmem vga=@bootvga@ @bootargs@ lang=$lang
+  echo 'Loading initial ramdisk ...'
+  initrd@linux_suffix@ @boot_path@/full$KFLAVOUR.cz
+}
+
+

features.in/grub/cfg.in/32live_rw.cfg

@@ -0,0 +1,6 @@
+menuentry 'LiveCD with sessions support' --id 'session' {
+  echo "Loading Linux vmlinuz$KFLAVOUR ..."
+  linux@linux_suffix@ @boot_path@/vmlinuz$KFLAVOUR changedisk fastboot live automatic=method:cdrom ramdisk_size=@live_size@ stagename=live showopts live_rw vga=@bootvga@ @bootargs@ lang=$lang
+  echo 'Loading initial ramdisk ...'
+  initrd@linux_suffix@ @boot_path@/full$KFLAVOUR.cz
+}

features.in/grub/cfg.in/40lang.cfg

@@ -0,0 +1,14 @@
+submenu "Change language (press F2)" --hotkey 'f2' {
+	insmod regexp
+	for langstr in "ru_RU=Russian" "en_US=English" "pt_BR=Portuguese" "kk_KZ=Kazakh" "uk_UA=Ukrainian"; do
+		regexp -s 2:langname -s 1:langcode '(.*)=(.*)' "$langstr"
+		menuentry "${langname}" "$langcode" {
+			lang="$2"
+			export lang
+			configfile ${prefix}/grub.cfg
+		}
+	done
+	menuentry "Return to the Main menu" {
+		configfile ${prefix}/grub.cfg
+	}
+}

features.in/grub/cfg.in/80rescue.cfg

@@ -0,0 +1,6 @@
+menuentry 'Rescue LiveCD' --id 'rescue' {
+  echo "Loading Linux vmlinuz$KFLAVOUR ..."
+  linux@linux_suffix@ @boot_path@/vmlinuz$KFLAVOUR changedisk fastboot live automatic=method:cdrom ramdisk_size=@rescue_size@ stagename=rescue splash=0 showopts @rescue_bootargs@
+  echo 'Loading initial ramdisk ...'
+  initrd@linux_suffix@ @boot_path@/full$KFLAVOUR.cz
+}

features.in/grub/cfg.in/82rescue_rw.cfg

@@ -0,0 +1,6 @@
+menuentry 'Rescue with sessions support' --id 'rescue_session' {
+  echo "Loading Linux vmlinuz$KFLAVOUR ..."
+  linux@linux_suffix@ @boot_path@/vmlinuz$KFLAVOUR changedisk fastboot live automatic=method:cdrom,label:ALT* ramdisk_size=@rescue_size@ stagename=rescue splash=0 showopts @rescue_bootargs@ live_rw
+  echo 'Loading initial ramdisk ...'
+  initrd@linux_suffix@ @boot_path@/full$KFLAVOUR.cz
+}

features.in/grub/cfg.in/83rescue_fm.cfg

@@ -0,0 +1,6 @@
+menuentry 'Forensic mode (leave disks alone)' --id 'rescue_forensic' {
+  echo "Loading Linux vmlinuz$KFLAVOUR ..."
+  linux@linux_suffix@ @boot_path@/vmlinuz changedisk fastboot live automatic=method:cdrom ramdisk_size=@rescue_size@ splash=0 showopts stagename=rescue @rescue_bootargs@ max_loop=16 forensic hash=@rescue_hash@
+  echo 'Loading initial ramdisk ...'
+  initrd@linux_suffix@ @boot_path@/full.cz
+}

features.in/grub/cfg.in/84rescue_remote.cfg

@@ -0,0 +1,5 @@
+menuentry 'Rescue with remote SSH access (DHCP)' --id 'rescue_remote' {
+  linux@linux_suffix@ @boot_path@/vmlinuz$KFLAVOUR changedisk fastboot live automatic=method:cdrom ramdisk_size=@rescue_size@ splash=0 showopts stagename=rescue @rescue_bootargs@ max_loop=16 ip=dhcp port=22 rootpw=AUTO hash=@rescue_hash@
+  echo 'Loading initial ramdisk ...'
+  initrd@linux_suffix@ @boot_path@/full$KFLAVOUR.cz
+}

features.in/grub/cfg.in/85mediacheck.cfg

@@ -0,0 +1,4 @@
+menuentry 'Check this media for defects' --id 'mediachk' {
+  linux@linux_suffix@ @boot_path@/vmlinuz changedisk live quiet lowmem automatic=method:cdrom mediacheck=1 stagename=mediacheck showopts @bootargs@
+  initrd@linux_suffix@ @boot_path@/full.cz
+}

features.in/grub/cfg.in/90kernel.cfg

@@ -0,0 +1,19 @@
+submenu "Change Kernel Flavour (press F5)" --hotkey 'f5' {
+	insmod regexp
+	regexp -s 1:kflavours -s 2:kflavourstr '(.*) (.*)' "@KFLAVOUR@"
+	menuentry "${kflavourstr}" {
+		KFLAVOUR=
+		export KFLAVOUR
+		configfile ${prefix}/grub.cfg
+	}
+	for kflavourstr in ${kflavours}; do
+		menuentry "${kflavourstr}" {
+			KFLAVOUR="-$1"
+			export KFLAVOUR
+			configfile ${prefix}/grub.cfg
+		}
+	done
+	menuentry "Return to the Main menu" {
+		configfile ${prefix}/grub.cfg
+	}
+}

features.in/grub/cfg.in/90memtest_efi.cfg

@@ -0,0 +1,3 @@
+menuentry 'Memory Test' --id 'memtest' {
+  linux@linux_suffix@ /EFI/tools/memtest86.efi
+}

features.in/grub/cfg.in/95fwsetup_efi.cfg

@@ -0,0 +1,3 @@
+menuentry 'System setup' --id 'uefi-firmware' {
+        fwsetup
+}

features.in/grub/config.mk

@@ -0,0 +1,31 @@
+# default is plain text prompt
+# NB: might be usbflash-ready hybrid iso
+
+ifeq (,$(filter-out i586 x86_64 ppc64le aarch64,$(ARCH)))
+
+use/grub: sub/stage1 $(ISOHYBRID:%=use/isohybrid)
+	@$(call add_feature)
+ifeq (,$(filter-out i586 x86_64,$(ARCH)))
+	@$(call try,BOOTVGA,normal)
+endif
+	@$(call set,RELNAME,ALT ($(IMAGE_NAME)))
+	@$(call set,IMAGE_PACKTYPE,boot)
+else
+
+use/grub: ; @:
+
+endif
+
+# UI is overwritten
+use/grub/ui/%: use/grub
+	@$(call set,GRUB_UI,$*)
+	@if [ "$*" == gfxboot ]; then \
+		$(call add,STAGE1_BRANDING,bootloader); \
+	fi
+
+use/grub/%.cfg: use/grub
+	@$(call add,GRUB_CFG,$*)
+
+
+use/grub/timeout/%: use/grub
+	@$(call set,GRUB_TIMEOUT,$*)

features.in/grub/generate.mk

@@ -0,0 +1,124 @@
+ifdef BUILDDIR
+
+# in deciseconds
+DEFAULT_TIMEOUT = 90
+
+# prepare data for grub installation;
+# see also stage1/scripts.d/01-grub
+
+include $(BUILDDIR)/distcfg.mk
+
+ifndef BOOTLOADER
+$(error grub feature enabled but BOOTLOADER undefined)
+endif
+
+ifndef GRUB_DIRECT
+# SUBPROFILES are considered GRUB_CFG too
+# (note these can appear like stage2@live);
+# 01defaults.cfg is included indefinitely
+GRUB_CFG := $(GRUB_CFG) $(SUBPROFILE_DIRS) defaults fwsetup_efi
+endif
+
+ifdef GRUB_UI
+GRUB_CFG := $(GRUB_CFG) gfxterm
+endif
+
+ifdef LOCALE
+GRUB_CFG := $(GRUB_CFG) lang
+endif
+
+ifneq ($(words $(KFLAVOURS)),1)
+GRUB_CFG := $(GRUB_CFG) kernel
+endif
+
+DSTDIR  := $(BUILDDIR)/stage1/files/boot/grub/.in
+DSTCFGS := $(DSTDIR)/*.cfg
+
+# we can do GRUB_{CFG,MODULES,FILES}
+# CFG have only cfg snippet
+cfg = $(wildcard cfg.in/??$(1).cfg)
+
+# NB: list position determined by file numbering (*.cfg sorting)
+#
+# config snippets are copied into generated profile where they can
+# be also tested against grub modules (some can be unavailable);
+# we can't do tests right now since that implies host grub being
+# identical to build system one which might be not the case...
+#
+# have to piggyback parameters as we're running in host system yet,
+# and files involved will appear inside instrumental chroot
+#
+# arguments get evaluated before recipe body execution thus prep
+
+all: debug timeout
+	@### proper text branding should be implemented
+	@echo $(GRUB_FILES) > $(DSTDIR)/grub.list
+	@sed -i \
+		-e 's,@mkimage-profiles@,$(IMAGE_NAME),' \
+		-e 's,@relname@,$(RELNAME),g' \
+		$(DSTCFGS)
+
+# integerity check
+timeout: distro
+	@if [ "$(GRUB_TIMEOUT)" -ge 0 ] 2>/dev/null; then \
+		TIMEOUT="$(GRUB_TIMEOUT)"; \
+	else \
+		TIMEOUT="$(DEFAULT_TIMEOUT)"; \
+	fi; \
+	sed -i "s,@timeout@,$$TIMEOUT," $(DSTCFGS)
+
+distro: bootargs
+	@if [ -n "$(META_VOL_SET)" ]; then \
+		DISTRO="$(META_VOL_SET)"; \
+	else \
+		DISTRO="ALT"; \
+	fi; \
+	sed -i "s,@distro@,$$DISTRO," $(DSTCFGS)
+
+# pass over additional parameters, if any
+bootargs: clean
+	@if [ -n "$(STAGE2_BOOTARGS)" ]; then \
+		sed -i "s,@bootargs@,$(STAGE2_BOOTARGS)," $(DSTCFGS); \
+	fi; \
+	sed -i "s,@bootargs@,," $(DSTCFGS)
+	@if [ -n "$(RESCUE_BOOTARGS)" ]; then \
+		sed -i "s,@rescue_bootargs@,$(RESCUE_BOOTARGS)," $(DSTCFGS); \
+	fi; \
+	sed -i "s,@rescue_bootargs@,," $(DSTCFGS)
+	@if [ -n "$(BOOTVGA)" ]; then \
+		sed -i "s,@bootvga@,$(BOOTVGA)," $(DSTCFGS); \
+	fi; \
+	sed -i "s,@bootvga@,,;s,vga= ,," $(DSTCFGS)
+	@if [ -n "$(LOCALE)" ]; then \
+		sed -i "s,@LOCALE@,$(LOCALE),g" $(DSTCFGS); \
+	else \
+		sed -i "s, lang=.lang,,g" $(DSTCFGS); \
+	fi; \
+	sed -i "/lang=@LOCALE@/d" $(DSTCFGS)
+	@if [ $$(echo $(KFLAVOURS) | wc -w) -gt 1 ]; then \
+		sed -i "s,@KFLAVOUR@,$(KFLAVOURS),g" $(DSTCFGS); \
+	fi
+	GRUBTHEME=$(GRUBTHEME); \
+	[ -n "$$GRUBTHEME" ] || GRUBTHEME=$$(cut -d "-" -f2 <<< $(BRANDING)); \
+	sed -i "s,@grubtheme@,$$GRUBTHEME,g" $(DSTCFGS); \
+
+clean: copy
+	@if [ "$(GRUB_UI)" = gfxboot ]; then \
+		sed -i "s/\^//;/menu label /d" $(DSTCFGS); \
+	fi
+
+copy: prep
+	@cp -pLt $(DSTDIR) -- $(sort \
+		$(foreach C,$(GRUB_CFG),$(call cfg,$(C))))
+
+prep:
+	@mkdir -p $(DSTDIR)
+
+debug:
+	@if [ -n "$(DEBUG)" ]; then \
+		echo "** BOOTLOADER: $(BOOTLOADER)"; \
+		echo "** GRUB_CFG: $(GRUB_CFG)"; \
+		echo "** GRUB_FILES: $(GRUB_FILES)"; \
+	fi
+
+endif

features.in/grub/scripts.d/20-propagator-ramdisk-grub

@@ -0,0 +1,20 @@
+#!/bin/sh
+# postprocess isolinux configuration
+# when the image sizes are finally known
+# NB: install2_size, live_size, rescue_size get defined here
+
+cd "$WORKDIR"
+
+[ -f boot/grub/grub.cfg -o -f EFI/BOOT/grub.cfg ] || exit 0
+
+cfgs=
+[ ! -f boot/grub/grub.cfg ] || cfgs+='boot/grub/grub.cfg '
+[ ! -f EFI/BOOT/grub.cfg ] || cfgs+='EFI/BOOT/grub.cfg'
+
+# apply size census while looking for potential squashfs images
+find -maxdepth 1 -type f -size +1M \
+| sed 's,^\./,,' \
+| while read image; do
+	size="$[ $(stat -c%s "$image") / 1024 + 1 ]"
+	sed -i "s,@${image}_size@,$size," $cfgs
+done

features.in/grub/scripts.d/20-propagator-rescue-hash-grub

@@ -0,0 +1,18 @@
+#!/bin/sh
+# postprocess isolinux configuration
+# to add rescue image hash, if any
+# (for propagator in forensic mode)
+
+cd "$WORKDIR"
+
+[ -f boot/grub/grub.cfg -o -f EFI/BOOT/grub.cfg ] || exit 0
+
+cfgs=
+[ ! -f boot/grub/grub.cfg ] || cfgs+='boot/grub/grub.cfg '
+[ ! -f EFI/BOOT/grub.cfg ] || cfgs+='EFI/BOOT/grub.cfg'
+
+find -maxdepth 1 -type f -name rescue \
+| while read image; do
+	rescue_hash="$(sha256sum -b "$image" | cut -f1 -d' ')"
+	sed -i "s,@rescue_hash@,$rescue_hash," $cfgs
+done

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

@@ -0,0 +1,85 @@
+#!/bin/sh
+# gather grub configuration from snippets;
+# copy modules; see also this feature's generate.mk
+
+CFG="$WORKDIR/boot/grub/grub.cfg"
+CFG_EFI="$WORKDIR/EFI/BOOT/grub.cfg"
+
+if [ -n "$GLOBAL_EFI_BOOTLOADER" -a ! "$GLOBAL_EFI_BOOTLOADER" = "grub-efi" ]; then
+	rm -fr "$WORKDIR/boot"
+	exit 0
+fi
+
+if [ -z "$GLOBAL_EFI_BOOTLOADER" ]; then
+	case "$GLOBAL_BOOTLOADER" in
+		ieee1275boot) ;;
+		*) rm -fr "$WORKDIR/boot"
+		   exit 0;;
+	esac
+fi
+
+cd "$WORKDIR/boot/grub"
+
+# copy extra files, if any
+GRUB_FILES="$(cat .in/grub.list)"
+if [ -n "${GRUB_FILES% }" ]; then
+	cp -a $GRUB_FILES .
+fi
+
+# number ordering sponsored by shell's pathname expansion
+case "$GLOBAL_BOOTLOADER" in
+	ieee1275boot)
+		grep -hv '^#' $(find .in/*.cfg -not -name *_efi.cfg) > "$CFG" ;;
+esac
+
+if [ "$GLOBAL_EFI_BOOTLOADER" = "grub-efi" ]; then
+	mkdir -p "$WORKDIR/EFI/BOOT"
+	grep -hv '^#' $(find .in/*.cfg) > "$CFG_EFI"
+fi
+
+# there should be DEFAULT directive there (at least for alterator-netinst)
+default_change() {
+local CFG=$1
+if ! grep -i '^default' "$CFG"; then
+	DEFAULT="$(grep -i '\-\-id ' "$CFG" | head -1 | rev| cut -f2 -d' ' |rev)"
+	if [ -n "$DEFAULT" ]; then
+		echo "default=$DEFAULT" >> "$CFG"
+	else
+		echo "error: no DEFAULT or UI directive and cannot guess for $CFG" >&2
+		exit 1
+	fi
+fi
+}
+
+if [ -f "$CFG" ]; then
+	default_change "$CFG"
+	sed -i 's,@boot_path@,/boot,g' "$CFG"
+fi
+
+if [ -f "$CFG_EFI" ]; then
+	default_change "$CFG_EFI"
+	sed -i 's,@boot_path@,/EFI/BOOT,g' "$CFG_EFI"
+fi
+
+# change @linux_suffix@
+case "$GLOBAL_ARCH" in
+	i586|x86_64)
+		[ ! -f "$CFG" ] || sed -i 's/@linux_suffix@/16/g' "$CFG"
+		[ ! -f "$CFG_EFI" ] || sed -i 's/@linux_suffix@/efi/g' "$CFG_EFI"
+	;;
+	*)
+		[ ! -f "$CFG" ] || sed -i 's/@linux_suffix@//g' "$CFG"
+		[ ! -f "$CFG_EFI" ] || sed -i 's/@linux_suffix@//g' "$CFG_EFI"
+	;;
+esac
+
+# snippets are not going into the actual image
+if [ "$DEBUG" != 2 ]; then
+	rm -r .in/
+	cd $WORKDIR
+	[ -f "$CFG" ] || rm -r boot/grub
+	[ ! $(ls -A boot/ | wc -l) -eq 0 ] || rm -r boot/
+fi
+
+# NB: there will be final macro expansion based on actual image sizes
+#     done by features.in/grub/scripts.d/20-propagator-ramdisk

features.in/hdt/config.mk

@@ -1,5 +1,9 @@
 # optimized out use/syslinux due to use/memtest
+ifeq (,$(filter-out i586 x86_64,$(ARCH)))
 use/hdt: use/memtest
 	@$(call add_feature)
 	@$(call add,STAGE1_PACKAGES,pciids)
 	@$(call add,SYSLINUX_MODULES,hdt)
+else
+use/hdt: ; @:
+endif

features.in/init/config.mk

@@ -1,5 +1,6 @@
 +sysvinit: use/init/sysv; @:
 +systemd: use/init/systemd/full; @:
++systemd-optimal: use/init/systemd/settings/optimal; @:
 
 # NB: the list name MUST be identical to init package name
 use/init: use/pkgpriorities
@@ -12,20 +13,17 @@ use/init: use/pkgpriorities
 use/init/sysv: use/init
 	@$(call set,INIT_TYPE,sysvinit)
 	@$(call add,BASE_PACKAGES,rsyslog-classic)
+	@$(call add,PINNED_PACKAGES,rsyslog-classic)
 
 use/init/sysv/polkit: use/init/sysv
 	@$(call add,THE_PACKAGES,polkit-sysvinit)
 
-use/init/sysv/consolekit: use/init/sysv
-	@$(call add,THE_PACKAGES,ConsoleKit ConsoleKit-x11 pam-ck-connector)
-
 ### i-f should be dropped as soon as rootfs scripts are effective there
 use/init/systemd: use/init
 	@$(call set,INIT_TYPE,systemd)
-	@$(call add,INSTALL2_PACKAGES,installer-feature-journald-tty)
 
 use/init/systemd/full: use/init/systemd
-	@$(call add,THE_PACKAGES,bash-completion-systemd chkconfig)
+	@$(call add,THE_PACKAGES,chkconfig)
 ifeq (,$(filter-out i586 x86_64,$(ARCH)))
 	@$(call add,THE_PACKAGES,vconsole-setup-kludge)
 endif
@@ -37,3 +35,19 @@ use/init/systemd/debug: use/init/systemd use/services
 	@$(call add,STAGE2_BOOTARGS,systemd.log_level=debug)
 	@$(call add,STAGE2_BOOTARGS,systemd.log_target=kmsg)
 	@$(call add,STAGE2_BOOTARGS,log_buf_len=1M enforcing=0)
+
+# set multi-user target by default
+use/init/systemd/multiuser: use/init/systemd
+	@$(call add,STAGE2_BOOTARGS,systemd.unit=multi-user.target)
+
+use/init/systemd/settings/disable-dumpcore \
+	use/init/systemd/settings/disable-user-systemd-for-selinux \
+	use/init/systemd/settings/enable-log-to-tty12 \
+	use/init/systemd/settings/enable-showstatus: \
+	use/init/systemd/settings/%: use/init/systemd
+	@$(call add,THE_PACKAGES,systemd-settings-$*)
+
+use/init/systemd/settings/optimal: use/init/systemd \
+	use/init/systemd/settings/disable-dumpcore \
+	use/init/systemd/settings/enable-log-to-tty12 \
+	use/init/systemd/settings/enable-showstatus; @:

features.in/init/live/image-scripts.d/50-var-run-fix

@@ -0,0 +1,9 @@
+#!/bin/sh
+
+# this was a bunch of dirty complaints
+sed -i 's,/var/run,/run,' /{etc,lib}/tmpfiles.d/*.conf ||:
+
+[ ! -L /var/run ] && rm -r /var/run && ln -s ../run /var/run
+[ ! -L /var/lock ] && rm -r /var/lock && ln -s ../run/lock /var/lock
+
+:

features.in/init/rescue/image-scripts.d/50-sysvinit

@@ -1,16 +0,0 @@
-#!/bin/sh
-
-# the part below relates to sysvinit specifically
-rpm -q sysvinit || exit 0
-
-# this was a bunch of dirty complaints
-sed -i 's,/var/run,/run,' /{etc,lib}/tmpfiles.d/*.conf ||:
-
-# https://bugzilla.altlinux.org/35350
-# this FAILS: no symlinks...
-#rm -rf /var/run /var/lock
-# ...so just revert what's been broken in failsystem package
-mkdir -p /var/run /var/lock/{serial,subsys,uucp}
-chmod 0770 /var/lock/subsys
-chmod 0770 /var/lock/{serial,uucp}
-chgrp uucp /var/lock/{serial,uucp}

features.in/init/rescue/image-scripts.d/50-var-run-fix

@@ -0,0 +1,9 @@
+#!/bin/sh
+
+# this was a bunch of dirty complaints
+sed -i 's,/var/run,/run,' /{etc,lib}/tmpfiles.d/*.conf ||:
+
+[ ! -L /var/run ] && rm -r /var/run && ln -s ../run /var/run
+[ ! -L /var/lock ] && rm -r /var/lock && ln -s ../run/lock /var/lock
+
+: