server-v: branding and docs

It is needed by ntfs

.gear/mkimage-profiles.spec

@@ -1,5 +1,5 @@
 Name: mkimage-profiles
-Version: 1.2.0
+Version: 1.3.11.1
 Release: alt1
 
 Summary: ALT based distribution metaprofile
@@ -128,6 +128,131 @@ mv %buildroot%mpdir/doc/mkimage-profiles.7 %buildroot%_man7dir/
 %endif
 
 %changelog
+* 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
+
+* Mon Nov 05 2018 Michael Shigorin <mike@altlinux.org> 1.3.1-alt1
+- current fixes and tweaks
+
+* Mon Oct 15 2018 Michael Shigorin <mike@altlinux.org> 1.3.0-alt1
+- pre-p9 sisyphus: fixes, drops and just two kludges
+
+* Mon Aug 13 2018 Michael Shigorin <mike@altlinux.org> 1.2.21-alt1
+- volumes feature; fixups
+
+* Mon Aug 06 2018 Michael Shigorin <mike@altlinux.org> 1.2.20-alt1
+- isoboot/isodata; apt-conf feature; dual-seat e801
+
+* Mon Jul 23 2018 Michael Shigorin <mike@altlinux.org> 1.2.19-alt1
+- alt-workstation: x86 (sem@), e2k (me)
+
+* Mon Jul 16 2018 Michael Shigorin <mike@altlinux.org> 1.2.18-alt1
+- ldm feature (lakostis@)
+
+* Mon Jun 25 2018 Michael Shigorin <mike@altlinux.org> 1.2.17-alt1
+- e2k & profiles
+
+* Mon Jun 11 2018 Michael Shigorin <mike@altlinux.org> 1.2.16-alt1
+- starterkits-20180612
+
+* Mon May 28 2018 Michael Shigorin <mike@altlinux.org> 1.2.15-alt1
+- fixup release
+
+* Mon May 21 2018 Michael Shigorin <mike@altlinux.org> 1.2.14-alt1
+- pkgpriorities feature (manowar@)
+- extended e2k support
+
+* Mon Apr 23 2018 Michael Shigorin <mike@altlinux.org> 1.2.13-alt1
+- antohami@'s improvements
+
+* Mon Mar 19 2018 Michael Shigorin <mike@altlinux.org> 1.2.12-alt1
+- @IA32, @X86
+
+* Mon Mar 12 2018 Michael Shigorin <mike@altlinux.org> 1.2.11-alt1
+- starterkits-20180312
+
+* Mon Feb 19 2018 Michael Shigorin <mike@altlinux.org> 1.2.10-alt1
+- antohami@'s fixups
+
+* Mon Feb 12 2018 Michael Shigorin <mike@altlinux.org> 1.2.9-alt1
+- antohami@'s release
+
+* Mon Feb 05 2018 Michael Shigorin <mike@altlinux.org> 1.2.8-alt1
+- regular fixes
+
+* Mon Jan 22 2018 Michael Shigorin <mike@altlinux.org> 1.2.7-alt1
+- 2018: better sound feature (antohami@)
+
+* Mon Dec 11 2017 Michael Shigorin <mike@altlinux.org> 1.2.6-alt1
+- starterkits-20171212
+
+* Mon Dec 04 2017 Michael Shigorin <mike@altlinux.org> 1.2.5-alt1
+- qcow2c
+
+* Mon Nov 20 2017 Michael Shigorin <mike@altlinux.org> 1.2.4-alt1
+- opennebula-systemd
+
+* Mon Sep 25 2017 Michael Shigorin <mike@altlinux.org> 1.2.3-alt1
+- p8+
+
+* Mon Sep 11 2017 Michael Shigorin <mike@altlinux.org> 1.2.2-alt1
+- regular-engineering
+
+* Mon Aug 21 2017 Michael Shigorin <mike@altlinux.org> 1.2.1-alt1
+- seven years ago...
+
 * Mon Aug 07 2017 Michael Shigorin <mike@altlinux.org> 1.2.0-alt1
 - e2k
 

.gear/tags/0ad4cdedf0a3aafca1a5bb95fb645aef85d4c088

@@ -0,0 +1,6 @@
+object d8e050dc5902f958613c638d3b3e775ff0a82b9e
+type commit
+tag v1.3.11.1
+tagger Michael Shigorin <mike@altlinux.org> 1562654313 +0300
+
+v1.3.11.1

.gear/tags/f35b0b48a2974939329f5ad742018ad5dd88b5f3

@@ -1,6 +0,0 @@
-object 9bb71fbbd1f51fd8053d8a42bbfa37a4fb9ad23c
-type commit
-tag v1.1.110
-tagger Michael Shigorin <mike@altlinux.org> 1501531437 +0300
-
-v1.1.110

.gear/tags/list

@@ -1 +1 @@
-f35b0b48a2974939329f5ad742018ad5dd88b5f3 v1.1.110
+0ad4cdedf0a3aafca1a5bb95fb645aef85d4c088 v1.3.11.1

.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

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,34 +24,33 @@ 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=
 
 ARCH="$(arch)"		# NB: sudo => no GLOBAL_ will do either; mind qemu-*
 
 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"
+	;;
+*)
+	ROOTPART="1"
+	BLOCKDEV="/dev/sda"
+	;;
 esac
 
 # figure out the part taken by /boot in the given tarball
@@ -134,6 +133,7 @@ fi
 
 exit_handler() {
 	rc=$?
+	cd /
 	if [ -n "$ROOTFS" ]; then
 		umount ${BOOTFS:+"$BOOTFS"} "$ROOTFS"{/dev,/proc,/sys,}
 
@@ -155,12 +155,24 @@ 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 + $BOOTLOADERPARTSIZEM + $BOOTSIZEM + $ROOTSIZEM - 1))"
 dd if=/dev/zero of="$IMG" conv=notrunc bs=$MB count=1 seek="$OFFSET"
 losetup "$LOOPDEV" "$IMG"
 
 parting mklabel msdos
 
+if [ -n "$BOOTLOADERPART" ] && [ -n "$BOOTLOADERPARTSIZEM" ]; then
+	case "$ARCH" in
+		ppc*)
+			parting mkpart primary ext2 2048s ${BOOTLOADERPARTSIZEM}M
+			CUR_BOUNDARY="$(($CUR_BOUNDARY + $BOOTLOADERPARTSIZEM))"
+			parting set 1 prep on
+			parting set 1 boot on
+			;;
+	esac
+fi
+
 if [ -n "$BOOTPART" ]; then
 	BOOTDEV="$BLOCKDEV$BOOTPART"
 	mkpart "$BOOTSIZEM"
@@ -179,6 +191,10 @@ if [ -n "$BOOTPART" ]; then
 	mkfs."$BOOTFSTYPE" "$LOOPBOOT"
 fi
 
+if [ -n "$BOOTLOADERPART" ] && [ -n "$BOOTLOADERPARTSIZEM" ]; then
+	LOOPBOOTLOADER="/dev/mapper/$(basename "$LOOPDEV")p$BOOTLOADERPART"
+fi
+
 ROOTUUID="$(blkid -s UUID -o value -c /dev/null "$LOOPROOT")"
 if [ -n "$ROOTUUID" ]; then
        ROOTDEV="UUID=$ROOTUUID"
@@ -213,35 +229,66 @@ if [ -n "$BOOTPART" ]; then
 	echo "$BOOTDEV /boot $BOOTFSTYPE defaults 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
+
+# 4.9.76-elbrus-def-alt1.11.1 -> def
+get_label() { echo "${1# *}" | sed -r 's,.*elbrus-([0-9a-z]+)-.*$,\1,'; }
+
+KVERSIONS=
 if [ -s .origver ]; then
-	read KVER < .origver
+	while read kver; do
+		KVERSIONS="$KVERSIONS $kver"
+	done < .origver
 fi
-[ -n "$KVER" ] || fatal "unable to deduce kernel version"
-chroot "$ROOTFS" make-initrd -k "$KVER"
+[ -n "$KVERSIONS" ] || fatal "unable to deduce kernel version"
 rm -f .origver
 
+BOOTLOADER=
+if [ -s .bootloader ]; then
+	read -r BOOTLOADER<.bootloader
+fi
+rm -f .bootloader
+
 # ...target device too
 sed -i "s,$LOOPROOT,$ROOTDEV," "$ROOTFS/etc/fstab"
 
-if [ -f boot.conf ]; then
-	sed -i -e "s,@ROOTUUID@,$ROOTUUID,g" -e "s,@KVER@,$KVER,g" boot.conf
+echo "** KVERSIONS=[$KVERSIONS]" >&2
+
+if [ "`echo $KVERSIONS | wc -w`" = 1 ]; then # 2+ labels
+	echo -e "default=`get_label $KVERSIONS`\n" >> boot.conf
 fi
+
+# FIXME: relies on particular (current) kernel package naming scheme
+for v in $KVERSIONS; do
+	l="`get_label "$v"`"
+	cat >> boot.conf <<EOF
+label=$l
+	partition=0
+	image=/image-$v
+	initrd=/initrd-$v.img
+	cmdline=console=ttyS0,115200 console=tty0 consoleblank=0 hardreset root=UUID=$ROOTUUID
+
+EOF
+done
+
+echo "** start of boot.conf"
+cat boot.conf
+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 "/LABEL=ROOT/d" "$ROOTFS/etc/fstab"
+	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@")
@@ -272,8 +319,29 @@ image=/boot/vmlinuz
 	boot=$BLOCKDEV
 	$LILO_COMMON
 	EOF
-fi
+	;;
+grub-efi)
+	chroot "$ROOTFS" grub-mkconfig -o /boot/grub/grub.cfg
+	chroot "$ROOTFS" grub-install
+	;;
+grub)
+	chroot "$ROOTFS" grub-mkconfig -o /boot/grub/grub.cfg
+	case "$ARCH" in
+		*86*)
+			chroot "$ROOTFS" grub-install --target=i386-pc "$LOOPDEV"
+			;;
+		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

@@ -1,72 +1,57 @@
 ifeq (distro,$(IMAGE_CLASS))
 
-distro/alt-workstation: workstation_groups = $(addprefix workstation/,\
-	10-office 20-networking 30-multimedia 40-virtualization 50-publishing \
-	3rdparty agents blender clamav cloud-clients emulators freecad \
-	ganttproject gnome-peer-to-peer graphics-editing gtk-dictionary \
-	kvm libreoffice mate-usershare pidgin raccess \
-	scanning scribus smartcard sound-editing thunderbird virtualbox \
-	vlc voip-clients)
+ifeq (,$(filter-out i586 x86_64,$(ARCH)))
+distro/alt-workstation: workstation_groups_x86 = $(addprefix workstation/,\
+	3rdparty blender clamav cloud-clients freecad \
+	gtk-dictionary kvm smartcard virtualbox voip-clients)
 
-distro/alt-workstation: distro/.base use/luks  \
-	+installer +power +systemd +pulse +vmguest +wireless +efi \
-	use/kernel/net use/docs/license \
-	use/memtest use/bootloader/grub \
-	use/install2/fs use/install2/vnc use/install2/repo \
-	use/install2/suspend use/x11/xorg use/sound use/xdg-user-dirs \
-	mixin/desktop-installer \
-	use/efi/refind use/efi/memtest86 use/efi/shell use/rescue/base \
-	use/branding/complete \
-	use/fonts/install2 use/install2/fs \
-	use/fonts/otf/adobe use/fonts/otf/mozilla \
-	use/fonts/ttf/google/extra use/fonts/ttf/redhat use/fonts/ttf/ubuntu \
-	use/l10n/default/ru_RU \
-	use/control use/services \
-	use/live/install use/live/suspend use/live/x11 use/live/repo \
-	use/live/rw \
-	use/x11/lightdm/gtk use/docs/manual use/x11/gtk/nm +nm \
-	use/fonts/ttf/google use/domain-client/full \
-	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,volumes-profile-regular)
+distro/alt-workstation: distro/.base +power +vmguest +wireless +efi \
+	mixin/desktop-installer mixin/alt-workstation \
+        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/branding/complete use/docs/license \
+        use/domain-client/full use/x11/amdgpu use/x11/lightdm/gtk
 	@$(call add,INSTALL2_PACKAGES,open-iscsi)
-	@$(call add,COMMON_PACKAGES,vim-console)
+	@$(call add,INSTALL2_PACKAGES,xorg-conf-synaptics)
 	@$(call add,MAIN_PACKAGES,solaar)
-	@$(call add,MAIN_GROUPS,$(workstation_groups))
+	@$(call add,MAIN_GROUPS,$(workstation_groups_x86))
 	@$(call add,MAIN_LISTS,workstation/extras)
 	@$(call add,MAIN_LISTS,$(call tags,xorg vaapi))
-	@$(call add,BASE_LISTS,workstation/base.pkgs)
-	@$(call add,BASE_LISTS,$(call tags,desktop cups))
-	@$(call add,LIVE_LISTS,workstation/live.pkgs)
-	@$(call add,LIVE_LISTS,$(call tags,desktop sane))
-	@$(call add,LIVE_LISTS,$(call tags,desktop office))
-	@$(call add,THE_LISTS,workstation/mate)
-	@$(call add,THE_LISTS,workstation/the.pkgs)
-	@$(call add,THE_LISTS,$(call tags,regular desktop))
-	@$(call add,THE_LISTS,$(call tags,base regular))
-	@$(call add,THE_LISTS,$(call tags,base l10n))
-	@$(call add,THE_LISTS,$(call tags,base desktop))
 	@$(call add,THE_LISTS,$(call tags,archive extra))
 	@$(call add,THE_LISTS,$(call tags,mobile mate))
-	@$(call add,THE_KMODULES,staging)
 	@$(call add,BASE_KMODULES,kvm virtualbox)
 	@$(call add,CLEANUP_BASE_PACKAGES,acpid-events-power)
-	@$(call add,CLEANUP_PACKAGES,xterm)
-	@$(call add,EFI_BOOTARGS,lang=ru_RU)
 	@$(call add,RESCUE_BOOTARGS,nomodeset vga=0)
-	@$(call add,CONTROL,xdg-user-dirs:enabled)
-	@$(call add,SERVICES_ENABLE,sshd)
-	@$(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 set,META_PUBLISHER,BaseALT Ltd)
-	@$(call set,META_VOL_SET,ALT)
-	@$(call set,META_VOL_ID,ALT Workstation)
-	@$(call set,META_APP_ID,8.1/$(ARCH))
-	@$(call set,DOCS,alt-workstation)
+	@$(call add,EFI_BOOTARGS,lang=ru_RU)
+endif
+
+ifeq (,$(filter-out e2k%,$(ARCH)))
+distro/.alt-workstation-base: distro/.e2k-installer mixin/alt-workstation
+	@$(call add,THE_PACKAGES,setup-mate-terminal)
+	@$(call add,THE_PACKAGES,setup-mate-nocomposite)
+	@$(call add,THE_PACKAGES,setup-libgl-dri3-disable)
+	@$(call add,THE_PACKAGES,setup-pulseaudio-plain-module-detect)
+	@$(call add,THE_PACKAGES,firmware-linux)
+	@$(call add,THE_BRANDING,graphics)
+	@$(call set,META_APP_ID,ALT Workstation/$(ARCH))
+
+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 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)
+
+# 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 add,MAIN_GROUPS,workstation/e801-1seat workstation/e801-2seat)
+	@$(call add,INSTALL2_PACKAGES,installer-feature-e2k-801-dualseat)
+endif
 
 endif

conf.d/desktop.mk

@@ -6,25 +6,9 @@ distro/.desktop-base: distro/.installer use/syslinux/ui/vesamenu use/x11/xorg
 
 distro/.desktop-mini: distro/.desktop-base use/x11/xdm +power; @:
 
-mixin/desktop-installer: +net-eth +vmguest \
-	use/x11-autostart use/fonts/install2 use/sound
-	@$(call add,BASE_LISTS, \
-		$(call tags,(base || desktop) && (l10n || network)))
-	@$(call add,INSTALL2_PACKAGES,ntfs-3g)
-	@$(call add,BASE_PACKAGES,os-prober)
-
 distro/.desktop-network: distro/.desktop-mini mixin/desktop-installer; @:
 
-distro/.desktop-extra:
-	@$(call add,BASE_LISTS,$(call tags,(archive || base) && (extra)))
-
-distro/kde4-lite: distro/.desktop-mini \
-	distro/.desktop-network distro/.desktop-extra +kde4-lite
-	@$(call set,KFLAVOURS,std-def)
-
-distro/tde: distro/.desktop-network +tde; @:
 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

@@ -1,16 +1,105 @@
 ifeq (vm,$(IMAGE_CLASS))
 
-vm/e2k-live: vm/bare use/e2k use/deflogin/live use/control/sudo-su
-	@$(call add,THE_PACKAGES,openssh)
+vm/.e2k-bare: vm/.bare use/e2k
+	@$(call add,BASE_PACKAGES,apt)
+
+vm/e2k-live: vm/.e2k-bare use/deflogin/live use/net-ssh use/control/sudo-su
 	@$(call add,THE_LISTS,$(call tags,ve tools))
 
-vm/e2k-rescue: vm/e2k-live use/tty/S0 use/net-eth/dhcp use/services/lvm2-disable
+vm/.e2k-rescue: vm/e2k-live \
+	mixin/e2k-base use/net/etcnet use/services/lvm2-disable
 	@$(call add,THE_PACKAGES,agetty gpm fdisk parted smartmontools pv sshfs)
+	@$(call add,THE_PACKAGES,make-initrd dhcpcd hdparm nfs-clients)
 	@$(call add,THE_LISTS,$(call tags,server && (network || extra)))
 	@$(call add,DEFAULT_SERVICES_DISABLE,gpm mdadm smartd)
 
-vm/e2k-xfce: vm/e2k-rescue use/e2k/x11 use/x11/xfce \
-	use/l10n/default/ru_RU use/fonts/otf/adobe use/fonts/otf/mozilla
-	@$(call add,THE_PACKAGES,xinit xterm firefox mc)
+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)
+
+vm/e2k-mate: vm/.e2k-rescue use/deflogin/live use/x11/mate use/x11/lightdm/gtk \
+	mixin/e2k-base mixin/e2k-desktop mixin/e2k-livecd-install
+	@$(call add,THE_PACKAGES,LibreOffice-integrated LibreOffice-gnome)
+	@$(call add,THE_PACKAGES,LibreOffice-langpack-ru)
+
+vm/e2k-lxqt: vm/.e2k-rescue mixin/e2k-desktop
+	@$(call add,THE_LISTS,$(call tags,desktop && lxqt && !extra))
+
+vm/e2k-builder: vm/.e2k-rescue use/dev/builder/base
+	@$(call add,KFLAVOURS,elbrus-8c elbrus-4c)
+
+vm/e2k-samba-DC: vm/.e2k-rescue
+	@$(call add,BASE_PACKAGES,task-samba-dc glibc-locales net-tools)
+
+endif
+
+ifeq (ve,$(IMAGE_CLASS))
+ve/.e2k-bare: ve/.base use/e2k +sysvinit
+	@$(call add,BASE_PACKAGES,apt)
+
+ve/e2k-installer: ve/.e2k-bare use/repo/main
+	@$(call add,MAIN_PACKAGES,hello)
+
+ve/e2k-git: ve/.e2k-bare use/e2k use/net-ssh use/net-dns/yandex
+	@$(call add,BASE_PACKAGES,git-server nginx)
+	@$(call add,DEFAULT_SERVICES_ENABLE,xinetd git nginx)
+endif
+
+ifeq (distro,$(IMAGE_CLASS))
+distro/.e2k-rescue: distro/.base mixin/e2k-base use/rescue/.base +net-eth
+	@$(call set,META_VOL_ID,ALT Rescue for Elbrus)
+
+distro/e2k-101-rescue: distro/.e2k-rescue
+	@$(call add,KFLAVOURS,elbrus-1cp)
+
+# NB: this one is NOT suited for a particular processor yet!
+# (that's to be done downstream)
+distro/.e2k-installer-base: distro/.base mixin/e2k-base \
+	use/install2 use/install2/packages use/e2k/install2 \
+	use/volumes/regular use/net-ssh +net-eth
+	@$(call set,INSTALLER,altlinux-generic)
+	@$(call set,META_PUBLISHER,BaseALT Ltd)
+	@$(call set,META_VOL_SET,ALT)
+	@$(call set,META_VOL_ID,ALT for Elbrus)
+	@$(call set,META_APP_ID,ALT/$(ARCH))
+	@$(call add,INSTALL2_PACKAGES,agetty)
+	@$(call add,INSTALL2_PACKAGES,ifplugd) ### for net-eth link status
+	@$(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)
+	@$(call set,BRANDING,alt-workstation)	### conflicts w/alt-sisyphus
+
+distro/.e2k-installer-sysv: distro/.e2k-installer-base +sysvinit; @:
+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
+	@$(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
+	@$(call add,THE_PACKAGES,LibreOffice-integrated LibreOffice-gnome)
+	@$(call add,THE_PACKAGES,LibreOffice-langpack-ru)
+
+distro/e2k-4xx-installer: distro/.e2k-installer-sysv use/e2k/install2/4xx
+	@$(call set,INSTALLER,altlinux-server)
+	@$(call add,BASE_PACKAGES,make-initrd-mdadm make-initrd-lvm)
+
+distro/.e2k-installer-mate: distro/.e2k-installer \
+	mixin/e2k-desktop mixin/e2k-mate; @:
 
 endif

conf.d/education.mk

@@ -1,12 +1,70 @@
-# Education Set
+# ALT Education
 
 ifeq (distro,$(IMAGE_CLASS))
 
-distro/education-junior: distro/.installer use/slinux/full \
-	use/l10n/default/ru_RU +vmguest
+distro/education: distro/alt-education
+distro/alt-education: distro/.installer \
+	+systemd \
+	use/memtest \
+	use/services \
+	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/ntp/chrony \
+	use/isohybrid use/x11/xorg use/x11/lightdm/gtk +pulse use/luks \
+	+plymouth +nm use/x11/gtk/nm +wireless \
+	use/xdg-user-dirs/deep use/install2/fonts \
+	use/branding/complete
 	@$(call set,INSTALLER,junior)
-	@$(call set,BRANDING,school-junior)
-	@$(call set,META_VOL_SET,Education Junior)
-	@$(call add,THE_LISTS,education/desktop)
-
+	@$(call set,BRANDING,alt-education)
+	@$(call add,THE_BRANDING,menu xfce-settings system-settings)
+	@$(call set,META_APP_ID,$(DISTRO_VERSION)/$(ARCH))
+	@$(call set,META_VOL_SET,ALT Education 8.2)
+	@$(call set,META_PUBLISHER,BaseALT Ltd)
+	@$(call add,INSTALL2_PACKAGES,disable-usb-autosuspend)
+	@$(call add,INSTALL2_PACKAGES,installer-feature-samba-usershares-stage2)
+	@$(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,MAIN_LISTS,slinux/not-install-full)
+	@$(call add,BASE_LISTS,education/base)
+	@$(call add,BASE_LISTS,workstation/3rdparty)
+	@$(call add,THE_LISTS,education/misc)
+	@$(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)
+	@$(call set,KFLAVOURS,std-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,usbutils pv syslinux lftp links2 openssh-server xinput xorg-drv-libinput)
+	@$(call add,THE_PACKAGES,net-tools fdisk gdisk parted partclone)
+	@$(call add,THE_PACKAGES,xorg-drv-vmware xorg-drv-vmmouse disable-usb-autosuspend)
+	@$(call add,THE_PACKAGES,bluez pulseaudio-bluez)
+	@$(call add,THE_PACKAGES,alterator-fbi)
+	@$(call add,BASE_PACKAGES,os-prober)
+	@$(call add,BASE_PACKAGES,guest-account)
+	@$(call add,BASE_PACKAGES,nextcloud-client)
+	@$(call add,MAIN_PACKAGES,iperf3 owamp-server)
+	@$(call add,MAIN_PACKAGES,stellarium)
+	@$(call add,MAIN_PACKAGES,lmms)
+	@$(call add,THE_LISTS,$(call tags,base regular))
+	@$(call add,STAGE1_MODLISTS,stage2-mmc)
+	@$(call set,GLOBAL_LIVE_NO_CLEANUPDB,true)
+	@$(call add,LIVE_PACKAGES,livecd-timezone)
+	@$(call add,LIVE_LISTS,slinux/network-base)
+	@$(call add,STAGE2_PACKAGES,xorg-conf-libinput-touchpad)
+	@$(call add,STAGE2_PACKAGES,chrony)
+	@$(call add,STAGE1_MODLISTS,stage2-mmc)
+	@$(call add,SERVICES_ENABLE,bluetoothd sshd bind crond alteratord cups ahttpd)
 endif

conf.d/live.mk

@@ -1,10 +1,10 @@
 # live images
 ifeq (distro,$(IMAGE_CLASS))
 
-distro/dos: distro/.init use/dos use/syslinux/ui/menu
+distro/dos: distro/.boot use/dos use/syslinux/ui/menu
 	@$(call set,RELNAME,ALT FreeDOS)
 
-distro/rescue: distro/.base use/rescue use/syslinux/ui/menu \
+distro/rescue: distro/.base use/rescue use/syslinux/ui/menu use/stage2/cifs \
 	use/efi/signed use/efi/refind use/efi/shell; @:
 
 distro/rescue-remote: distro/.base use/rescue/base use/stage2/net-eth
@@ -12,7 +12,7 @@ distro/rescue-remote: distro/.base use/rescue/base use/stage2/net-eth
 	@$(call set,SYSLINUX_DIRECT,1)
 	@$(call add,RESCUE_PACKAGES,livecd-net-eth)
 
-distro/syslinux: distro/.init \
+distro/syslinux: distro/.boot \
 	use/syslinux/localboot.cfg use/syslinux/ui/vesamenu use/hdt; @:
 
 distro/.live-base: distro/.base use/live/base use/power/acpi/button; @:
@@ -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
@@ -107,8 +106,6 @@ distro/live-0ad: distro/.live-games
 	@$(call add,LIVE_PACKAGES,0ad livecd-0ad)
 	@$(call try,HOMEPAGE,http://play0ad.com/)
 
-distro/live-e17: distro/.live-desktop-ru use/x11/e17 use/x11/lightdm/gtk; @:
-
 distro/live-gimp: distro/live-icewm use/live/ru
 	@$(call add,LIVE_LISTS,$(call tags,desktop sane))
 	@$(call add,LIVE_PACKAGES,gimp tintii immix fim)
@@ -117,8 +114,6 @@ 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 \
 	use/live/base use/live/privacy use/live/ru \

conf.d/mixin-basealt.mk

@@ -0,0 +1,53 @@
+# shared across all supported arches, can be complemented per arch
+
+mixin/alt-workstation: workstation_groups = $(addprefix workstation/,\
+	10-office 20-networking 30-multimedia 40-virtualization 50-publishing \
+	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 \
+	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 \
+	use/fonts/ttf/google use/fonts/ttf/google/extra \
+	use/fonts/ttf/redhat use/fonts/ttf/ubuntu \
+	use/branding use/control use/services \
+	use/sound use/xdg-user-dirs \
+	use/docs/manual use/docs/indexhtml \
+	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)
+	@$(call add,LIVE_LISTS,$(call tags,desktop sane))
+	@$(call add,LIVE_LISTS,$(call tags,desktop office))
+	@$(call add,THE_LISTS,workstation/mate)
+	@$(call add,THE_LISTS,workstation/the.pkgs)
+	@$(call add,THE_LISTS,$(call tags,regular desktop))
+	@$(call add,THE_LISTS,$(call tags,base regular))
+	@$(call add,THE_LISTS,$(call tags,base l10n))
+	@$(call add,THE_LISTS,$(call tags,base desktop))
+	@$(call add,THE_KMODULES,staging)
+	@$(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_ENABLE,cups smb nmb httpd2 bluetoothd libvirtd)
+	@$(call add,DEFAULT_SERVICES_ENABLE,fstrim.timer)
+	@$(call add,DEFAULT_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,DOCS,alt-workstation)

conf.d/mixin.mk

@@ -0,0 +1,147 @@
+### various mixins with their origin
+
+### desktop.mk
+mixin/desktop-installer: +net-eth +vmguest \
+	use/bootloader/os-prober use/x11-autostart use/fonts/install2 use/sound
+	@$(call add,BASE_LISTS, \
+		$(call tags,(base || desktop) && (l10n || network)))
+	@$(call add,INSTALL2_PACKAGES,ntfs-3g)
+
+### e2k.mk
+mixin/e2k-base: use/tty/S0 use/net-eth/dhcp; @:
+
+mixin/e2k-desktop: use/e2k/x11 use/l10n/default/ru_RU \
+	use/browser/firefox/esr use/browser/firefox/i18n \
+	use/fonts/otf/adobe use/fonts/otf/mozilla
+	@$(call add,THE_PACKAGES,xinit xterm mc)
+	@$(call add,THE_PACKAGES,fonts-bitmap-terminus)
+
+mixin/e2k-livecd-install: use/e2k/x11
+	@$(call add,THE_PACKAGES,livecd-install alterator-notes)
+	@$(call add,THE_PACKAGES,fdisk hdparm rsync openssh vim-console)
+	@$(call add,THE_PACKAGES,apt-repo)
+
+mixin/e2k-mate: use/e2k/x11 use/x11/xorg use/fonts/install2 \
+	use/deflogin/live use/deflogin/xgrp \
+	use/x11/mate use/x11/lightdm/slick \
+	use/fonts/otf/adobe use/fonts/otf/mozilla \
+	use/fonts/ttf/google use/fonts/ttf/redhat
+	@$(call set,INSTALLER,altlinux-desktop)
+	@$(call add,THE_BRANDING,mate-settings)
+	@$(call add,THE_BRANDING,alterator)
+	@$(call add,THE_BRANDING,graphics)
+	@$(call add,THE_PACKAGES,setup-mate-terminal)
+	@$(call add,THE_PACKAGES,setup-mate-nocomposite)
+	@$(call add,THE_PACKAGES,alterator-standalone)
+	@$(call add,THE_PACKAGES,terminfo-extra)
+	@$(call add,THE_PACKAGES,ethtool net-tools ifplugd)
+	@$(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 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 add,THE_PACKAGES,upower bluez)
+	@$(call add,DEFAULT_SERVICES_DISABLE,gssd idmapd krb5kdc rpcbind)
+	@$(call add,DEFAULT_SERVICES_ENABLE,bluetoothd)
+	@$(call add,DEFAULT_SERVICES_ENABLE,cups)
+
+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
+	@$(call add,LIVE_PACKAGES,livecd-install-wmaker)
+	@$(call add,LIVE_PACKAGES,installer-feature-no-xconsole-stage3)
+	@$(call add,MAIN_PACKAGES,wmgtemp wmhdaps wmpomme wmxkbru xxkb)
+	@$(call add,THE_PACKAGES,wmaker-autostart-polkit-gnome)
+
+mixin/regular-icewm: use/fonts/ttf/redhat +icewm +nm
+	@$(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 polkit-gnome)
+
+# 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
+	@$(call add,THE_BRANDING,graphics)
+
+mixin/regular-cinnamon: use/x11/cinnamon \
+	use/fonts/ttf/google use/net/nm/mmgui use/im
+	@$(call add,THE_PACKAGES,thunderbird-ru)	### l10n
+
+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)
+	@$(call set,THE_IMAGEWRITER,rosa-imagewriter)
+
+mixin/regular-xfce: use/x11/xfce use/x11/gtk/nm +nm \
+	use/fonts/ttf/redhat use/fonts/ttf/google/extra
+	@$(call add,THE_PACKAGES,xfce-polkit)
+	@$(call add,THE_BRANDING,xfce-settings)
+
+mixin/regular-xfce-sysv: \
+	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,qasmixer)
+	@$(call add,THE_PACKAGES,xfce4-screensaver)
+	@$(call add,THE_PACKAGES,sysstat leafpad)
+	@$(call add,THE_PACKAGES,nload)
+	@$(call add,THE_PACKAGES,NetworkManager-l2tp-gtk)
+	@$(call add,THE_PACKAGES,NetworkManager-tui)
+
+mixin/regular-lxde: use/x11/lxde use/x11/gtk/nm use/im +nm
+	@$(call add,THE_LISTS,$(call tags,desktop gvfs))
+	@$(call add,THE_PACKAGES,qasmixer qpdfview)
+	@$(call set,THE_IMAGEWRITER,rosa-imagewriter)
+
+mixin/regular-lxqt: use/x11/lxqt use/x11/gtk/nm +nm
+	@$(call set,THE_IMAGEWRITER,rosa-imagewriter)
+
+mixin/regular-mate: use/x11/mate use/fonts/ttf/google use/x11/gtk/nm +nm
+	@$(call add,THE_LISTS,$(call tags,mobile mate))
+
+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
+#     which will change propagator's behaviour to probe additional
+#     filesystems (ro but no loop) thus potentially writing to
+#     an unrecovered filesystem's journal
+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
+	@$(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)
+
+mixin/opennebula-context:
+	@$(call add,BASE_PACKAGES,opennebula-context)
+	@$(call add,DEFAULT_SERVICES_ENABLE,one-context-local one-context)
+
+mixin/icewm: use/x11/lightdm/gtk +icewm; @:

conf.d/p7.mk

@@ -1,49 +0,0 @@
-# p7 base kits
-
-mixin/p7: use/browser/firefox/esr
-	@$(call set,BRANDING,altlinux-starterkit)
-	@$(call set,IMAGE_FLAVOUR,$(subst altlinux-p7-,,$(IMAGE_NAME)))
-	@$(call set,META_VOL_ID,ALT Linux p7 $$(IMAGE_FLAVOUR)/$(ARCH))
-
-ifeq (distro,$(IMAGE_CLASS))
-
-### kludge compatibility: introspection stub for main.mk :-/
-distro/altlinux-p7-cinnamon: distro/regular-cinnamon mixin/p7; @:
-distro/altlinux-p7-e17: distro/regular-e17 mixin/p7; @:
-distro/altlinux-p7-icewm: distro/regular-icewm mixin/p7; @:
-distro/altlinux-p7-gnome3: distro/regular-gnome3 mixin/p7; @:
-distro/altlinux-p7-gnustep: distro/regular-gnustep mixin/p7; @:
-distro/altlinux-p7-kde4: distro/regular-kde4 mixin/p7; @:
-distro/altlinux-p7-lxde: distro/regular-lxde mixin/p7; @:
-distro/altlinux-p7-lxqt: distro/regular-lxqt mixin/p7; @:
-distro/altlinux-p7-lxqt-sysv: distro/regular-lxqt-sysv mixin/p7; @:
-distro/altlinux-p7-mate: distro/regular-mate mixin/p7; @:
-distro/altlinux-p7-rescue: distro/regular-rescue mixin/p7; @:
-distro/altlinux-p7-tde: distro/regular-tde mixin/p7; @:
-distro/altlinux-p7-tde-sysv: distro/regular-tde-sysv mixin/p7; @:
-distro/altlinux-p7-wmaker: distro/regular-wmaker mixin/p7; @:
-distro/altlinux-p7-xfce: distro/regular-xfce mixin/p7; @:
-distro/altlinux-p7-xfce-sysv: distro/regular-xfce-sysv mixin/p7; @:
-
-distro/altlinux-p7-sysv-tde: distro/regular-sysv-tde mixin/p7; @:
-
-distro/altlinux-p7-jeos: distro/regular-jeos mixin/p7; @:
-distro/altlinux-p7-jeos-ovz: distro/regular-jeos-ovz mixin/p7; @:
-distro/altlinux-p7-server: distro/regular-server mixin/p7; @:
-distro/altlinux-p7-server-ovz: distro/regular-server-ovz mixin/p7; @:
-distro/altlinux-p7-server-hyperv: distro/regular-server-hyperv mixin/p7; @:
-distro/altlinux-p7-server-samba4: distro/regular-server-samba4 mixin/p7; @:
-
-distro/altlinux-p7-builder: distro/regular-builder mixin/p7; @:
-
-endif
-
-ifeq (ve,$(IMAGE_CLASS))
-ve/altlinux-p7-ovz-generic: ve/generic mixin/p7; @:
-ve/altlinux-p7-ovz-pgsql94: ve/pgsql94 mixin/p7; @:
-endif
-
-ifeq (vm,$(IMAGE_CLASS))
-vm/altlinux-p7-vm-net: vm/net mixin/p7; @:
-vm/altlinux-p7-vagrant: vm/vagrant-base mixin/p7; @:
-endif

conf.d/p8.mk

@@ -5,15 +5,19 @@ mixin/p8: use/browser/firefox/esr
 	@$(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; @:
+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; @:
+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; @:
@@ -34,18 +38,22 @@ 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,62 @@
+# 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/regular-cinnamon mixin/p9; @:
+distro/alt-p9-icewm: distro/regular-icewm mixin/p9; @:
+distro/alt-p9-gnome3: distro/regular-gnome3 mixin/p9; @:
+distro/alt-p9-gnustep: distro/regular-gnustep mixin/p9; @:
+distro/alt-p9-kde5: distro/regular-kde5 mixin/p9; @:
+distro/alt-p9-lxde: distro/regular-lxde mixin/p9; @:
+distro/alt-p9-lxde-sysv: distro/regular-lxde-sysv mixin/p9; @:
+distro/alt-p9-lxqt: distro/regular-lxqt mixin/p9; @:
+distro/alt-p9-lxqt-sysv: distro/regular-lxqt-sysv mixin/p9; @:
+distro/alt-p9-mate: distro/regular-mate mixin/p9; @:
+distro/alt-p9-rescue: distro/regular-rescue mixin/p9; @:
+distro/alt-p9-wmaker: distro/regular-wmaker mixin/p9; @:
+distro/alt-p9-xfce: distro/regular-xfce mixin/p9; @:
+distro/alt-p9-xfce-sysv: distro/regular-xfce-sysv mixin/p9; @:
+distro/alt-p9-enlightenment: distro/regular-enlightenment mixin/p9; @:
+distro/alt-p9-sysv-xfce: distro/regular-sysv-xfce mixin/p9; @:
+
+distro/alt-p9-jeos: distro/regular-jeos mixin/p9; @:
+distro/alt-p9-jeos-ovz: distro/regular-jeos-ovz mixin/p9; @:
+distro/alt-p9-server: distro/regular-server mixin/p9; @:
+distro/alt-p9-server-ovz: distro/regular-server-ovz mixin/p9; @:
+distro/alt-p9-server-hyperv: distro/regular-server-hyperv mixin/p9; @:
+distro/alt-p9-server-samba4: distro/regular-server-samba4 mixin/p9; @:
+distro/alt-p9-server-pve: distro/regular-server-pve mixin/p9; @:
+distro/alt-p9-server-lxd: distro/regular-server-lxd mixin/p9; @:
+
+distro/alt-p9-builder: distro/regular-builder mixin/p9; @:
+
+distro/alt-p9-engineering: distro/regular-engineering mixin/p9; @:
+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/regular-jeos-systemd mixin/p9
+vm/alt-p9-jeos-sysv: vm/regular-jeos-sysv mixin/p9
+vm/alt-p9-icewm: vm/regular-icewm mixin/p9
+vm/alt-p9-lxde: vm/regular-lxde mixin/p9
+vm/alt-p9-lxqt: vm/regular-lxqt mixin/p9
+vm/alt-p9-mate: vm/regular-mate mixin/p9
+vm/alt-p9-xfce: vm/regular-xfce mixin/p9
+
+endif

conf.d/regular.mk

@@ -6,53 +6,45 @@ distro/.regular-bare: distro/.base +net-eth use/kernel/net use/docs/license
 	@$(call try,SAVE_PROFILE,yes)
 
 # base target (for most images)
-distro/.regular-base: distro/.regular-bare use/vmguest use/memtest +efi; @:
+distro/.regular-base: distro/.regular-bare use/vmguest use/memtest +efi
+	@$(call add,STAGE1_MODLISTS,stage2-mmc)
 
 # graphical target (not enforcing xorg drivers or blobs)
-distro/.regular-x11: distro/.regular-base +vmguest +wireless \
-	use/live/x11 use/live/install use/live/suspend \
-	use/live/repo use/live/rw use/luks use/x11/wacom use/ntp/client \
-	use/branding use/browser/firefox/live use/browser/firefox/i18n \
-	use/browser/firefox/h264 use/services/lvm2-disable
-	@$(call add,LIVE_PACKAGES,volumes-profile-regular)
-	@$(call add,LIVE_LISTS,$(call tags,(base || desktop) && regular))
+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
+	@$(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)
 
-# common WM live/installer bits
-mixin/regular-desktop: use/x11/xorg use/sound use/xdg-user-dirs
-	@$(call add,THE_PACKAGES,pam-limits-desktop)
-	@$(call add,THE_PACKAGES,installer-feature-desktop-other-fs-stage2)
-	@$(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)
-
 # 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
+	use/syslinux/ui/gfxboot use/firmware/laptop +systemd
 	@$(call add,THE_BRANDING,bootloader)
-	@$(call add,THE_PACKAGES,upower bluez)
-	@$(call add,THE_PACKAGES,disable-usb-autosuspend)
-	@$(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/gtk +plymouth; @:
-distro/.regular-sysv: distro/.regular-wm +sysvinit; @:
+distro/.regular-gtk: distro/.regular-desktop use/x11/lightdm/slick +plymouth; @:
+distro/.regular-sysv: distro/.regular-wm +elogind; @:
+
 distro/.regular-sysv-gtk: distro/.regular-sysv use/syslinux/ui/gfxboot \
 	use/x11/gdm2.20; @:
 
 distro/.regular-install: distro/.regular-base +installer +sysvinit +power \
 	use/branding use/bootloader/grub use/luks \
-	use/install2/fs use/install2/vnc use/install2/repo
+	use/install2/fs use/install2/vnc use/install2/repo \
+	use/efi/refind
+	@$(call add,INSTALL2_PACKAGES,fdisk)
+	@$(call add,INSTALL2_PACKAGES,xorg-conf-synaptics)
 	@$(call add,THE_LISTS,$(call tags,base regular))
 	@$(call add,INSTALL2_BRANDING,alterator notes)
 	@$(call add,THE_BRANDING,alterator)
@@ -69,9 +61,19 @@ distro/.regular-jeos-base: distro/.regular-bare +sysvinit \
 	@$(call add,THE_PACKAGES,apt basesystem dhcpcd vim-console)
 	@$(call add,THE_LISTS,openssh)
 
+ifeq (,$(filter-out i586 x86_64,$(ARCH)))
+distro/.regular-jeos-bootloader: use/bootloader/lilo ; @:
+else
+ifeq (,$(filter-out $(GRUB_ARCHES),$(ARCH)))
+distro/.regular-jeos-bootloader: use/bootloader/grub ; @:
+else
+distro/.regular-jeos-bootloader: ; @:
+endif
+endif
+
 # ...and for somewhat bare distros
 distro/.regular-jeos: distro/.regular-jeos-base \
-	use/bootloader/lilo use/syslinux/lateboot.cfg \
+	distro/.regular-jeos-bootloader use/syslinux/lateboot.cfg \
 	use/install2/cleanup/everything use/install2/cleanup/kernel/everything \
 	use/cleanup/jeos
 	@$(call add,BASE_KMODULES,guest scsi vboxguest)
@@ -80,11 +82,12 @@ distro/.regular-jeos: distro/.regular-jeos-base \
 # NB:
 # - stock cleanup is not enough (or installer-common-stage3 deps soaring)
 distro/regular-jeos: distro/.regular-jeos use/cleanup/jeos/full \
-	use/install2/vmguest use/vmguest/base
+	use/volumes/jeos use/install2/vmguest use/vmguest/bare
+	@$(call add,BASE_PACKAGES,nfs-utils gdisk)
 	@$(call add,MAIN_PACKAGES,firmware-linux)
-	@$(call add,INSTALL2_PACKAGES,volumes-profile-jeos)
-	@$(call add,CLEANUP_PACKAGES,'glib2*' libffi 'libltdl*')
+	@$(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)
 
@@ -93,97 +96,63 @@ distro/regular-jeos-ovz: distro/.regular-jeos \
 	use/server/ovz-base use/control/server/ldv use/firmware
 	@$(call add,THE_PACKAGES,ipmitool lm_sensors3 mailx)
 
-distro/.regular-install-x11: distro/.regular-install \
-	use/install2/suspend mixin/regular-desktop +vmguest +wireless
+distro/.regular-install-x11: distro/.regular-install +vmguest +wireless \
+	use/install2/suspend mixin/regular-desktop mixin/regular-x11
 	@$(call set,INSTALLER,altlinux-desktop)
-	@$(call add,THE_LISTS,$(call tags,regular desktop))
 
 # assumes somewhat more experienced user, mostly for sysv variants
 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/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/net-eth/dhcp use/efi/shell use/rescue/base \
+	use/init/sysv/elogind
 	@$(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 +nm \
-	use/x11/lightdm/gtk use/init/sysv/polkit use/deflogin/sysv/nm \
-	use/browser/chromium use/fonts/ttf/redhat
-	@$(call add,LIVE_LISTS,$(call tags,desktop nm))
-	@$(call add,LIVE_LISTS,$(call tags,regular icewm))
-	@$(call add,LIVE_PACKAGES,mnt winswitch xpra)
-	@$(call add,LIVE_PACKAGES,icewm-startup-networkmanager)
+distro/regular-icewm: distro/.regular-sysv-gtk mixin/regular-icewm \
+	use/browser/chromium
 	@$(call set,KFLAVOURS,un-def)
 
-mixin/regular-wmaker: use/efi/refind use/syslinux/ui/gfxboot \
-	use/fonts/ttf/redhat use/x11/wmaker
-	@$(call add,LIVE_PACKAGES,livecd-install-wmaker)
-	@$(call add,LIVE_PACKAGES,installer-feature-no-xconsole-stage3)
-	@$(call add,MAIN_PACKAGES,wmgtemp wmhdaps wmpomme wmxkbru xxkb)
-
 # 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
 	@$(call add,LIVE_PACKAGES,wdm wmxkbru)
 
-# 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
-	@$(call add,THE_BRANDING,graphics)
-
 distro/regular-gnustep: distro/.regular-sysv \
 	mixin/regular-wmaker mixin/regular-gnustep; @:
 distro/regular-gnustep-systemd: distro/.regular-wm +systemd \
 	mixin/regular-wmaker mixin/regular-gnustep; @:
 
-mixin/regular-xfce: use/x11/xfce use/fonts/ttf/redhat use/x11/gtk/nm +nm; @:
-
 distro/regular-xfce: distro/.regular-gtk mixin/regular-xfce \
 	use/x11/xfce/full use/domain-client
 	@$(call set,KFLAVOURS,un-def)
 
-mixin/regular-xfce-sysv: use/init/sysv/polkit use/deflogin/sysv/nm \
-	use/x11/lightdm/gtk \
-	use/browser/firefox use/browser/firefox/classic \
-	use/browser/firefox/i18n use/browser/firefox/h264 \
-	use/fonts/otf/adobe use/fonts/otf/mozilla
-	@$(call add,THE_PACKAGES,xfce4-mixer pm-utils elinks mpg123)
-
 distro/regular-xfce-sysv: distro/.regular-sysv-gtk \
 	mixin/regular-xfce mixin/regular-xfce-sysv; @:
 
-mixin/regular-lxde: use/x11/lxde use/fonts/infinality \
-	use/x11/gtk/nm use/im +nm
-	@$(call add,LIVE_LISTS,$(call tags,desktop gvfs))
+distro/regular-sysv-xfce: distro/.regular-install-x11-full \
+	mixin/regular-xfce mixin/regular-xfce-sysv; @:
 
-distro/regular-lxde: distro/.regular-gtk mixin/regular-lxde
-	@$(call add,THE_PACKAGES,lxde)
-
-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-lxde-sysv: distro/.regular-sysv-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,desktop sane))
+distro/regular-mate: distro/.regular-gtk mixin/regular-mate use/domain-client
 	@$(call add,LIVE_LISTS,$(call tags,base smartcard))
 
-distro/regular-e17: distro/.regular-gtk use/x11/e17 use/fonts/infinality; @:
+distro/regular-mate-sysv: distro/.regular-sysv-gtk mixin/regular-mate; @:
 
-distro/regular-enlightenment: distro/.regular-gtk \
-	use/x11/enlightenment use/fonts/infinality; @:
+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/infinality use/fonts/ttf/google \
-	use/net/nm/mmgui use/im; @:
+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 \
@@ -191,57 +160,19 @@ distro/regular-gnome3: distro/.regular-desktop +plymouth +nm \
 	@$(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)
+	@$(call add,LIVE_PACKAGES,gnome-flashback screenpen)
 
-# reusable bits
-mixin/regular-tde: +tde \
-	use/syslinux/ui/gfxboot use/browser/firefox/classic use/fonts/ttf/redhat
-	@$(call add,THE_PACKAGES,kdeedu)
-	@$(call add,DEFAULT_SERVICES_DISABLE,upower bluetoothd)
-
-distro/regular-tde: distro/.regular-desktop mixin/regular-tde +plymouth \
-	use/x11/gtk/nm use/net/nm/mmgui
-
-distro/regular-tde-sysv: distro/.regular-sysv mixin/regular-tde \
-	use/net-eth/dhcp use/efi/refind; @:
-
-distro/regular-kde4: distro/.regular-desktop use/x11/kde4/nm use/x11/kdm4 \
-	use/browser/konqueror4 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)
-
-mixin/regular-lxqt: use/x11/lxqt use/x11/sddm \
-	use/browser/qupzilla use/x11/gtk/nm +nm +plymouth
-	@$(call set,THE_IMAGEWRITER,rosa-imagewriter)
-
-distro/regular-lxqt: distro/.regular-desktop mixin/regular-lxqt; @:
+distro/regular-lxqt: distro/.regular-desktop mixin/regular-lxqt +plymouth \
+	use/browser/falkon use/x11/sddm
+	@$(call add,THE_LISTS,$(call tags,lxqt desktop))
 
 distro/regular-lxqt-sysv: distro/.regular-sysv mixin/regular-lxqt \
-	use/net-eth/dhcp use/efi/refind; @:
-
-distro/regular-sugar: distro/.regular-gtk use/x11/sugar; @:
-
-distro/regular-leechcraft: distro/.regular-desktop \
-	use/x11/leechcraft use/x11/lightdm/lxqt +pulse; @:
+	use/net-eth/dhcp; @:
 
 distro/regular-kde5: distro/.regular-desktop \
-	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)
-	@$(call set,THE_IMAGEWRITER,rosa-imagewriter)
+	mixin/regular-kde5 use/domain-client use/x11/sddm +plymouth; @:
 
-# NB: never ever use/syslinux/ui/gfxboot here as gfxboot mangles
-#     kernel cmdline resulting in method:disk instead of method:cdrom
-#     which will change propagator's behaviour to probe additional
-#     filesystems (ro but no loop) thus potentially writing to
-#     an unrecovered filesystem's journal
-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; @:
+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 \
@@ -257,14 +188,6 @@ 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; @:
-
 distro/.regular-server-base: distro/.regular-install \
 	use/server/base use/stage2/kms
 	@$(call add,THE_LISTS,$(call tags,server && (regular || network)))
@@ -272,11 +195,14 @@ distro/.regular-server-base: distro/.regular-install \
 	@$(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/cleanup/libs
+	use/server/mini use/firmware/qlogic use/rescue/base \
+	use/ntp/client use/cleanup/libs
 	@$(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)
 
 distro/.regular-server-managed: distro/.regular-server
@@ -286,7 +212,7 @@ distro/.regular-server-managed: distro/.regular-server
 	@$(call add,DEFAULT_SERVICES_DISABLE,ahttpd alteratord)
 
 distro/regular-server: distro/.regular-server-managed \
-	use/server/groups/base use/install2/vnc/full
+	use/server/groups/base use/dev/groups/builder use/install2/vnc/full
 	@$(call add,MAIN_GROUPS,server/sambaDC)
 	@$(call add,MAIN_GROUPS,tools/hyperv)
 
@@ -300,40 +226,52 @@ distro/regular-server-hyperv: distro/.regular-server-managed
 	@$(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; @:
-
-distro/regular-server-openstack-sysv: distro/.regular-server-openstack +sysvinit
-	@$(call add,DEFAULT_SERVICES_DISABLE,lvm2-lvmetad)
-
-distro/regular-server-pve: distro/.regular-server-base \
-	use/firmware/qlogic +efi +systemd
+distro/regular-server-pve: distro/.regular-server-systemd \
+	use/kernel/server use/firmware/qlogic +efi
 	@$(call set,BASE_BOOTLOADER,grub)
 	@$(call set,INSTALLER,altlinux-server)
 	@$(call add,INSTALL2_PACKAGES,installer-feature-pve)
 	@$(call add,THE_PACKAGES,pve-manager nfs-clients su)
 	@$(call add,THE_PACKAGES,bridge-utils dhcpcd faketime tzdata postfix)
-	@$(call add,THE_KMODULES,ipset kvm)
 	@$(call add,DEFAULT_SERVICES_DISABLE,pve-manager pve-cluster \
 		pve-firewall pve-ha-crm pve-manager pveproxy pvedaemon \
 		pvefw-logger pve-ha-lrm pvenetcommit pvestatd spiceproxy)
 
-distro/regular-builder: distro/.regular-bare \
+distro/regular-builder: distro/.regular-bare mixin/regular-builder \
 	use/dev/builder/full +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/stage2/net-eth
+	@$(call add,THE_PACKAGES,ccache cifs-utils wodim)
 
 distro/regular-server-samba4: distro/.regular-server-managed
 	@$(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)
+
+endif
+
+ifeq (ve,$(IMAGE_CLASS))
+ve/docker-sisyphus: ve/docker; @:
 endif

conf.d/server-v.mk

@@ -0,0 +1,146 @@
+# 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: 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 use/efi/signed use/bootloader/grub \
+	use/memtest use/rescue/base \
+	use/init/systemd use/init/systemd/settings/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,PINNED_PACKAGES,branding-alt-server-v-alterator:Essential)
+	@$(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.0.0 $(ARCH))
+	@$(call set,META_PUBLISHER,BaseALT Ltd)
+	@$(call set,META_VOL_SET,ALT)
+	@$(call set,META_APP_ID,ALT Server-V 9.0.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)
+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/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 set,BOOTVGA,)
+#	@$(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,16 @@
+# 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_SET,Simply Linux live)
+	@$(call set,META_VOL_ID,Simply Linux live/$(ARCH))
+
+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-full-blender slinux/graphics slinux/graphics-full-inkscape slinux/graphics-full-shotwell slinux/graphics-full-synfigstudio slinux/multimedia-full-audacity slinux/multimedia-base slinux/multimedia-full-cheese slinux/multimedia slinux/multimedia-full-pitivi slinux/multimedia-full-sound-juicer slinux/network-base)
+	@$(call set,META_VOL_SET,Simply Linux)
+	@$(call set,META_VOL_ID,Simply Linux/$(ARCH))
+
+endif

conf.d/t7.mk

@@ -1,13 +0,0 @@
-# t7 base kits
-
-mixin/t7:
-	@$(call set,BRANDING,altlinux-starterkit) ### needs changing
-
-ifeq (distro,$(IMAGE_CLASS))
-
-distro/altlinux-t7-gnustep: distro/regular-gnustep mixin/t7; @:
-distro/altlinux-t7-gnustep-systemd: distro/regular-gnustep-systemd mixin/t7; @:
-distro/altlinux-t7-tde: distro/regular-tde mixin/t7; @:
-distro/altlinux-t7-sysv-tde: distro/regular-sysv-tde mixin/t7; @:
-
-endif

conf.d/test.mk

@@ -3,7 +3,7 @@ ifneq (,$(DEBUG))
 
 ifeq (distro,$(IMAGE_CLASS))
 
-distro/syslinux-auto: distro/.init use/hdt use/syslinux/timeout/1; @:
+distro/syslinux-auto: distro/.boot use/hdt use/syslinux/timeout/1; @:
 distro/syslinux-noescape: distro/syslinux-auto use/syslinux/noescape.cfg; @:
 
 distro/live-systemd: distro/.base use/live/base +systemd; @:
@@ -70,28 +70,6 @@ distro/elinks: distro/.base use/pid1/net
 
 endif # IMAGE_CLASS: distro
 
-ifeq (ve,$(IMAGE_CLASS))
-
-ifeq (centos,$(REPO))
-
-ve/.centos-base: ve/.bare
-	@$(call set,IMAGE_INIT_LIST,hasher-pkg-init)
-
-ve/centos: ve/.centos-base
-	@$(call add,BASE_PACKAGES,openssh-server)
-
-endif # REPO: centos
-
-ifeq (opensuse,$(REPO))
-
-ve/.opensuse-base: ve/.bare
-	@$(call set,IMAGE_INIT_LIST,hasher-pkg-init)
-	@$(call add,BASE_PACKAGES,aaa_base)
-
-endif # REPO: opensuse
-
-endif # IMAGE_CLASS: ve
-
 ifeq (vm,$(IMAGE_CLASS))
 
 vm/net-static: vm/bare use/net-eth use/net-ssh

conf.d/ve.mk

@@ -14,19 +14,16 @@ 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/repo
-	@$(call add,BASE_PACKAGES,vim-console git-core bash-completion zsh)
-	@$(call add,BASE_PACKAGES,su hasher mkimage-profiles rpm-build)
-	@$(call add,BASE_PACKAGES,rsync screen parallel pv)
-	@$(call add,BASE_PACKAGES,fdisk e2fsprogs iproute2 net-tools)
+ve/builder: ve/base use/dev/builder/base use/repo
 	@$(call add,BASE_LISTS,openssh)
 
 # this should be more or less convenient
 ve/generic: ve/base use/repo
-	@$(call add,BASE_PACKAGES,vim-console etckeeper)
+	@$(call add,BASE_PACKAGES,vim-console etckeeper apt-rsync)
 	@$(call add,BASE_LISTS,openssh \
 		$(call tags,base && (server || network || security || pkg)))
 
@@ -40,8 +37,11 @@ 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/systemd-bare: ve/.apt use/net/networkd +systemd \
 	use/control/sudo-su use/repo use/net-ssh
 	@$(call add,BASE_PACKAGES,interactivesystem su)
 
+ve/systemd-base: ve/systemd-bare
+	@$(call add,BASE_PACKAGES,glibc-gconv-modules glibc-locales tzdata)
+
 endif

conf.d/vm.mk

@@ -2,10 +2,11 @@
 ifeq (vm,$(IMAGE_CLASS))
 
 # NB: interactivesystem pulls in network-config-subsystem anyways
-vm/bare: vm/.bare +sysvinit
+vm/bare: vm/.base-lilo +sysvinit
 	@$(call add,BASE_PACKAGES,apt)
 
-vm/systemd: vm/.bare +systemd
+vm/systemd: vm/.base-grub +systemd
+	@$(call add,BASE_PACKAGES,glibc-gconv-modules glibc-locales tzdata)
 	@$(call add,BASE_PACKAGES,apt)
 
 # handle ROOTPW (through deflogin)
@@ -18,16 +19,16 @@ 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 use/vmguest/kvm
-	@$(call add,BASE_PACKAGES,cloud-init)
-	@$(call add,DEFAULT_SERVICES_ENABLE,cloud-config cloud-final cloud-init cloud-init-local)
+vm/cloud-systemd: vm/systemd-net mixin/cloud-init use/vmguest/kvm
 	@$(call add,DEFAULT_SERVICES_DISABLE,consolesaver)
-	@$(call set,KFLAVOURS,un-def)
-	@$(call add,THE_KMODULES,kdbus)
 
-vm/cloud-sysv: vm/net use/vmguest/kvm use/power/acpi/button
-	@$(call add,BASE_PACKAGES,cloud-init)
-	@$(call add,DEFAULT_SERVICES_ENABLE,cloud-config cloud-final cloud-init cloud-init-local)
+vm/cloud-sysv: vm/net mixin/cloud-init use/vmguest/kvm use/power/acpi/button; @:
+
+# vm with OpenNebula contextualization package (with empty network config)
+vm/opennebula-systemd: vm/systemd use/net/networkd use/net-ssh \
+	use/vmguest/kvm mixin/opennebula-context \
+	use/repo use/control/sudo-su use/deflogin
+	@$(call add,BASE_PACKAGES,su)
 
 # NB: use/x11 employs some installer-feature packages
 vm/.desktop-bare: vm/net use/x11/xorg use/cleanup/installer use/repo; @:
@@ -35,8 +36,6 @@ vm/.desktop-bare: vm/net use/x11/xorg use/cleanup/installer use/repo; @:
 vm/.desktop-base: vm/.desktop-bare \
 	use/deflogin/altlinuxroot use/x11-autologin; @:
 
-mixin/icewm: use/x11/lightdm/gtk +icewm; @:
-
 vm/icewm: vm/.desktop-base mixin/icewm; @:
 
 vm/icewm-setup: vm/.desktop-bare mixin/icewm use/oem use/x11-autostart

doc/archdep.txt

@@ -22,7 +22,7 @@
 
 В скриптовых хуках ({image-,}scripts.d/*) проверяйте $GLOBAL_ARCH.
 
-=== списки пакетов ===
+=== списки пакетов, профили групп ===
 
 Бывает так, что в списке пакетов есть смысл упоминать какой-либо из них
 только для определённой архитектуры (например, wine или steam); в таких
@@ -40,7 +40,24 @@
   haspd@i586
   i586-haspd@x86_64
 
+или упрощённо (с версии 1.2.12):
+
+  haspd@IA32
+
 Для преобразования можно воспользоваться следующей командой:
 
   sed -r -e 's/@I586_ONLY@([^\t ]+)/\1@i586/g' \
          -e 's/@X86_64_ONLY@([^\t ]+)/\1@x86_64/g'
+
+При необходимости добавить пакет только на x86-архитектурах (неважно,
+i586 или x86_64) можно воспользоваться макросом X86 (с версии 1.2.12):
+
+  xorg-drv-intel@X86
+
+Аналогичная функциональность реализована для профилей установки.
+
+=== загрузчики ===
+
+Как правило, сперва понадобится доработка mkimage -- см. скрипты
+tools/mki-pack-*boot -- и лишь затем профиля; см. тж. lib/boot.mk
+и фичу pack.

doc/assumptions.txt

@@ -21,9 +21,9 @@ NB: пути приводятся от верхнего уровня; проек
 ** характерный признак пропуска -- разрыв графа (report-targets.png)
 
 * pkg.in/lists/Makefile
-** ожидает, что названия пакаджлистов указываются в переменных
+** ожидает, что названия списков пакетов указываются в переменных
     вида *_LISTS, и копирует в генерируемый профиль только их
-** если задать имя файла пакаджлиста непосредственно в Makefile
+** если задать имя файла списка пакетов непосредственно в Makefile
     субпрофиля, он не будет скопирован
 ** характерное сообщение об ошибке:
 
@@ -37,6 +37,7 @@ NB: пути приводятся от верхнего уровня; проек
     в KFLAVOURS)
 ** если добавить какой-либо kernel-image в STAGE1_PACKAGES*,
     результат может быть неожиданным
+** обратите внимание: bin/tar2fs умеет несколько ядер
 ** вероятная ошибка: незагрузка полученного squashfs
 
 * features.in/install2/install2/stage2cfg.mk

doc/debug.txt

@@ -16,6 +16,7 @@
    этого коммита;
 ** содержит список конфигурационных переменных и их конечных значений,
    созданный на основании distcfg.mk (см. тж. build/vars.mk)
+
 * REPORT=1 включает генерацию дополнительного вывода:
 ** build/reports/targets.png -- граф зависимостей между целями
 ** build/reports/scripts.log -- порядок запуска скриптовых хуков

doc/params.txt

@@ -60,6 +60,11 @@
 ** значение: пусто (по умолчанию), 1 или 2
 ** см. lib/log.mk, lib/clean.mk
 
+* DISTRO_VERSION
+** задаёт версию дистрибутива, если применимо
+** значение: пусто (по умолчанию) либо любая строка
+** см. image.in/Makefile
+
 * HOMEPAGE, HOMENAME, HOMEWAIT
 ** указывают адрес, название и таймаут перехода для домашней страницы
 ** значение: корректный URL, строка, целое неотрицательное число

doc/pkglists.txt

@@ -1,8 +1,7 @@
 == Списки пакетов ==
 
 Состав пакетной базы субпрофилей определяется значениями
-следующих переменных профиля (см. тж. conf.d/README;
-некоторые "*" ниже заэкранированы ради парсера asciidoc):
+следующих переменных профиля (см. тж. conf.d/README):
 
 * main: пакетная база для установки
 ** sub.in/main/Makefile, features.in/*/main/lib/

doc/qemu.txt

@@ -2,10 +2,12 @@
 
 Для сборки на "неродной" архитектуре с применением трансляции
 посредством QEMU установите пакет livecd-qemu-arch и выполните
-команду register-qemu-arm от имени root (также предоставляется
+команду register-qemu-armh от имени root (также предоставляется
 register-qemu-ppc, но как минимум при сборке под ppc32 на x86_64
 известны проблемы эмуляции).
 
 Пример запуска:
 
-  make ARCH=arm APTCONF=/etc/apt/apt.conf.sisyphus.arm ve/bare.tar
+  make ARCH=armh APTCONF=/etc/apt/apt.conf.sisyphus.arm ve/bare.tar
+
+Обратите также внимание на http://bugzilla.altlinux.org/34638

doc/style.txt

@@ -33,7 +33,7 @@
 
 * предпочтительно применение $() вместо `` (особенно при вложенности);
 
-* постарайтесь не вылазить за 80 колонок;
+* постарайтесь не вылезать за 80 колонок;
 
 * избегайте merge-коммитов в коде, который предлагаете для включения
   в основную ветку: поддерживается линейная история для удобства

features.in/apt-conf/README

@@ -0,0 +1 @@
+Данная фича определяет то, какая конфигурация apt попадёт в образ.

features.in/apt-conf/config.mk

@@ -0,0 +1,8 @@
+use/apt-conf:
+	@$(call add_feature)
+	@$(call add,THE_PACKAGES,apt-conf-$$(THE_APT_CONF))
+	@$(call add,IMAGE_INIT_LIST,apt-conf-$$(THE_APT_CONF))
+	@$(call try,THE_APT_CONF,sisyphus)
+
+use/apt-conf/branch: use/apt-conf
+	@$(call set,THE_APT_CONF,branch)

features.in/armh/config.mk

@@ -1,2 +1,2 @@
-use/armh: use/control/sudo-su use/net/dns/google
+use/armh: use/control/sudo-su use/net-dns/google
 	@$(call add_feature)

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

@@ -4,9 +4,38 @@
 #       the last different one wins
 # - remember .base if adding yet another *_PACKAGES
 
-use/bootloader:
-	@$(call add_feature)
-	@$(call add,BASE_PACKAGES,alterator-$$(BASE_BOOTLOADER))
+# NB: "mysterious" conflicts if BASE_BOOTLOADER is empty
 
-use/bootloader/grub use/bootloader/lilo: use/bootloader/%: use/bootloader
+GRUB_ARCHES := i586 x86_64 aarch64 ppc64le
+
+use/bootloader: use/pkgpriorities
+	@$(call add_feature)
+	@$(call try,BASE_BOOTLOADER,grub)
+	@$(call xport,BASE_BOOTLOADER)
+	@$(call add,BASE_LISTS,$$(BASE_BOOTLOADER))
+ifeq (distro,$(IMAGE_CLASS))
+	@$(call add,BASE_PACKAGES,alterator-$$(BASE_BOOTLOADER))
+	@$(call add,PINNED_PACKAGES,alterator-$$(BASE_BOOTLOADER))
+	@$(call add,PINNED_PACKAGES,installer-bootloader-$$(BASE_BOOTLOADER)-stage2)
+endif
+
+ifeq (,$(filter-out i586 x86_64,$(ARCH)))
+use/bootloader/lilo: \
+	use/bootloader/%: use/bootloader
 	@$(call set,BASE_BOOTLOADER,$*)
+endif
+
+ifeq (,$(filter-out $(GRUB_ARCHES),$(ARCH)))
+use/bootloader/grub: \
+	use/bootloader/%: use/bootloader
+	@$(call set,BASE_BOOTLOADER,$*)
+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
+	@$(call add,BASE_PACKAGES,os-prober)

features.in/branding/config.mk

@@ -2,13 +2,26 @@
 use/branding:
 	@$(call add_feature)
 
+# license notes, if any
+use/branding/notes: use/branding
+	@$(call add,THE_BRANDING,notes)
+
 # NB: not every distro might have all the branding of its own
-use/branding/full: use/branding use/syslinux/ui/gfxboot
+ifeq (,$(filter-out i586 x86_64,$(ARCH)))
+use/branding/full: use/branding/notes use/syslinux/ui/gfxboot
 	@$(call add,THE_BRANDING,alterator bootloader bootsplash graphics)
-	@$(call add,THE_BRANDING,indexhtml notes slideshow)
+	@$(call add,THE_BRANDING,indexhtml slideshow)
 
 use/branding/complete: use/branding/full use/plymouth/full
 	@$(call add,INSTALL2_BRANDING,notes slideshow)
+else
+use/branding/full: use/branding/notes
+	@$(call add,THE_BRANDING,alterator graphics)
+	@$(call add,THE_BRANDING,indexhtml slideshow)
+
+use/branding/complete: use/branding/full
+	@$(call add,INSTALL2_BRANDING,notes slideshow)
+endif
 
 # http://altlinux.org/branding/slideshow
 use/branding/slideshow/once: use/branding

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

@@ -1,6 +1,6 @@
 # step 4: build the distribution image
 
-DOT_BASE += $(call branding,$(THE_BRANDING))
+DOT_BASE += $(call branding,notes)
 
 CHROOT_PACKAGES_REGEXP += $(call branding,bootloader)
 CHROOT_PACKAGES += ImageMagick-tools

features.in/browser/config.mk

@@ -1,27 +1,32 @@
 use/browser:
 	@$(call add_feature)
-	@$(call add,THE_PACKAGES_REGEXP,$$(THE_BROWSER))
+	@$(call add,THE_PACKAGES,$$(THE_BROWSER))
 	@$(call try,THE_BROWSER,elinks)	# X11-less fallback
 
 # support both firefox and firefox-esr
 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/rekonq \
+	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)
+ifeq (,$(filter-out i586 x86_64,$(ARCH)))
+use/browser/palemoon: use/browser
+	@$(call set,THE_BROWSER,$*)
 
-use/browser/konqueror4: use/browser
-	@$(call set,THE_BROWSER,kde4base-konqueror)
+use/browser/palemoon/i18n: use/browser/palemoon
+	@$(call add,THE_BROWSER,palemoon-ru)
+else
+use/browser/palemoon: use/browser/firefox; @:
+use/browser/palemoon/i18n: use/browser/palemoon; @:
+endif
 
 # 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
@@ -33,21 +38,13 @@ use/browser/firefox/live: use/browser/firefox
 
 # scarey, and will have to be done otherwise when l10n feature is there
 use/browser/firefox/i18n: use/browser/firefox
-	@$(call add,THE_BROWSER,firefox$$(FX_FLAVOUR)-be)
 	@$(call add,THE_BROWSER,firefox$$(FX_FLAVOUR)-kk)
 	@$(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

@@ -1,9 +1,5 @@
 # step 4: build the distribution image
 
-# take the latter part for complex-specified subprofiles like stage2@live;
-# care to exclude non-directories holding no makefiles like rootfs
-SUBDIRS = $(sort $(dir $(wildcard $(addsuffix /Makefile,$(SUBPROFILE_DIRS)))))
-
 # proxy over the ISO metadata collected; see also genisoimagerc(5)
 BOOT_SYSI := $(META_SYSTEM_ID)
 BOOT_PUBL := $(META_PUBLISHER)
@@ -13,9 +9,36 @@ BOOT_VOLI := $(shell echo $(META_VOL_ID) | cut -c1-32)
 BOOT_VOLS := $(META_VOL_SET)
 BOOT_BIBL := $(META_BIBLIO)
 BOOT_ABST := $(META_ABSTRACT)
+BOOT_COPY := $(META_LICENSE_FILE)
+
+ISODATA_SYSI = $(BOOT_SYSI)
+ISODATA_PUBL = $(BOOT_PUBL)
+ISODATA_PREP = $(BOOT_PREP)
+ISODATA_APPI = $(BOOT_APPI)
+ISODATA_VOLI = $(BOOT_VOLI)
+ISODATA_VOLS = $(BOOT_VOLS)
+ISODATA_BIBL = $(BOOT_BIBL)
+ISODATA_ABST = $(BOOT_ABST)
+ISODATA_COPY = $(BOOT_COPY)
+
 DATE_F    := $(shell date +%F)
 
+ifeq (isodata,$(IMAGE_PACKTYPE))
+BOOT_TYPE :=
+else
+ifeq (,$(filter-out e2k%,$(ARCH)))
+BOOT_TYPE := e2kboot
+endif
+ifeq (,$(filter-out i586 x86_64,$(ARCH)))
 BOOT_TYPE := isolinux
+endif
+ifeq (,$(filter-out ppc64le,$(ARCH)))
+BOOT_TYPE := ieee1275boot
+endif
+ifeq (,$(filter-out aarch64,$(ARCH)))
+BOOT_TYPE := grubaa64boot
+endif
+endif
 
 all: | $(GLOBAL_DEBUG) prep copy-subdirs copy-tree run-scripts pack-image \
 	postprocess $(GLOBAL_CLEAN_WORKDIR)
@@ -25,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-ve/lib/90-build-ve.mk

@@ -17,5 +17,9 @@ IMAGE_PACKAGES = $(DOT_BASE) \
 		 $(THE_PACKAGES) \
 		 $(call list,$(BASE_LISTS) $(THE_LISTS))
 
-all: $(GLOBAL_DEBUG) build-image copy-tree run-image-scripts pack-image \
+IMAGE_PACKAGES_REGEXP = $(THE_PACKAGES_REGEXP) \
+                        $(BASE_PACKAGES_REGEXP)
+
+all: $(GLOBAL_DEBUG) \
+	build-image copy-subdirs copy-tree run-image-scripts pack-image \
 	postprocess $(GLOBAL_CLEAN_WORKDIR)

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,4 +1,6 @@
 #!/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

@@ -5,7 +5,6 @@
 kver="$(rpm -qa 'kernel-image*' \
             --qf '%{installtime} %{version}-%{name}-%{release}\n' \
         | sort -n \
-        | tail -n 1 \
         | cut -f 2 -d ' ' \
         | sed 's/kernel-image-//')"
 
@@ -14,6 +13,14 @@ kver="$(rpm -qa 'kernel-image*' \
 cd /boot
 echo "$kver" > .origver	# for tar2fs
 
+if [ -n "$GLOBAL_EFI_BOOTLOADER" ]; then
+	echo "$GLOBAL_EFI_BOOTLOADER" > .bootloader # for tar2fs
+elif [ -n "$GLOBAL_BASE_BOOTLOADER" ]; then
+	echo "$GLOBAL_BASE_BOOTLOADER" > .bootloader # for tar2fs
+fi
+
+make-initrd -N -k "$kver" AUTODETECT=
+
 # 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/lib/90-build-vm.mk

@@ -7,6 +7,9 @@ IMAGE_PACKAGES = $(DOT_BASE) \
 		 $(THE_PACKAGES) \
 		 $(call list,$(BASE_LISTS) $(THE_LISTS))
 
+IMAGE_PACKAGES_REGEXP = $(THE_PACKAGES_REGEXP) \
+                        $(BASE_PACKAGES_REGEXP)
+
 # intermediate chroot archive
 VM_TARBALL := $(IMAGE_OUTDIR)/$(IMAGE_NAME).tar
 VM_RAWDISK := $(IMAGE_OUTDIR)/$(IMAGE_NAME).raw
@@ -20,28 +23,38 @@ check-sudo:
 	fi
 
 prepare-image: check-sudo
-	@if [ -x $(MKIMAGE_PREFIX)/bin/tar2fs ]; then \
-		TOPDIR=$(MKIMAGE_PREFIX); \
+	@# need to copy $(BUILDDIR)/.work/chroot/.host/qemu* into chroot
+	@#if qemu is used
+	@(cd "$(BUILDDIR)/.work/chroot/"; \
+		tar -rf "$(VM_TARBALL)" ./.host/qemu*) ||:; \
+	if [ -x /usr/share/mkimage-profiles/bin/tar2fs ]; then \
+		TOPDIR=/usr/share/mkimage-profiles; \
 	fi; \
-	if ! sudo $(TOPDIR)/bin/tar2fs \
+	if ! sudo $$TOPDIR/bin/tar2fs \
 		"$(VM_TARBALL)" "$(VM_RAWDISK)" $(VM_SIZE) $(VM_FSTYPE); then \
 		echo "** error: sudo tar2fs failed, see build log" >&2; \
 		exit 1; \
 	fi
 
 convert-image: prepare-image
-	@case "$(IMAGE_TYPE)" in \
-	"img") mv "$(VM_RAWDISK)" "$(IMAGE_OUTPATH)"; exit 0;; \
+	@VM_COMPRESS=; \
+	case "$(IMAGE_TYPE)" in \
+	"img") \
+		mv "$(VM_RAWDISK)" "$(IMAGE_OUTPATH)"; \
+		if [ "0$(DEBUG)" -le 1 ]; then rm "$(VM_TARBALL)"; fi; \
+		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 "** warning: qemu-img not available" >&2; \
+		echo "** error: qemu-img not available" >&2; \
+		exit 1; \
 	else \
-		qemu-img convert -O "$$VM_FORMAT" \
+		qemu-img convert $$VM_COMPRESS -O "$$VM_FORMAT" \
 			"$(VM_RAWDISK)" "$(IMAGE_OUTPATH)"; \
 		rm "$(VM_RAWDISK)"; \
-		if [ -z "$(DEBUG)" ]; then rm "$(VM_TARBALL)"; fi; \
+		if [ "0$(DEBUG)" -le 1 ]; then rm "$(VM_TARBALL)"; fi; \
 	fi
 
 run-image-scripts: GLOBAL_CLEANUP_PACKAGES := $(CLEANUP_PACKAGES)
@@ -49,5 +62,6 @@ run-image-scripts: GLOBAL_CLEANUP_PACKAGES := $(CLEANUP_PACKAGES)
 # override
 pack-image: MKI_PACK_RESULTS := tar:$(VM_TARBALL)
 
-all: $(GLOBAL_DEBUG) build-image copy-tree run-image-scripts pack-image \
+all: $(GLOBAL_DEBUG) \
+	build-image copy-subdirs copy-tree run-image-scripts pack-image \
 	convert-image postprocess $(GLOBAL_CLEAN_WORKDIR)

features.in/cleanup/config.mk

@@ -1,5 +1,6 @@
 use/cleanup:
 	@$(call add_feature)
+	@$(call xport,GLOBAL_LIVE_NO_CLEANUPDB)
 	@$(call xport,CLEANUP_PACKAGES)
 	@$(call xport,CLEANUP_BASE_PACKAGES)
 

features.in/cleanup/live/image-scripts.d/99-cleanupdb

@@ -1,7 +1,10 @@
 #!/bin/sh
 
-# don't cripple the image to be copied over
-[ -x /usr/sbin/live-install -o -x /usr/sbin/livecd-install ] && exit 0
+# don't cripple the image to be copied over or explicitly requested
+# not to do this
+[ -n "$GLOBAL_LIVE_NO_CLEANUPDB" ] || \
+	[ -x /usr/sbin/live-install ] || \
+	[ -x /usr/sbin/livecd-install ] && exit 0
 
 # dump what's here by this point
 echo "** live packages before rpmdb purge:"

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)
@@ -43,3 +46,4 @@ use/deflogin/privileges: use/deflogin
 # NM with sysvinit
 use/deflogin/sysv/nm: use/deflogin
 	@$(call add,GROUPS,_nmconnect)
+	@$(call add,THE_PACKAGES,nm-sysvinit)

features.in/dev/README

@@ -1,8 +1,7 @@
 Эта фича служит для создания образов, предназначающихся для разработки.
 В первую очередь обеспечивается развёртывание hasher и mkimage.
 
-Реализована поддержка LiveCD, возможно приспособление для образов
-сборочных VM/VE.
+Реализованы поддержка LiveCD, VM, VE и добавление группы в инсталятор.
 
 Обратите внимание: эта фича достаточно серьёзно изменяет поведение
 субпрофиля main, оставляя из всего обычного множества обрабатываемых

features.in/dev/config.mk

@@ -3,24 +3,27 @@ use/dev: use/control
 	@$(call add,THE_PACKAGES,git-core hasher gear)
 	@$(call add,CONTROL,pam_mktemp:enabled)
 
+# use/dev intentionally missing
+use/dev/repo: use/repo/main
+	@$(call add,THE_PACKAGES,apt-repo)
+	@$(call add,MAIN_LISTS,$(call tags,main builder))
+
 use/dev/mkimage: use/dev
 	@$(call add,THE_PACKAGES,mkimage shadow-change su)
 
-use/dev/repo: use/dev use/repo/main
-	@$(call add,THE_PACKAGES,apt-repo)
-	@$(call add,MAIN_PACKAGES,rpm-build basesystem)
-	@$(call add,MAIN_PACKAGES,fakeroot sisyphus_check)
-	@$(call add,MAIN_PACKAGES,file make-initrd make-initrd-propagator)
+use/dev/builder/base: use/dev/mkimage
+	@$(call add,THE_LISTS,$(call tags,builder && (base || extra)))
 
-use/dev/builder/base: use/dev/mkimage use/dev
+use/dev/builder/live: use/dev/builder/base
+	@$(call add,LIVE_LISTS,$(call tags,live builder))
+	@$(call add,LIVE_PACKAGES,livecd-qemu-arch qemu-user-binfmt_misc)
+
+use/dev/builder/full: use/dev use/dev/builder/live use/dev/repo
 	@$(call set,KFLAVOURS,$(BIGRAM))
-	@$(call add,LIVE_LISTS,\
-		$(call tags,(base || live) && (server || builder)))
-	@$(call add,LIVE_PACKAGES,livecd-qemu-arch strace)
-	@$(call add,LIVE_PACKAGES,qemu-user-binfmt_misc)
-	@$(call add,LIVE_PACKAGES,perl-Gear-Remotes)
-
-use/dev/builder/full: use/dev/builder/base use/dev/repo
+	@$(call add,THE_LISTS,$(call tags,server extra))
 	@$(call add,MAIN_LISTS,$(call tags,live builder))
 	@$(call add,MAIN_PACKAGES,syslinux pciids memtest86+ xorriso)
-	@$(call add,LIVE_PACKAGES,sudo)
+	@$(call add,LIVE_PACKAGES,sudo perl-Gear-Remotes)
+
+use/dev/groups/builder: use/dev/repo
+	@$(call add,MAIN_GROUPS,dev/builder)

features.in/docs/config.mk

@@ -15,7 +15,7 @@ use/docs/manual: use/docs
 	@$(call xport,DOCS)
 	@$(call add,THE_PACKAGES,docs-$$(DOCS))
 
-use/docs/license: use/docs use/branding
-	@$(call add,THE_BRANDING,notes)
+use/docs/license: use/docs use/branding/notes
+	@$(call set,META_LICENSE_FILE,license.all.html)
 
 use/docs/full: use/docs/indexhtml use/docs/manual use/docs/license; @:

features.in/domain-client/config.mk

@@ -5,3 +5,4 @@ use/domain-client: use/net/dhcp
 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

@@ -1,7 +1,60 @@
 use/e2k:
 	@$(call add_feature)
-	@$(call set,KFLAVOURS,mcst-def)
+	@$(call add,BASE_PACKAGES,installer-feature-e2k-fix-clock-stage3)
+
+# at least one of these is requisite
+use/e2k/1cp use/e2k/4c use/e2k/8c: use/e2k/%: use/e2k
+	@$(call set,KFLAVOURS,elbrus-$*)
 
 use/e2k/x11: use/e2k use/x11
+	@$(call add,THE_PACKAGES,xorg-server xinit)
+
+use/e2k/x11/401: use/e2k/x11 use/e2k/4c
 	@$(call add,THE_PACKAGES,xorg-conf-e401-radeon)
 	@$(call add,THE_PACKAGES,xorg-drv-ati)
+
+use/e2k/x11/801: use/e2k/x11 use/e2k/8c
+	@$(call add,THE_PACKAGES,xorg-conf-e801-radeon)
+	@$(call add,THE_PACKAGES,xorg-drv-ati)
+
+use/e2k/x11/.101: use/e2k/x11 use/e2k/1cp; @:
+
+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/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
+	@$(call add,INSTALL2_PACKAGES,installer-feature-e2k-ignore-cf-stage2)
+
+use/e2k/install2/4xx: use/e2k/install2 use/e2k/4c
+	@$(call add,INSTALL2_PACKAGES,xorg-conf-e4xx-fbdev)
+
+use/e2k/install2/401: use/e2k/install2/desktop use/e2k/4c
+	@$(call add,INSTALL2_PACKAGES,xorg-conf-e401-modesetting)
+
+use/e2k/install2/801: use/e2k/install2/desktop use/e2k/8c
+	@$(call add,INSTALL2_PACKAGES,xorg-conf-e801-modesetting)
+
+use/e2k/install2/101: use/e2k/install2/desktop use/e2k/1cp
+	@$(call add,INSTALL2_PACKAGES,xorg-conf-e101-modesetting)
+	@$(call add,INSTALL2_PACKAGES,dummy-xorg-drv-vivante)
+
+use/e2k/sound/401:
+	@$(call add,THE_PACKAGES,setup-alsa-elbrus-401)
+
+use/e2k/401: use/e2k/install2/401 use/e2k/x11/401 use/e2k/sound/401; @:
+use/e2k/801: use/e2k/install2/801 use/e2k/x11/801; @:
+use/e2k/101: use/e2k/install2/101 use/e2k/x11/101; @:

features.in/e2k/install2/image-scripts.d/50-e2k-no-notes

@@ -0,0 +1,4 @@
+#!/bin/sh
+# e2k images are distributed through MCST now with a separate agreement
+
+sed -i '/license/d' /usr/share/install2/installer-steps ||:

features.in/e2k/rootfs/files/boot/boot.conf

@@ -1,7 +0,0 @@
-default=auto
-
-label=auto
-       partition=0
-       image=/image-@KVER@
-       initrd=/initrd-@KVER@.img
-       cmdline=console=tty0 consoleblank=0 hardreset root=UUID=@ROOTUUID@

features.in/e2k/rootfs/image-scripts.d/50-e2k-serial

@@ -1,9 +1,14 @@
 #!/bin/sh
 
 CFG="/boot/boot.conf"
+[ -s "$CFG" ] || {
+	echo "50-e2k-serial: $CFG missing, exiting" >&2
+	exit 0
+}
 
-[ -f "$CFG" ] || exit 1
 [ -n "$GLOBAL_TTY_DEV" -a -n "$GLOBAL_TTY_RATE" ] || exit 0
 
 # tty0 first
 sed -i "s/console=tty0 /console=$GLOBAL_TTY_DEV,$GLOBAL_TTY_RATE &/" "$CFG"
+
+### NB: there's no boot.conf yet!  could only be the sample one

features.in/e2k/rootfs/image-scripts.d/51-e2k-koi8-r

@@ -0,0 +1,6 @@
+#!/bin/sh
+
+echo "#LANG=ru_RU.KOI8-R" >> /etc/sysconfig/i18n
+echo "#SYSFONTACM=koi8-r" >> /etc/sysconfig/consolefont
+echo "#KBCHARSET=koi8-r" >> /etc/sysconfig/keyboard
+echo "#KEYTABLE=ru_cplk-KOI8-R" >> /etc/sysconfig/keyboard

features.in/e2k/rootfs/image-scripts.d/51-e2k-utf-8

@@ -0,0 +1,8 @@
+#!/bin/sh
+
+echo "LANG=ru_RU.UTF-8" >> /etc/sysconfig/i18n
+echo "SYSFONT=UniCyr_8x16" >> /etc/sysconfig/consolefont
+echo "KEYTABLE=ruwin_cplk-UTF-8" >> /etc/sysconfig/keyboard
+
+[ ! -f /etc/locale.conf ] ||
+	echo "LANG=ru_RU.UTF-8" >> /etc/locale.conf

features.in/efi/config.mk

@@ -1,43 +1,74 @@
+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
+ifeq (x86_64,$(ARCH))
+	@$(call try,EFI_BOOTLOADER,elilo)	# default one
+else
+	@$(call try,EFI_BOOTLOADER,grub-efi)	# default one
+endif
+	@$(call add,THE_PACKAGES,$$(EFI_BOOTLOADER))
+	@$(call xport,EFI_BOOTLOADER)
+	@$(call add,THE_LISTS,$(EFI_LISTS))
+ifeq (distro,$(IMAGE_CLASS))
+	@$(call add,THE_PACKAGES,installer-feature-efi-stage3)
+	@$(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)
+	@$(call add,THE_PACKAGES,$$(EFI_SHELL))
 
 use/efi/signed: use/efi
 	@$(call set,EFI_CERT,altlinux)
 	@$(call add,COMMON_PACKAGES,shim-signed)
-	@$(call add,RESCUE_PACKAGES,openssl pesign sbsigntools)
+	@$(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/refind: use/efi
+	@$(call set,EFI_BOOTLOADER,refind)
 
 use/efi/memtest86: use/efi/refind
 	@$(call set,EFI_MEMTEST86,efi-memtest86)
 
+
+else
+
+use/efi/shell use/efi/signed 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/refind use/efi/shell use/efi/memtest86: use/isohybrid; @:
+  use/efi/refind use/efi/shell use/efi/memtest86 use/efi/lilo use/efi/grub: use/isohybrid; @:
 
 endif

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
@@ -31,6 +29,7 @@ use/firmware/wireless: use/firmware
 	@$(call add,THE_PACKAGES_REGEXP,firmware-prism.*)
 	@$(call add,THE_PACKAGES_REGEXP,firmware-ipw.*)
 	@$(call add,THE_PACKAGES_REGEXP,firmware-zd.*)
+	@$(call add,THE_PACKAGES_REGEXP,firmware-rt.*)
 
 use/firmware/laptop: use/firmware/cpu
-	@$(call add,KMODULES,acpi_call)
+	@$(call add,THE_KMODULES,acpi_call)

features.in/fonts/config.mk

@@ -19,6 +19,10 @@ use/fonts/zerg: use/fonts
 use/fonts/infinality: use/fonts
 	@$(call add,THE_PACKAGES,libfreetype-infinality fontconfig-infinality)
 
+# #34142
+use/fonts/chinese: use/fonts
+	@$(call add,THE_PACKAGES,fonts-bitmap-wqy)
+
 # a few typical font collections
 # NB: dejavu is ugly thus missing
 # NB: not depending on use/fonts intentionally,
@@ -47,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,17 @@
+insmod echo
+insmod gzio
+insmod minicmd
+insmod normal
+insmod test
+set timeout=@timeout@
+
+if [ $grub_cpu = x86_64 -o $grub_cpu = i386 ]; then
+    if [ $grub_platform = efi ]; then
+        linux_suffix=efi
+    elif [ $grub_platform = pc ]; then
+        linux_suffix=16
+    else
+        linux_suffix=
+else
+    linux_suffix=
+fi

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

@@ -0,0 +1,6 @@
+
+default='linux'
+menuentry 'Install ALT @relname@' --hotkey 'i' --id 'linux' {
+  linux$linux_suffix /EFI/BOOT/vmlinuz changedisk fastboot automatic=method:cdrom ramdisk_size=@altinst_size@ vga=@bootvga@ @bootargs@
+  initrd$linux_suffix /EFI/BOOT/full.cz
+}

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

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

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

@@ -0,0 +1,6 @@
+
+menuentry 'Install ALT @relname@ (headless with DHCP+VNC) (password VNCPWD)' --id 'vncpasswd' {
+  linux$linux_suffix /EFI/BOOT/vmlinuz changedisk fastboot automatic=method:cdrom ramdisk_size=@altinst_size@ showopts @bootargs@ headless no_alt_virt_keyboard vncpassword=VNCPWD
+  initrd$linux_suffix /EFI/BOOT/full.cz
+}
+

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

@@ -0,0 +1,6 @@
+menuentry 'LiveCD (no hard disk needed)' --id 'live' {
+  linux$linux_suffix /EFI/BOOT/vmlinuz changedisk fastboot live automatic=method:cdrom ramdisk_size=@live_size@ stagename=live showopts lowmem vga=@bootvga@ @bootargs@
+  initrd$linux_suffix /EFI/BOOT/full.cz
+}
+
+

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

@@ -0,0 +1,4 @@
+menuentry 'LiveCD with sessions support' --id 'session' {
+  linux$linux_suffix /EFI/BOOT/vmlinuz changedisk fastboot live automatic=method:cdrom ramdisk_size=@live_size@ stagename=live showopts live_rw vga=@bootvga@ @bootargs@
+  initrd$linux_suffix /EFI/BOOT/full.cz
+}

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

@@ -0,0 +1,4 @@
+menuentry 'Rescue LiveCD' --id 'rescue' {
+  linux$linux_suffix /EFI/BOOT/vmlinuz changedisk fastboot live automatic=method:cdrom ramdisk_size=@rescue_size@ stagename=rescue splash=0 showopts @rescue_bootargs@
+  initrd$linux_suffix /EFI/BOOT/full.cz
+}

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

@@ -0,0 +1,4 @@
+menuentry 'Rescue with sessions support' --id 'rescue_session' {
+  linux$linux_suffix /EFI/BOOT/vmlinuz changedisk fastboot live automatic=method:cdrom,label:ALT* ramdisk_size=@rescue_size@ stagename=rescue splash=0 showopts @rescue_bootargs@ live_rw
+  initrd$linux_suffix /EFI/BOOT/full.cz
+}

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

@@ -0,0 +1,4 @@
+menuentry 'Forensic mode (leave disks alone)' --id 'rescue_forensic' {
+  linux$linux_suffix /EFI/BOOT/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@
+  initrd$linux_suffix /EFI/BOOT/full.cz
+}

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

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

features.in/grub/cfg.in/90memtest.cfg

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

features.in/grub/cfg.in/95fwsetup.cfg

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

features.in/grub/config.mk

@@ -0,0 +1,39 @@
+# default is plain text prompt
+# NB: might be usbflash-ready hybrid iso
+
+# on ppc64le syslinux feature is used only to generate config
+#ifeq (,$(filter-out i586 x86_64 ppc64le aarch64,$(ARCH)))
+ifeq (,$(filter-out i586 x86_64,$(ARCH)))
+
+use/grub: sub/stage1 $(ISOHYBRID:%=use/isohybrid)
+	@$(call add_feature)
+ifeq (,$(filter-out i586 x86_64,$(ARCH)))
+	@$(call add,STAGE1_PACKAGES,grub-efi shim-signed)
+	@$(call try,BOOTVGA,normal)
+endif
+	@$(call set,RELNAME,ALT ($(IMAGE_NAME)))
+	@$(call set,IMAGE_PACKTYPE,boot)
+else
+
+use/grub: ; @:
+
+endif
+
+ifeq (,$(filter-out i586 x86_64,$(ARCH)))
+# UI is overwritten
+use/grub/ui/%: use/grub
+	@$(call set,GRUB_UI,$*)
+	@if [ "$*" == gfxboot ]; then \
+		$(call add,STAGE1_PACKAGES,gfxboot); \
+		$(call add,STAGE1_BRANDING,bootloader); \
+	fi
+else
+use/grub/ui/%: use/grub; @:
+endif
+
+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,100 @@
+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
+endif
+
+DSTDIR  := $(BUILDDIR)/stage1/files/EFI/BOOT/.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),' \
+		$(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)
+
+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

@@ -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"
+
+cfgs="$(find EFI/BOOT -name '*.cfg')"
+[ -n "$cfgs" ] || {
+	echo "${0##*/}: did not find any config under EFI/BOOT " >&2
+	exit 1
+}
+
+# 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

@@ -0,0 +1,14 @@
+#!/bin/sh
+# postprocess isolinux configuration
+# to add rescue image hash, if any
+# (for propagator in forensic mode)
+
+cd "$WORKDIR"
+
+grep -qs "@rescue_hash@" EFI/BOOT/*.cfg || exit 0
+
+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," EFI/BOOT/*.cfg
+done

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

@@ -0,0 +1,41 @@
+#!/bin/sh
+# gather syslinux configuration from snippets;
+# copy modules; see also this feature's generate.mk
+
+CFG="grub.cfg"
+
+mkdir -p "$WORKDIR/EFI/BOOT"
+cd "$WORKDIR/EFI/BOOT"
+
+# validate just in case (see also stage1 Makefile)
+case "$GLOBAL_BOOTLOADER" in
+	isolinux|syslinux|ieee1275boot|grubaa64boot) ;;
+	*) echo "error: weird GLOBAL_BOOTLOADER: \`$GLOBAL_BOOTLOADER'" >&2;
+	   exit 1;;
+esac
+
+# 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
+grep -hv '^#' .in/[0-9][0-9]*.cfg > "$CFG"
+
+# there should be DEFAULT directive there (at least for alterator-netinst)
+if ! grep -i '^default' "$CFG"; then
+	DEFAULT="$(grep -i '^label ' "$CFG" | head -1 | cut -f2 -d' ')"
+	if [ -n "$DEFAULT" ]; then
+		echo "default $DEFAULT" >> "$CFG"
+	else
+		echo "error: no DEFAULT or UI directive and cannot guess" >&2
+		exit 1
+	fi
+fi
+
+# snippets are not going into the actual image
+if [ "$DEBUG" != 2 ]; then rm -r .in/; fi
+
+# NB: there will be final macro expansion based on actual image sizes
+#     done by features.in/syslinux/scripts.d/20-propagator-ramdisk

features.in/init/config.mk

@@ -1,26 +1,36 @@
 +sysvinit: use/init/sysv; @:
 +systemd: use/init/systemd/full; @:
++systemd-optimal: use/init/systemd/settings/optimal; @:
++elogind: use/init/sysv/elogind; @:
 
-use/init:
+# NB: the list name MUST be identical to init package name
+use/init: use/pkgpriorities
 	@$(call add_feature)
 	@$(call add,THE_LISTS,$$(INIT_TYPE))
+	@$(call add,PINNED_PACKAGES,$$(INIT_TYPE))
 
 # THE_LISTS is too late when BASE_PACKAGES have pulled in
 # the wrong syslogd-daemon provider already
 use/init/sysv: use/init
 	@$(call set,INIT_TYPE,sysvinit)
-	@$(call add,BASE_PACKAGES,syslogd)
+	@$(call add,BASE_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,ConsoleKit2-service ConsoleKit2-x11)
+
+use/init/sysv/elogind: use/init/sysv
+	@$(call add,THE_PACKAGES,elogind)
+	@$(call add,DEFAULT_SERVICES_ENABLE,elogind)
+
 ### 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)
+	@$(call add,THE_PACKAGES,chkconfig)
 
 # http://www.freedesktop.org/wiki/Software/systemd/Debugging
 use/init/systemd/debug: use/init/systemd use/services
@@ -29,3 +39,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/settings/disable-dumpcore \
+	use/init/systemd/settings/enable-log-to-tty12 \
+	use/init/systemd/settings/enable-showstatus; @:

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

@@ -0,0 +1,16 @@
+#!/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/rootfs/image-scripts.d/50-sysvinit

@@ -0,0 +1,29 @@
+#!/bin/sh
+# 40: should run before 50-users in deflogin
+
+# the part below relates to sysvinit specifically
+rpm -q sysvinit || exit 0
+
+# NM-specific group
+case "$GLOBAL_GROUPS" in
+	*_nmconnect*) groupadd -r _nmconnect ||:;;
+esac
+
+# 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}
+
+# Workaround for run elogind
+if [ ! -L /var/run -a ! -e /var/run/dbus ]; then
+	ln -s /run/dbus /var/run/dbus
+else
+	echo "symlink /run/dbus -> /var/run/dbus not created"
+fi

features.in/init/rootfs/image-scripts.d/90-systemd

@@ -15,11 +15,7 @@ sub() {
 }
 
 # tune make-initrd
-sub /etc/initrd.mk 'FEATURES += systemd' 'MODULES_PRELOAD += autofs4'
+sub /etc/initrd.mk 'MODULES_PRELOAD += autofs4'
 
 # don't allow systemd to set LANG (see also #27408)
 sub /etc/locale.conf 'LANG='
-
-# aufs2 root is rw in reality; but don't bother if there's a record already
-grep -q '[[:space:]]/[[:space:]]' /etc/fstab ||
-	sub /etc/fstab '/dev/root / auto defaults 0 0'

features.in/init/stage2/image-scripts.d/91-systemd

@@ -0,0 +1,16 @@
+#!/bin/sh
+
+# the part below relates to systemd as init specifically
+rpm -q systemd-sysvinit || exit 0
+
+sub() {
+	local file="$1"
+	shift
+	for i in "$@"; do
+		grep -q "^$i" "$file" || echo "$i" >> "$file"
+	done
+}
+
+# aufs2 root is rw in reality; but don't bother if there's a record already
+grep -q '[[:space:]]/[[:space:]]' /etc/fstab ||
+	sub /etc/fstab '/dev/root / auto defaults 0 0'

features.in/install2/config.mk

@@ -3,7 +3,7 @@
 +installer: use/install2/full; @:
 
 use/install2: use/stage2 sub/stage2@install2 use/metadata \
-	use/cleanup/installer
+	use/cleanup/installer use/install2/autoinstall
 	@$(call add_feature)
 	@$(call try,INSTALLER,altlinux-generic)	# might be replaced later
 	@$(call add,INSTALL2_PACKAGES,installer-distro-$$(INSTALLER)-stage2)
@@ -11,7 +11,8 @@ use/install2: use/stage2 sub/stage2@install2 use/metadata \
 	@$(call add,BASE_PACKAGES,branding-$$(BRANDING)-release)
 	@$(call add,BASE_PACKAGES,installer-common-stage3)
 	@$(call add,BASE_PACKAGES,glibc-gconv-modules)	# for guile22
-	@$(call add,BASE_LISTS,$(call tags,basesystem))
+	@$(call add,BASE_PACKAGES,interactivesystem)
+	@$(call add,BASE_PACKAGES,apt)
 	@$(call xport,BASE_BOOTLOADER)
 	@$(call xport,INSTALL2_CLEANUP_PACKAGES)
 	@$(call xport,INSTALL2_CLEANUP_KDRIVERS)
@@ -31,23 +32,14 @@ use/install2/stage3: use/install2
 use/install2/fonts: use/fonts/install2; @:
 
 # see also use/vmguest
-use/install2/vmguest: use/install2/kvm use/install2/vbox use/install2/vmware; @:
-
-# stash local packages within installation media
-use/install2/packages: use/install2 use/repo/main; @:
-
-# set up remote repositories within installed system out-of-box
-use/install2/repo: use/install2
-	@$(call add,INSTALL2_PACKAGES,installer-feature-online-repo)
-
-# for alterator-pkg to use
-use/install2/net: use/install2
-	@$(call add,INSTALL2_PACKAGES,curl)
+ifeq (,$(filter-out i586 x86_64 aarch64 armh ppc64le,$(ARCH)))
 
 # see also use/vmguest/kvm; qxl included in xorg pkglist
 use/install2/kvm:
 	@$(call add,INSTALL2_PACKAGES,spice-vdagent xorg-drv-qxl)
 
+ifeq (,$(filter-out i586 x86_64,$(ARCH)))
+
 # virtualbox guest support for installer
 use/install2/vbox:
 	@$(call add,STAGE1_KMODULES,virtualbox-addition vboxguest)
@@ -59,17 +51,46 @@ use/install2/vmware:
 	@$(call add,STAGE1_KMODULES,scsi)	# mptspi in led-ws
 	@$(call add,INSTALL2_PACKAGES,xorg-drv-vmware xorg-drv-vmmouse)
 
+use/install2/vmguest: use/install2/kvm use/install2/vbox use/install2/vmware; @:
+
+else
+
+use/install2/vmguest: use/install2/kvm; @:
+
+endif
+else
+
+use/install2/vmguest: ; @:
+
+endif
+
+# stash local packages within installation media
+use/install2/packages: use/install2 use/repo/main; @:
+
+# set up remote repositories within installed system out-of-box
+use/install2/repo: use/install2
+	@$(call add,INSTALL2_PACKAGES,installer-feature-online-repo)
+
+# for alterator-pkg to use
+use/install2/net: use/install2
+	@$(call add,INSTALL2_PACKAGES,curl)
+
+# for autoinstall
+use/install2/autoinstall:
+	@$(call add,INSTALL2_PACKAGES,alterator-postinstall)
+	@$(call add,BASE_PACKAGES,alterator-postinstall)
+
 # NB: sort of conflicts with use/install2/cleanup/vnc
 use/install2/vnc:
 	@$(call add,INSTALL2_PACKAGES,x11vnc xterm net-tools)
 
 # this one expects external vncviewer to come
 use/install2/vnc/listen: \
-	use/install2/vnc use/syslinux/install-vnc-listen.cfg; @:
+	use/install2/vnc use/syslinux/install-vnc-listen.cfg use/grub/install-vnc-listen.cfg; @:
 
 # this one connects to a specified vncviewer --listen
 use/install2/vnc/connect: \
-	use/install2/vnc use/syslinux/install-vnc-connect.cfg; @:
+	use/install2/vnc use/syslinux/install-vnc-connect.cfg use/grub/install-vnc-connect.cfg; @:
 
 # add both bootloader items to be *that* explicit ;-)
 use/install2/vnc/full: use/install2/vnc/listen use/install2/vnc/connect; @:
@@ -86,6 +107,9 @@ use/install2/jfs:
 use/install2/reiserfs:
 	@$(call add,SYSTEM_PACKAGES,reiserfsprogs)
 
+use/install2/fat:
+	@$(call add,SYSTEM_PACKAGES,dosfstools fatresize)
+
 # prepare bootloader for software suspend (see also live)
 use/install2/suspend:
 	@$(call add,INSTALL2_PACKAGES,installer-feature-desktop-suspend-stage2)
@@ -93,6 +117,9 @@ use/install2/suspend:
 # extras
 use/install2/tools:
 	@$(call add,INSTALL2_PACKAGES,pxz)
+	@$(call add,INSTALL2_PACKAGES,fdisk gdisk parted partclone)
+	@$(call add,INSTALL2_PACKAGES,vim-console)
+	@$(call add,INSTALL2_PACKAGES,net-tools openssh-clients lftp)
 
 # when VNC installation is less welcome than a few extra megs
 use/install2/cleanup/vnc:
@@ -108,7 +135,7 @@ use/install2/cleanup/x11-hwdrivers:
 	@$(call add,INSTALL2_CLEANUP_PACKAGES,xorg-drv-ati xorg-drv-intel)
 	@$(call add,INSTALL2_CLEANUP_PACKAGES,xorg-glamor)
 	@$(call add,INSTALL2_CLEANUP_PACKAGES,xorg-drv-mach64 xorg-drv-mga)
-	@$(call add,INSTALL2_CLEANUP_PACKAGES,xorg-drv-nouveau xorg-drv-nv)
+	@$(call add,INSTALL2_CLEANUP_PACKAGES,xorg-drv-nouveau)
 	@$(call add,INSTALL2_CLEANUP_PACKAGES,xorg-drv-openchrome)
 	@$(call add,INSTALL2_CLEANUP_PACKAGES,xorg-drv-r128 xorg-drv-radeon)
 	@$(call add,INSTALL2_CLEANUP_PACKAGES,xorg-drv-s3virge xorg-drv-savage)

features.in/install2/install2/image-scripts.d/20-vm-profile

@@ -0,0 +1,4 @@
+#!/bin/sh
+
+echo -n "*** vm-profile.scm provided by: "
+rpm -qf /var/cache/alterator/vm-profile.scm ||:

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

@@ -65,7 +65,6 @@ rm -rf /lib/modules/*/kernel/fs/autofs
 rm -rf /lib/modules/*/kernel/fs/autofs4
 rm -rf /lib/modules/*/kernel/fs/befs
 rm -rf /lib/modules/*/kernel/fs/bfs
-rm -rf /lib/modules/*/kernel/fs/btrfs
 rm -rf /lib/modules/*/kernel/fs/ceph
 rm -rf /lib/modules/*/kernel/fs/cifs
 rm -rf /lib/modules/*/kernel/fs/coda
@@ -76,7 +75,6 @@ rm -rf /lib/modules/*/kernel/fs/efs
 rm -rf /lib/modules/*/kernel/fs/exofs
 rm -rf /lib/modules/*/kernel/fs/freevxfs
 rm -rf /lib/modules/*/kernel/fs/fscache
-rm -rf /lib/modules/*/kernel/fs/fuse
 rm -rf /lib/modules/*/kernel/fs/hfs
 rm -rf /lib/modules/*/kernel/fs/hfsplus
 rm -rf /lib/modules/*/kernel/fs/hpfs
@@ -107,7 +105,6 @@ rm -rf /lib/modules/*/kernel/net/bluetooth
 rm -rf /lib/modules/*/kernel/net/dccp
 rm -rf /lib/modules/*/kernel/net/decnet
 rm -rf /lib/modules/*/kernel/net/econet
-rm -rf /lib/modules/*/kernel/net/ipv6
 rm -rf /lib/modules/*/kernel/net/ipx
 rm -rf /lib/modules/*/kernel/net/irda
 rm -rf /lib/modules/*/kernel/net/netfilter

features.in/kernel/config.mk

@@ -7,7 +7,19 @@ endif
 
 use/kernel:
 	@$(call add_feature)
+ifeq (,$(filter-out e2k%,$(ARCH)))
+	@$(call try,KFLAVOURS,elbrus-def)
+else
+ifeq (,$(filter-out aarch64 armh,$(ARCH)))
+	@$(call try,KFLAVOURS,mp)
+else
+ifeq (,$(filter-out riscv64,$(ARCH)))
+	@$(call try,KFLAVOURS,un-def)
+else
 	@$(call try,KFLAVOURS,std-def)
+endif
+endif
+endif
 
 # r8168 is a kludge, never install it by default
 use/kernel/net:
@@ -18,7 +30,49 @@ use/kernel/wireless: use/firmware/wireless
 	@$(call add,THE_KMODULES,bcmwl ndiswrapper)
 
 use/kernel/laptop: use/firmware/laptop
-	@$(call add,KMODULES,omnibook tp_smapi)
+	@$(call add,THE_KMODULES,omnibook tp_smapi)
 
 use/kernel/desktop:
-	@$(call add,KMODULES,lirc v4l)
+	@$(call add,THE_KMODULES,lirc v4l)
+
+use/kernel/server:
+	@$(call add,THE_KMODULES,ipset kvm)
+
+use/kernel/drm:
+	@$(call add,THE_KMODULES,drm)
+
+# for vm targets
+use/kernel/initrd-setup: use/kernel
+	@$(call add,THE_INITRDFEATURES,add-modules compress cleanup)
+	@$(call try,VM_FSTYPE,ext4)
+	@$(call add,THE_INITRDMODULES,$$(VM_FSTYPE))
+ifeq (,$(filter-out i586 x86_64 aarch64 armh ppc64le,$(ARCH)))
+	@$(call add,THE_INITRDMODULES,ahci sd_mod)
+	@$(call add,THE_INITRDMODULES,nvme nvme-core)
+	@$(call add,THE_INITRDMODULES,virtio-scsi virtio-blk virtio-rng)
+endif
+ifeq (,$(filter-out i586 x86_64,$(ARCH)))
+	@$(call add,THE_INITRDFEATURES,qemu)
+	@$(call add,THE_INITRDMODULES,ata_piix)
+endif
+ifeq (,$(filter-out aarch64 armh,$(ARCH)))
+	@$(call add,THE_INITRDMODULES,bcm2835 sunxi-mmc)
+	@$(call add,THE_INITRDMODULES,nvmem_rockchip_efuse)
+	@$(call add,THE_INITRDMODULES,virtio-mmio)
+endif
+ifeq (,$(filter-out aarch64,$(ARCH)))
+	@$(call add,THE_INITRDMODULES,meson-gx-mmc)
+	@$(call add,THE_INITRDMODULES,nvmem_meson_efuse)
+endif
+ifeq (,$(filter-out armh,$(ARCH)))
+	@$(call add,THE_INITRDMODULES,sdhci_dove sdhci_esdhc_imx)
+endif
+ifeq (,$(filter-out e2k%,$(ARCH)))
+	@$(call add,THE_INITRDFEATURES,usb)
+endif
+ifeq (,$(filter-out ppc64le,$(ARCH)))
+	@$(call add,THE_INITRDFEATURES,qemu usb)
+	@$(call add,THE_INITRDMODULES,ipr ibmvscsi)
+endif
+	@$(call xport,THE_INITRDMODULES)
+	@$(call xport,THE_INITRDFEATURES)

features.in/kernel/image-scripts.d/01-prepare-initrd

@@ -0,0 +1,11 @@
+#!/bin/sh -x
+
+if [ -n "$GLOBAL_THE_INITRDFEATURES" ]; then
+	echo "FEATURES += $GLOBAL_THE_INITRDFEATURES" >> /etc/initrd.mk
+fi
+
+if [ -n "$GLOBAL_THE_INITRDMODULES" ]; then
+	echo "MODULES_ADD += $GLOBAL_THE_INITRDMODULES" >> /etc/initrd.mk
+fi
+
+exit 0

features.in/kernel/stage1/scripts.d/80-make-initrd

@@ -28,8 +28,15 @@ fi
 make-initrd $MAKE_INITRD_OPTS ||
 	fatal "make-initrd failed"
 
+case `arch` in
+e2k)
+	kname=image;;
+*)
+	kname=vmlinuz;;
+esac
+
 [ -h /boot/vmlinuz ] ||
-	ln -s vmlinuz-$kver /boot/vmlinuz
+	ln -s $kname-$kver /boot/$kname
 
 [ -h /boot/initrd.img ] ||
 	ln -s initrd-$kver.img /boot/initrd.img

features.in/l10n/config.mk

@@ -7,7 +7,6 @@
 # TODO: KEYMAP for default keymap?
 use/l10n:
 	@$(call add_feature)
-	@$(call add,STAGE2_BOOTARGS,lang=$$(LOCALE))
 	@$(call add,THE_PACKAGES,glibc-locales)
 	@$(call add,LOCALES,en_US)
 	@$(call add,XKB_KEYMAPS,us)

features.in/ldm/README

@@ -0,0 +1,9 @@
+Simple hook to run Linux Driver Management tools to configure hybrid graphics
+(aka Optimus/PRIME) for different DM's.
+
+Currently supported:
++ LightDM
++ GDM
++ SDDM
+
+See https://github.com/solus-project/linux-driver-management

features.in/ldm/config.mk

@@ -0,0 +1,23 @@
++ldm: use/ldm/session; @:
+
+# common
+use/ldm: sub/rootfs use/services
+	@$(call add_feature)
+	@$(call add,COMMON_PACKAGES,ldm-tools)
+
+# configure X11 session
+use/ldm/session: use/ldm
+	@$(call add,COMMON_PACKAGES,ldm-session-init)
+	@$(call add,DEFAULT_SERVICES_ENABLE,ldm)
+
+# configure lightdm session
+use/ldm/session/lightdm: use/ldm/session
+	@$(call add,COMMON_PACKAGES,ldm-session-init-lightdm)
+
+# configure sddm session
+use/ldm/session/sddm: use/ldm/session
+	@$(call add,COMMON_PACKAGES,ldm-session-init-sddm)
+
+# configure gdm session
+use/ldm/session/gdm: use/ldm/session
+	@$(call add,COMMON_PACKAGES,ldm-session-init-gdm)

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

@@ -0,0 +1,17 @@
+#!/bin/sh -efu
+# initiate LDM hook on boot
+
+cat << EOF > /etc/systemd/system/ldm.service
+[Unit]
+Description=Runs LDM configuration hooks
+
+[Service]
+ExecStart=/usr/bin/linux-driver-management configure gpu
+Type=oneshot
+RemainAfterExit=yes
+
+[Install]
+WantedBy=default.target
+EOF
+
+systemctl enable ldm.service

features.in/live/config.mk

@@ -3,7 +3,7 @@
 # service defaults
 _ON = alteratord cpufreq-simple \
       livecd-evms livecd-fstab livecd-hostname \
-      livecd-setauth livecd-setlocale livecd-net-eth livecd-install-wmaker \
+      livecd-setauth livecd-setlocale livecd-timezone livecd-net-eth livecd-install-wmaker \
       random rpcbind plymouth avahi-daemon \
 
 _OFF = anacron blk-availability bridge clamd crond dhcpd dmeventd dnsmasq \
@@ -30,6 +30,7 @@ use/live/base: use/live/.base use/net use/deflogin/live
 ifeq (,$(EFI_BOOTLOADER))
 use/live/rw: use/live use/syslinux
 	@$(call add,SYSLINUX_CFG,live_rw)
+	@$(call add,GRUB_CFG,live_rw)
 else
 use/live/rw: use/live; @:
 endif
@@ -49,8 +50,7 @@ use/live/desktop: use/live/x11 use/x11/xorg use/x11/wacom \
 
 # preconfigure apt for both live and installed-from-live systems
 use/live/repo: use/live
-	@$(call add,LIVE_PACKAGES,installer-feature-online-repo)
-	@$(call try,LIVE_REPO,http/alt)
+	@$(call try,LIVE_REPO,http/yandex)
 	@$(call xport,LIVE_REPO)
 
 # preconfigure apt in runtime (less reliable)
@@ -58,7 +58,8 @@ use/live/repo/online:
 	@$(call add,LIVE_PACKAGES,livecd-online-repo)
 
 # alterator-based permanent installation
-use/live/install: use/metadata use/xdg-user-dirs use/syslinux/localboot.cfg
+use/live/install: use/metadata use/xdg-user-dirs use/syslinux/localboot.cfg \
+	use/bootloader/live use/bootloader/grub
 	@$(call add,LIVE_PACKAGES,livecd-install)
 	@$(call add,LIVE_PACKAGES,livecd-installer-features)
 

features.in/live/live/image-scripts.d/65-os-release

@@ -0,0 +1,7 @@
+#!/bin/sh
+# Install /etc/*-release files on live if needed
+if [ -d /usr/share/branding-data-current ] && \
+	! [ -e /etc/altlinux-release ] && \
+	! [ -e /etc/os-release ]; then
+    cp -a /usr/share/branding-data-current/release/*-release /etc/
+fi

features.in/live/live/stage2cfg.mk

@@ -1,14 +1,13 @@
 # stage2 mod: livecd
 
-STAGE2_KMODULES = $(THE_KMODULES) $(LIVE_KMODULES)
+STAGE2_KMODULES = $(LIVE_KMODULES) $(THE_KMODULES)
 
-IMAGE_PACKAGES_REGEXP = $(THE_PACKAGES_REGEXP) \
-			$(LIVE_PACKAGES_REGEXP)
+IMAGE_PACKAGES_REGEXP = $(LIVE_PACKAGES_REGEXP) $(THE_PACKAGES_REGEXP)
 
-IMAGE_PACKAGES = $(call map,list, \
-			$(THE_LISTS) $(THE_GROUPS) \
-			$(LIVE_LISTS) $(LIVE_GROUPS)) \
-		 $(COMMON_PACKAGES) $(THE_PACKAGES) $(LIVE_PACKAGES) \
+IMAGE_PACKAGES = $(COMMON_PACKAGES) $(LIVE_PACKAGES) $(THE_PACKAGES) \
+		 $(call map,list, \
+			$(LIVE_LISTS) $(LIVE_GROUPS) \
+			$(THE_LISTS) $(THE_GROUPS)) \
 		 interactivesystem
 
 MKI_PACK_RESULTS = squash:live