virt/pve: Add ipset and xtables kernel modules

virt/pve: Add ZFS support
virt/extra.pkgs: Cleanup un-def kernel modules
2020-10-13 16:52:31 +03:00 · 2020-10-13 16:50:59 +03:00 · 2020-10-13 16:46:23 +03:00 · 2020-10-08 18:34:58 +07:00 · 2020-10-07 00:05:36 +07:00 · 2020-10-02 12:38:47 +07:00
944 changed files with 11518 additions and 1940 deletions
--- a/.gear/mkimage-profiles.spec
+++ b/.gear/mkimage-profiles.spec
@@ -1,17 +1,17 @@
 Name: mkimage-profiles
-Version: 1.1.93
+Version: 1.4.3
 Release: alt1

-Summary: ALT Linux based distribution metaprofile
+Summary: ALT based distribution metaprofile
 License: GPLv2+
 Group: Development/Other

 Url: http://altlinux.org/m-p
 Source: %name-%version.tar
-Packager: Michael Shigorin <mike@altlinux.org>
+Packager: Anton Midyukov <antohami@altlinux.org>

 BuildArch: noarch
-BuildRequires: rsync asciidoc-a2x fop fonts-ttf-dejavu
+BuildRequires: rsync

 Requires: rsync git-core
 Requires: time schedutils sfdisk
@@ -26,10 +26,7 @@ Requires: mkimage-preinstall
 %def_with doc
 %define docs $HOME/docs

-%package doc
-Summary: %name documentation
-Group: Development/Documentation
-%{?_with_doc:BuildRequires: java /proc}
+Summary(ru_RU.UTF-8): метапрофиль дистрибутивов на базе Альт

 %description
 mkimage-profiles is a collection of bits and pieces useful for
@@ -40,12 +37,13 @@ to choose from, and some ready-made image recipes as well.
 Make no mistake: constructing distributions isn't just fun, it takes
 a lot of passion and knowledge to produce a non-trivial one.  So m-p
 (the short alias for mkimage-profiles) is complex too.  If you need
-- or want -- to make just a few tweaks to an existing recipe, it might
+-- or want -- to make a few tweaks to an existing recipe, it might
 be easier to comprehend the generated profile (aka builddir) which
 contains only the needed subprofiles, script hooks and package lists
 and is way more compact.

-Virtual environment template caches (OpenVZ/LXC) can be made either.
+The main deliverable form for x86 is a (hybrid) ISO; virtual environment
+template caches (OpenVZ/LXC) can be made either as well as VM disk images.

 In short, setup hasher (http://en.altlinux.org/hasher) and here we go:
  cd %mpdir
@@ -55,12 +53,52 @@ In short, setup hasher (http://en.altlinux.org/hasher) and here we go:
 But if you're into regular distro hacking and are not afraid of make
 and modest metaprogramming (some code generation and introspection),
 welcome to the metaprofile itself; read the docs and get the git:
+%url (NB: these are mostly in Russian with translation on demand).
+
+%description -l ru_RU.UTF-8
+mkimage-profiles является собранием всего необходимого для
+построения дистрибутивов и содержит списки пакетов, особенности
+и целые субпрофили (вроде "кирпичика" rescue), из которых можно
+выбирать требуемое; также включены и описания готовых образов.
+
+Поймите правильно: создание дистрибутивов является занятием
+не только интересным, но и требующим вдохновения и знаний
+для получения нетривиального результата.  Если хочется или же
+необходимо чуток поправить уже существующий "рецепт", может
+быть проще разобраться в сгенерированном профиле (builddir),
+который содержит только необходимые субпрофили, скрипты
+и списки пакетов, являясь намного более компактным.
+
+Основной формой результата на x86 является (гибридный) ISO-образ;
+также возможно создавать шаблоны контейнеров OpenVZ/LXC и образы
+дисков виртуальных машин.
+
+Короче говоря, настройте hasher (http://altlinux.org/hasher) и:
+  cd %mpdir
+  head README
+  make syslinux.iso
+
+Но если разработка дистрибутивов становится обыденным делом
+и не страшитесь make и чуточки метапрограммирования (немного
+генерирования кода и интроспекции), добро пожаловать в сам
+метапрофиль; гляньте документацию и забирайте git:
 %url

+%package doc
+Summary: %name documentation
+Group: Development/Documentation
+%{?_with_doc:BuildRequires: java /proc}
+%{?_with_doc:BuildRequires: asciidoc-a2x fop fonts-ttf-dejavu}
+Summary(ru_RU.UTF-8): документация %name
+
 %description doc
 This package holds developer docs for %name
 as a book in HTML and PDF formats.

+%description -l ru_RU.UTF-8 doc
+Этот пакет содержит документацию разработчика
+для %name в форме книжки (HTML, PDF).
+
 %prep
 %setup

@@ -90,6 +128,251 @@ mv %buildroot%mpdir/doc/mkimage-profiles.7 %buildroot%_man7dir/
 %endif

 %changelog
+* Fri Sep 25 2020 Anton Midyukov <antohami@altlinux.org> 1.4.3-alt1
+- education: added commits skipped when rebase was done
+- wireless: added rtl8812au driver
+- partially added commits from the kworkstation
+- added e2k patches (mike@)
+- tar2fs: set UUID in extlinux.conf, if exist
+- vm.mk: simplified conditions for choosing a bootloader depending on arch
+- added a couple of commits (obirvalger@)
+- added commits for mipsel support (iv@)
+- added the ability to override fonts (needed kworkstation)
+- added target use/live/no-cleanup which is needed to disable cleanup
+  documentation and rpmdb; is needed for live kworkstation without
+  livecd-install
+- fixed adding empty variable in "use/efi"
+- don't cleanup dri modules from install2 (needed for support glamore)
+- metadata/lib/50-metadata.mk: space-prefixed strings handling fixed (boyarsh@)
+
+* Tue Sep 01 2020 Anton Midyukov <antohami@altlinux.org> 1.4.2-alt1
+- x11: Added missing xorg-dri-armsoc for armh
+- oem: Added rootfs-installer-features
+- server-v: Added more commits by andy@, shaba@
+- Set default timeout 60 seconds for syslinux and grub
+- Set default item to install2 for syslinux and grub
+- main.mk: Added vm/, ve/ targets into everything target
+- Extended e2k support in distributions (thanks mike@)
+- education: fix build and install
+
+* Mon Aug 17 2020 Anton Midyukov <antohami@altlinux.org> 1.4.1-alt1
+- Revert commit for support multiple kernel in iso image.
+
+* Mon Aug 17 2020 Anton Midyukov <antohami@altlinux.org> 1.4.0-alt1
+- New official maintainer antohami@ (blessed by mike@)
+- Added grub config file generator for iso images
+  (thanks shaba@)
+- Expanded support for USB controllers and SD card readers
+- Added support for booting on single-board Raspberry Pi 3 and 4
+  in EFI mode (u-boot or edk2)
+- Added grub-efi bootloader support for rootfs images
+- Merged with branches for Workstation, Education,
+  Simply Linux, Server, Server-V distributions
+- Added a starterkit build profile with a real-time kernel (live)
+- Added riscv64 platform support (thanks arei@)
+- rootfs: support headless boot via alterator-setup-vnc (thanks arei@)
+
+* Mon Nov 18 2019 Michael Shigorin <mike@altlinux.org> 1.3.15-alt1
+- autoinstall fix (sin@)
+- Baikal-M support, @ARM, elogind removal, other tweaks (antohami@)
+- factored out archdep-filter, pulled in check-pkg-list (me)
+
+* Mon Oct 21 2019 Michael Shigorin <mike@altlinux.org> 1.3.14-alt1
+- make bails out on single image build error, see also make -k (iv@)
+- mipsel support (iv@, antohami@)
+- regular-vm.mk, refactoring, cleanups (antohami@)
+
+* Mon Sep 16 2019 Michael Shigorin <mike@altlinux.org> 1.3.13-alt1
+- recovery.tar support (iv@)
+- mixin/mixin deps, aarch64 EFI, mcom02 & jetson nano support,
+  multikernel & portability fixes, refactoring & cleanups (antohami@)
+- document STAGE1_MODLISTS (me)
+
+* Mon Aug 19 2019 Michael Shigorin <mike@altlinux.org> 1.3.12-alt1
+- ppc64le support (glebfm@)
+- build-vm hacked to build tarballs too (iv@ et al)
+- p8.mk: dropped; along with other cleanups/fixups (antohami@)
+
+* Tue Jul 09 2019 Michael Shigorin <mike@altlinux.org> 1.3.11.1-alt1
+- x11: reverted vulkan changes (need more testing)
+
+* Mon Jul 08 2019 Michael Shigorin <mike@altlinux.org> 1.3.11-alt1
+- pkg.in/profiles subdirs support (shaba@)
+- repo fixup regarding target arch (obirvalger@)
+- switch back to yandex mirror by default,
+  portability fixes, refactoring, cleanups (antohami@)
+- x11 amdgpu/radeon and dm fixups, vmguest refactoring (me)
+
+* Mon Jun 17 2019 Michael Shigorin <mike@altlinux.org> 1.3.10-alt1
+- add server-v profile, drop groups/openstack (shaba@)
+
+* Mon Jun 10 2019 Michael Shigorin <mike@altlinux.org> 1.3.9-alt1
+- uboot feature, bootloader refactoring, etc (antohami@)
+- cleanlog factored out from reports.mk (me)
+
+* Mon Jun 03 2019 Michael Shigorin <mike@altlinux.org> 1.3.8-alt1
+- p9.mk, office feature and other enhancements/fixes (antohami@)
+- education (cas@)
+- simply (sem@)
+- minor tidbits and major merge-up (me)
+
+* Mon May 06 2019 Michael Shigorin <mike@altlinux.org> 1.3.7-alt1
+- docker, vm, browser fixups (obirvalger@)
+- elogind support, refactoring, cleanups (antohami@)
+- a couple more improvements (me)
+
+* Mon Apr 01 2019 Michael Shigorin <mike@altlinux.org> 1.3.6-alt1
+- no joke!
+
+* Mon Mar 04 2019 Michael Shigorin <mike@altlinux.org> 1.3.5-alt1
+- Spring 2019 patch queue cleanup
+  + antohami@, jqt4@, iv@, obirvalger@, zerg@, me
+  + tar2fs fixes for mipsel, qemu etc
+  + lots of pkglist updates
+
+* Mon Jan 14 2019 Michael Shigorin <mike@altlinux.org> 1.3.4-alt1
+- new 2019 year release ;-)
+- tar2fs related security fix (iv@) iff sudo's been configured
+- use/x11/dm rework (antohami@)
+- archfixes (antohami@, iv@)
+- pre-p8 bits cleanup (me)
+
+* Mon Dec 24 2018 Michael Shigorin <mike@altlinux.org> 1.3.3-alt1
+- aarch64/armh portability fixups (antohami@)
+- grub-based vm images (shaba@)
+- even smaller images (glebfm@)
+- lxc/lxd lists/feature/image (dans@)
+- updated robotics lists/image (dd@)
+- e2k: 801/101/jeos tweaks (me)
+
+* Mon Dec 10 2018 Michael Shigorin <mike@altlinux.org> 1.3.2-alt1
+- sisyphus drops
+
+* 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
+
+* Mon Jul 31 2017 Michael Shigorin <mike@altlinux.org> 1.1.110-alt1
+- lxde-sysv
+
+* Mon Jun 12 2017 Michael Shigorin <mike@altlinux.org> 1.1.109-alt1
+- starterkits-20170612
+
+* Mon Apr 24 2017 Michael Shigorin <mike@altlinux.org> 1.1.108-alt1
+- yandex.mirror
+
+* Mon Apr 03 2017 Michael Shigorin <mike@altlinux.org> 1.1.107-alt1
+- serial improvements
+
+* Mon Mar 13 2017 Michael Shigorin <mike@altlinux.org> 1.1.106-alt1
+- starterkits-20170312
+
+* Mon Feb 27 2017 Michael Shigorin <mike@altlinux.org> 1.1.105-alt1
+- disable git hooks (glebfm@)
+
+* Mon Feb 06 2017 Michael Shigorin <mike@altlinux.org> 1.1.104-alt1
+- [[vncinst]] fixed
+
+* Mon Jan 30 2017 Michael Shigorin <mike@altlinux.org> 1.1.103-alt1
+- rescue -= bootsplash
+
+* Mon Jan 09 2017 Michael Shigorin <mike@altlinux.org> 1.1.102-alt1
+- 2017
+
+* Mon Dec 12 2016 Michael Shigorin <mike@altlinux.org> 1.1.101-alt1
+- starterkits-20161212
+
+* Mon Dec 05 2016 Michael Shigorin <mike@altlinux.org> 1.1.100-alt1
+- preparing for starterkits
+
+* Mon Nov 14 2016 Michael Shigorin <mike@altlinux.org> 1.1.99-alt1
+- xfce-sysv
+- preparing...
+
+* Mon Oct 31 2016 Michael Shigorin <mike@altlinux.org> 1.1.98-alt1
+- preparing for workstation 8.1
+
+* Mon Oct 03 2016 Michael Shigorin <mike@altlinux.org> 1.1.97-alt1
+- regular tweaks
+
+* Mon Sep 12 2016 Michael Shigorin <mike@altlinux.org> 1.1.96-alt1
+- starterkits-20160912
+
+* Mon Aug 15 2016 Michael Shigorin <mike@altlinux.org> 1.1.95-alt1
+- s/basealt/alt/g
+
+* Mon Jun 27 2016 Michael Shigorin <mike@altlinux.org> 1.1.94-alt1
+- workstation
+
 * Mon Jun 13 2016 Michael Shigorin <mike@altlinux.org> 1.1.93-alt1
 - starterkits-20160612

--- a/.gear/tags/94f41754b87c908a12be5237ea2e4478e8d8f50f
+++ b/.gear/tags/94f41754b87c908a12be5237ea2e4478e8d8f50f
@@ -1,6 +0,0 @@
-object a6dc910d144a87c1c5303b3d8f6d5ca929c8a7c0
-type commit
-tag v1.1.92
-tagger Michael Shigorin <mike@altlinux.org> 1464632677 +0300
-
-server-openstack
--- a/.gear/tags/c4e7ad4a898add7e4fee4e3dd0c9e5141924974d
+++ b/.gear/tags/c4e7ad4a898add7e4fee4e3dd0c9e5141924974d
@@ -0,0 +1,6 @@
+object 7295127cdf9588a56a2466e9258605a666c8a96f
+type commit
+tag v1.4.3
+tagger Anton Midyukov <antohami@altlinux.org> 1601014181 +0700
+
+v1.4.3
--- a/.gear/tags/list
+++ b/.gear/tags/list
@@ -1 +1 @@
-94f41754b87c908a12be5237ea2e4478e8d8f50f v1.1.92
+c4e7ad4a898add7e4fee4e3dd0c9e5141924974d v1.4.3
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
 *~
 .*.swp
 build
+image.in/files/*
--- a/4
+++ b/4
@@ -8,7 +8,7 @@
 # for immediate assignment
 ifndef ARCH
 ARCH := $(shell arch \
-	| sed 's/i686/i586/; s/armv7.*/armh/; s/armv.*/arm/; s/ppc.*/ppc/')
+	| sed 's/i686/i586/; s/armv7.*/armh/; s/armv.*/arm/')
 endif

 ifndef ARCHES
@@ -66,6 +66,8 @@ SHELL = /bin/bash
 			if [ -n "$$REPORT" ]; then \
 				$(MAKE) -f reports.mk ARCH=$$ARCH; \
 			fi; \
+		else \
+			exit 1; \
 		fi; \
 	done; \
 	if [ "$$n" -lt "$(NUM_TARGETS)" ]; then say; fi
--- a/3
+++ b/3
@@ -3,7 +3,7 @@ http://en.altlinux.org/Hasher; large tmpfs helps a lot).

 требуется
 ~~~~~~~~~
- ALT Linux 7.0 или выше (возможна адаптация "вниз")
+- ALT 8.0 или выше (возможна адаптация "вниз", см. ветки)
 - установленный mkimage (свежий, как и hasher)
 - пользователь с правом запуска hasher и подключения /proc к нему

@@ -51,3 +51,4 @@ $ make ARCH=i586 APTCONF=~/apt/apt.conf.i586 REPORT=1 ve/generic.tar
 - http://www.altlinux.org/mkimage
 - http://www.altlinux.org/m-p
 - http://www.altlinux.org/m-p-howto ("как поправить под себя")
+- http://www.altlinux.org/starterkits/builder (сборочный LiveCD)
--- a/bin/archdep-filter
+++ b/bin/archdep-filter
@@ -0,0 +1,49 @@
+#!/bin/sh
+# filter stdin or file for words related to
+# the specified target architecture
+#
+# args: -a arch [-i file]
+
+if [ "$1" = "-a" -a -n "$2" ]; then
+	a="$2"
+	shift 2
+else
+	cat
+	exit
+fi
+
+if [ "$1" = "-i" -a -w "$2" ]; then
+	f="$2"
+	t="`mktemp`"
+fi
+
+# map meta-arches for prefiltering
+# NB: biarch gets special expansion later
+case "$a" in
+i586)
+	A="(IA32|X86)";;
+x86_64)
+	A="X86";;
+e2k*)
+	A="E2K";;
+aarch64|arm*)
+	A="ARM";;
+*)
+	A=;;
+esac
+
+# NB: pipe runs in parallel => faster than -e -e
+cat ${f:+"$f"} |
+sed -rn "s/\<([^@ ]*)\>|\<([^@ ]*)@$A\>/\1\2/pg" |
+sed -rn "s/\<([^@ ]*)\>|\<[^@ ]*@\!$A\> */\1/pg" |
+sed -r  "s/\<([^@ ]*)@IA32\>/\1@i586 i586-\1@x86_64/g" |
+sed -rn "s/\<([^@ ]*)\>|\<([^@ ]*)@$a\>/\1\2/pg" |
+sed -rn "s/\<([^@ ]*)\>|\<[^@ ]*@\!$a\> */\1/pg" |
+sed -r  "s/\<([^@ ]*)@\![^@ ]+\>/\1/g" |
+sed -r  "s/\<([^@ ]*)@[^@ ]+\> *//g" |
+sed -r  "s/^ +//;s/ +$//" |
+if [ -n "$f" ]; then
+	cat > "$t" && mv "$t" "$f"
+else
+	cat
+fi
--- a/bin/check-pkg-list
+++ b/bin/check-pkg-list
@@ -0,0 +1,101 @@
+#!/bin/sh
+# script based on initial implementation
+# by Vitaly Gusach (http://gusach.org.ua)
+#
+# purpose: warn on those entries in given packagelists(s)
+# which are definitely absent; the build might still bail out
+# but at least 80% of failures can be predicted early now
+#
+# usage: check-pkg-list [-n pkgnames] pkglist ...
+# (pkgnames file should contain `apt-cache pkgnames`)
+# NB: -n pkgnames MUST go first, if given
+
+error() { echo `basename $0`: $* >&2; exit 1; }
+debug() { [ -n "$GLOBAL_VERBOSE" ] && echo `basename $0`: $* >&2; }
+
+exit_handler() {
+	local rc=$?
+	trap - EXIT
+	rm -f -- "$ftemp" "$fpkgnames" "$fpkgwildcards" "$favaillist"
+	exit $rc
+}
+
+# find the most recent apt.conf in workdirs
+apt_conf() {
+	debug "looking for workdirs with aptboxes..."
+	find -maxdepth 3 -name .work \
+	| while read dir; do
+		file="$dir/aptbox/etc/apt/apt.conf"
+		[ -f "$file" ] && echo "$file"
+	done \
+	| xargs -r ls -t -- \
+	| head -1
+}
+
+# figure out apt.conf from recent aptbox or fallback to system one
+# TODO: would be nice to cache the dump inside aptbox
+dump_pkgnames() {
+	conf="`apt_conf`"
+	debug "autodetected apt.conf: ${conf:-<system>}, dumping pkgnames"
+	apt-cache ${conf:+-c $conf} pkgnames | sort > "$favaillist"
+}
+
+check_pkglist() {
+	fprofilelist="$1"
+	[ -f "$fprofilelist" ] || error "invalid packagelist filename: $fprofilelist"
+	[ -n "$MULTI" ] && echo "-- $fprofilelist"
+	debug "checking $fprofilelist against $favaillist"
+
+	# cleaning pkg list from comments, empty lines,
+	# splitting several pkgnames on the same line
+	sed -e '/^#/d' -e '/^[ 	]*$/d' -e 's/ \+$//' -e 's/[ 	]\+/\n/g' \
+	< "$fprofilelist" \
+	| sed 's/-$//' \
+	| sort -u \
+	> "$ftemp" # got list of pkgnames we need
+
+	# split pkgnames without wildcards and with wildcards
+	fgrep -v '*' "$ftemp" > "$fpkgnames"
+	fgrep 	 '*' "$ftemp" > "$fpkgwildcards"
+
+	# return unavailable packages
+	debug "unavailable packagenames, if any:"
+	comm -23 "$fpkgnames" "$ftemp"
+
+	# return unavailable wildcards
+	debug "unavailable wildcards, if any:"
+	while read i; do
+		# replacing * with regexp's \.+
+		pattern="^`echo ${i#^} | sed -e 's/\*/.\\\\+/'`$"
+		grep -q "$pattern" "$favaillist" || echo "$i"
+	done < "$fpkgwildcards"
+}
+
+[ "$#" -gt 0 ] || error "need at least one argument, a packagelist to check"
+
+# reusable temporary files with self-cleanup at exit
+TEMP="${TMP:-/tmp}"
+trap exit_handler HUP INT QUIT TERM EXIT
+favaillist="`mktemp $TEMP/pkgchecker.avail.XXXXX`"
+fpkgnames="`mktemp $TEMP/pkgchecker.names.XXXXX`"
+fpkgwildcards="`mktemp $TEMP/pkgchecker.wildcards.XXXXX`"
+ftemp="`mktemp $TEMP/pkgchecker.XXXXX`"
+
+# make sure pkgnames dump is handy
+case "$1" in
+"-n"|"--pkgnames")
+	[ -f "$2" ] && {
+		sort "$2" > "$favaillist"
+		shift; shift
+	} || error "-n needs valid pkgnames filename"
+	;;
+esac
+
+[ -s "$favaillist" ] || dump_pkgnames
+
+# now on to the real job; Q: skip *.in or not?
+[ "$#" -eq 1 ] && MULTI= || MULTI=1
+
+for list in "$@"; do
+	check_pkglist "$list"
+done
--- a/bin/check-recipe
+++ b/bin/check-recipe
@@ -0,0 +1,14 @@
+#!/bin/sh
+
+# missing "; @:" for recipeless rules makes SHELL payload useless
+# (see also ../lib/report.mk); this results in broken target graphs
+# (so REPORT=1 gets crippled)
+
+  sed 's/^[a-z]\+\/.*:.*$/\n&/' "$@" \
+| grep -vE '^(#|export|if|else|endif|define|endef)' \
+| sed ':loop /^[^#].*[^\\]\\$/N; s/\\\n//; t loop' \
+| grep -vE ':=| = | ?= | += |^\$' \
+| sed ':loop /^[a-z]\+\/.*:.*$/N; s/\n\t\+@*/\; /; t loop' \
+| grep -vE ';|^$' && exit 1 ||:
+
+# see also http://unix.stackexchange.com/questions/228547
--- a/bin/cleanlog
+++ b/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"
--- a/bin/mktmpdir
+++ b/bin/mktmpdir
@@ -2,6 +2,8 @@
 # analyze free space, preferring tmpfs over really many gigaz
 # and taking into account configured hasher workdir prefices

+# NB: use BUILDDIR to override autodetection (see ../QUICKSTART)
+
 # hope there aren't spaces in RM's $HOME are they?
 DIRS="$TMP $TMPDIR $HOME/hasher /tmp /var/tmp .."
 MINSIZE=262144		# face control criterion
--- a/bin/mp-commit
+++ b/bin/mp-commit
@@ -20,7 +20,7 @@ if type -t git >&/dev/null && pushd "$1" >/dev/null; then
 	fi
 	if [ -n "$(git status -s)" ]; then
 		git add . \
-		&& git commit -qam "$2" \
+		&& git commit -anq -m "$2" \
 		|| fatal "git add/commit failed"
 	fi
 	popd >/dev/null
--- a/bin/report-targets
+++ b/bin/report-targets
@@ -21,10 +21,10 @@ while read first second third rest; do
 	for to in $TO; do
 		out="  \"$FROM\" -> \"$to\""
 		case $to in
-		*distro/*|*vm/*)
+		*distro/*|*vm/*|*ve/*)
 			echo "$out [weight=10];";;
 		*)
-			echo "$out";;
+			echo "$out;";;
 		esac
 	done
 done
--- a/bin/tar2fs
+++ b/bin/tar2fs
@@ -24,28 +24,66 @@ MB=1048576		# a parted's "megabyte" in bytes is *broken*

 SIZE_FACTOR=2		# multiply the sizes found by this value
 BOOT_SIZE_FACTOR=2	# multiply /boot size by this value additionally
+BOOTLOADERPARTSIZEM=0	# PReP partition size (ppc*)

 CUR_BOUNDARY=0		# align first partition at 1MB for performance (+1)

-INITRD_MODULES=
 BOOTFSTYPE=
 BOOTPART=
+EFIPARTFSTYPE=
+EFIPART=

-case "`arch`" in	# NB: sudo => no GLOBAL_ will do either; mind qemu-*
-*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...
+BOOTLOADER="$5"
+
+if [ -n "$6" ]; then
+	ARCH="$6"
+else
+	ARCH="$(arch)"
+fi
+
+case "$ARCH" in
+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"
+	;;
+arm*|aarch64)
+	BLOCKDEV="/dev/sda"
+	EFIPART="1"
+	EFIPARTSIZEM="256"
+	EFIPARTFSTYPE="fat"
+	ROOTPART="2"
+	;;
+*)
+	if [ "$BOOTLOADER" == grub-efi ]; then
+		EFIPART="1"
+		EFIPARTSIZEM="256"
+		EFIPARTFSTYPE="fat"
+		ROOTPART="2"
+	else
+		ROOTPART="1"
+	fi
+	BLOCKDEV="/dev/sda"
+	;;
 esac

+PARTTABLE="$7"
+if [ -z "$PARTTABLE" ]; then
+	if [ "$BOOTLOADER" == grub-efi ]; then
+		PARTTABLE=gpt
+	else
+		PARTTABLE=msdos
+	fi
+fi
+
 # figure out the part taken by /boot in the given tarball
 boot_size() {
 	if [ -n "$BOOTPART" ]; then
@@ -73,9 +111,14 @@ mkpart() {
 		CUR_BOUNDARY="$(($start + $1))"
 		local end="$CUR_BOUNDARY"MiB
 	else
-		local end="-1s"	# last sector of the image
+		local end="$OFFSET"MiB
 	fi
-	parting mkpart primary ext2 "$start"MiB "$end"
+	if [ -n "$2" ]; then
+		CUR_FS="$2"
+	else
+		CUR_FS=ext2
+	fi
+	parting mkpart primary "$CUR_FS" "$start"MiB "$end"
 }

 # a tarball containing chroot with a kernel
@@ -109,7 +152,8 @@ ROOTFSTYPE="${4:-ext4}"
 ROOTDEV="$BLOCKDEV$ROOTPART"

 # last preparations...
-MKFS="mkfs.$ROOTFSTYPE ${BOOTFSTYPE:+mkfs.$BOOTFSTYPE}"
+MKFS="mkfs.$ROOTFSTYPE ${BOOTFSTYPE:+mkfs.$BOOTFSTYPE} \
+  ${EFIPARTFSTYPE:+mkfs.$EFIPARTFSTYPE}"
 for i in losetup sfdisk parted kpartx $MKFS; do
 	if ! type -t "$i" >&/dev/null; then
 		fatal "$i required but not found in host system"
@@ -120,17 +164,26 @@ LOOPDEV="$(losetup --find)"	# would be sad about non-binary megabytes too
 ROOTFS="$WORKDIR/chroot"

 BOOTFS=
+EFIPARTFS=
 if [ -n "$BOOTPART" ]; then
 	BOOTFS="$ROOTFS/boot"
 fi
+if [ -n "$EFIPART" ]; then
+	EFIPARTFS="$ROOTFS/boot/efi"
+fi

 exit_handler() {
 	rc=$?
+	cd /
 	if [ -n "$ROOTFS" ]; then
-		umount ${BOOTFS:+"$BOOTFS"} "$ROOTFS"{/dev,/proc,/sys,}
+		umount ${EFIPARTFS:+"$EFIPARTFS"} ${BOOTFS:+"$BOOTFS"} \
+		  "$ROOTFS"{/dev,/proc,/sys,}

 		if [ -n "$LOOPDEV" ]; then
-			kpartx -d -s "$LOOPDEV"
+			kpartx -d -s "$LOOPDEV" || {
+				sleep 10
+				kpartx -d -s -v "$LOOPDEV"
+			}
 			losetup --detach "$LOOPDEV"
 		fi
 		rm -r -- "$ROOTFS"
@@ -144,11 +197,36 @@ trap exit_handler EXIT ERR

 # prepare disk image and a filesystem inside it
 rm -f -- "$IMG"
-OFFSET="$(($CUR_BOUNDARY + $BOOTSIZEM + $ROOTSIZEM - 1))"
+OFFSET="$(($CUR_BOUNDARY + $EFIPARTSIZEM + $BOOTLOADERPARTSIZEM + $BOOTSIZEM + $ROOTSIZEM - 1))"
 dd if=/dev/zero of="$IMG" conv=notrunc bs=$MB count=1 seek="$OFFSET"
 losetup "$LOOPDEV" "$IMG"

-parting mklabel msdos
+parting mklabel "$PARTTABLE"
+
+if [ -n "$BOOTLOADERPART" ] && [ -n "$BOOTLOADERPARTSIZEM" ]; then
+	case "$ARCH" in
+		ppc*)
+			parting mkpart primary ext2 2048s $((BOOTLOADERPARTSIZEM + 1))MiB
+			CUR_BOUNDARY="$BOOTLOADERPARTSIZEM"
+			parting set 1 prep on
+			parting set 1 boot on
+			;;
+	esac
+fi
+
+if [ -n "$EFIPART" ]; then
+	EFIDEV="$EFIDEV$EFIPART"
+	if [ "$PARTTABLE" == gpt ]; then
+		parting mkpart fat32 2048s $(($EFIPARTSIZEM + 1))MiB
+	else
+		parting mkpart primary fat32 2048s $(($EFIPARTSIZEM + 1))MiB
+	fi
+	CUR_BOUNDARY="$EFIPARTSIZEM"
+	parting set 1 boot on
+	if [ "$PARTTABLE" == gpt ]; then
+		parting set 1 esp on
+	fi
+fi

 if [ -n "$BOOTPART" ]; then
 	BOOTDEV="$BLOCKDEV$BOOTPART"
@@ -168,6 +246,15 @@ if [ -n "$BOOTPART" ]; then
 	mkfs."$BOOTFSTYPE" "$LOOPBOOT"
 fi

+if [ -n "$BOOTLOADERPART" ] && [ -n "$BOOTLOADERPARTSIZEM" ]; then
+	LOOPBOOTLOADER="/dev/mapper/$(basename "$LOOPDEV")p$BOOTLOADERPART"
+fi
+
+if [ -n "$EFIPART" ]; then
+	LOOPEFI="/dev/mapper/$(basename "$LOOPDEV")p$EFIPART"
+	mkfs.fat -F32 "$LOOPEFI"
+fi
+
 ROOTUUID="$(blkid -s UUID -o value -c /dev/null "$LOOPROOT")"
 if [ -n "$ROOTUUID" ]; then
       ROOTDEV="UUID=$ROOTUUID"
@@ -177,11 +264,18 @@ fi

 if [ -n "$BOOTPART" ]; then
 	BOOTUUID="$(blkid -s UUID -o value -c /dev/null "$LOOPBOOT")"
-	if [ -n "$ROOTUUID" ]; then
+	if [ -n "$BOOTUUID" ]; then
 		BOOTDEV="UUID=$BOOTUUID"
 	fi
 fi

+if [ -n "$EFIPART" ]; then
+	EFIUUID="$(blkid -s UUID -o value -c /dev/null "$LOOPEFI")"
+	if [ -n "$EFIUUID" ]; then
+		EFIDEV="UUID=$EFIUUID"
+	fi
+fi
+
 # mount and populate it
 mkdir -pm755 "$ROOTFS"
 mount "$LOOPROOT" "$ROOTFS"
@@ -191,27 +285,91 @@ if [ -n "$BOOTPART" ]; then
 	mount "$LOOPBOOT" "$BOOTFS"
 fi

+if [ -n "$EFIPART" ]; then
+	mkdir -pm751 "$EFIPARTFS"
+	mount "$LOOPEFI" "$EFIPARTFS"
+fi
+
 tar -C "$ROOTFS" --numeric-owner -xf "$TAR"
 for i in /dev /proc /sys; do mount --bind "$i" "$ROOTFS$i"; done

 # loop device so lilo could work...
-echo "$ROOTDEV / $ROOTFSTYPE relatime 1 1" >> "$ROOTFS/etc/fstab"
+if grep -qe "[[:space:]]/[[:space:]]" "$ROOTFS/etc/fstab"; then \
+	sed -i "s/LABEL=ROOT/$ROOTDEV/" "$ROOTFS/etc/fstab"
+else
+	echo "$ROOTDEV / $ROOTFSTYPE relatime 1 1" >> "$ROOTFS/etc/fstab"
+fi

 # target device at once
 if [ -n "$BOOTPART" ]; then
 	echo "$BOOTDEV /boot $BOOTFSTYPE defaults 1 2" >> "$ROOTFS/etc/fstab"
 fi
+if [ -n "$EFIPART" ]; then
+	echo "$EFIDEV /boot/efi vfat umask=0,quiet,showexec,iocharset=utf8,codepage=866 1 2" >> "$ROOTFS/etc/fstab"
+fi

-echo "MODULES_PRELOAD += $INITRD_MODULES $ROOTFSTYPE" >> "$ROOTFS/etc/initrd.mk"
-echo "FEATURES += qemu" >> "$ROOTFS/etc/initrd.mk"
+# Query ARCH in chroot and redefine arch-dependent variable
+ARCH="$(chroot "$ROOTFS" rpm --eval '%_host_cpu')"

-KERNEL="$(readlink $ROOTFS/boot/vmlinuz | sed 's,vmlinuz-,,')"
-chroot "$ROOTFS" make-initrd -k "$KERNEL"
+# 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=
+KVERSIONS="$(chroot "$ROOTFS" rpm -qa 'kernel-image*' \
+            --qf '%{installtime} %{version}-%{name}-%{release}\n' \
+        | sort -n \
+        | cut -f 2 -d ' ' \
+        | sed 's/kernel-image-//')"
+[ -n "$KVERSIONS" ] || fatal "unable to deduce kernel version"
+rm -f .origver
+
+# clean fstab
+sed -i "/LABEL=ROOT/d" "$ROOTFS/etc/fstab"
 # ...target device too
 sed -i "s,$LOOPROOT,$ROOTDEV," "$ROOTFS/etc/fstab"

-if [ -x "$ROOTFS"/sbin/lilo ]; then
+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
+
+# Update cmdline.txt for Raspberry Pi
+[ -f "$ROOTFS/boot/efi/cmdline.txt" ] &&
+    sed -i "s/LABEL=ROOT/$ROOTDEV/" "$ROOTFS/boot/efi/cmdline.txt"
+
+# Update extlinux.conf
+[ -f "$ROOTFS/boot/extlinux/extlinux.conf" ] &&
+    sed -i "s/LABEL=ROOT/$ROOTDEV/g" "$ROOTFS/boot/extlinux/extlinux.conf"
+
+# Setup bootloader
+case "$BOOTLOADER" in
+uboot)
+	parting set "$ROOTPART" boot on
+	;;
+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@")
@@ -242,8 +400,54 @@ image=/boot/vmlinuz
 	boot=$BLOCKDEV
 	$LILO_COMMON
 	EOF
-fi
+	;;
+grub-efi)
+	chroot "$ROOTFS" grub-mkconfig -o /boot/grub/grub.cfg
+	case "$ARCH" in
+		*86)
+			chroot "$ROOTFS" grub-install --target=i386-efi --recheck \
+			  --removable  --no-uefi-secure-boot
+			sed -i 's/initrd16/initrdefi/g' "$ROOTFS/boot/grub/grub.cfg"
+			sed -i 's/linux16/linuxefi/g' "$ROOTFS/boot/grub/grub.cfg"
+		;;
+		x86_64)
+			chroot "$ROOTFS" grub-install --target=i386-efi --recheck \
+			  --removable  --no-uefi-secure-boot
+			chroot "$ROOTFS" grub-install --target=x86_64-efi --recheck \
+			  --removable  --no-uefi-secure-boot
+			sed -i 's/initrd16/initrdefi/g' "$ROOTFS/boot/grub/grub.cfg"
+			sed -i 's/linux16/linuxefi/g' "$ROOTFS/boot/grub/grub.cfg"
+		;;
+		aarch64)
+			chroot "$ROOTFS" grub-install --target=arm64-efi --recheck \
+			  --removable  --no-uefi-secure-boot
+		;;
+		armh)
+			chroot "$ROOTFS" grub-install --target=arm-efi --recheck \
+			  --removable  --no-uefi-secure-boot
+		;;
+	esac
+	;;
+grub)
+	chroot "$ROOTFS" grub-mkconfig -o /boot/grub/grub.cfg
+	case "$ARCH" in
+		*86*)
+			chroot "$ROOTFS" grub-install --target=i386-pc "$LOOPDEV"
+			sed -i 's/initrdefi/initrd16/g' "$ROOTFS/boot/grub/grub.cfg"
+			sed -i 's/linuxefi/linux16/g' "$ROOTFS/boot/grub/grub.cfg"
+			;;
+		ppc*)
+			[ -z "$LOOPBOOTLOADER" ] ||
+				chroot "$ROOTFS" grub-install --target=powerpc-ieee1275 \
+				--no-nvram "$LOOPBOOTLOADER"
+			;;
+	esac
+	;;
+esac

 if [ -n "$SUDO_USER" ]; then
-	chown "$SUDO_USER" "$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 ||:
--- a/conf.d/Makefile
+++ b/conf.d/Makefile
@@ -0,0 +1,2 @@
+check:
+	@../bin/check-recipe *.mk
--- a/conf.d/alt-server.mk
+++ b/conf.d/alt-server.mk
@@ -0,0 +1,70 @@
+ifeq (distro,$(IMAGE_CLASS))
+
+ifeq (,$(filter-out i586 x86_64 ppc64le aarch64,$(ARCH)))
+distro/alt-server: server_groups_primary = $(addprefix centaurus/,\
+        ipmi netinst sogo)
+
+ifeq (,$(filter-out x86_64 ppc64le aarch64,$(ARCH)))
+distro/alt-server: server_groups_virtipa = $(addprefix centaurus/,\
+	v12n-server freeipa-server)
+endif
+endif
+
+ifeq (,$(filter-out i586 x86_64 ppc64le aarch64 e2k%,$(ARCH)))
+distro/alt-server: server_groups_desktop = $(addprefix centaurus/,\
+        80-desktop emulators freenx-server mate office pidgin vlc xorg)
+endif
+
+distro/alt-server: monitoring = $(addprefix server-v/,\
+	90-monitoring zabbix-agent telegraf prometheus-node_exporter \
+	monit collectd nagios-nrpe)
+
+# FIXME: generalize vm-profile
+distro/alt-server:: distro/.base mixin/alt-server use/vmguest/base \
+	use/bootloader/grub use/rescue/base use/stage2/kms\
+	use/stage2/fs use/stage2/hid use/stage2/md \
+	use/stage2/mmc use/stage2/net use/stage2/net-nfs \
+	use/stage2/rtc use/stage2/sbc use/stage2/scsi use/stage2/usb \
+	use/docs/license
+	@$(call add,MAIN_GROUPS,$(server_groups_primary))
+	@$(call add,MAIN_GROUPS,$(server_groups_virtipa))
+	@$(call add,MAIN_GROUPS,$(server_groups_desktop))
+	@$(call add,MAIN_LISTS,centaurus/disk-dvd)
+	@$(call add,MAIN_LISTS,centaurus/disk-server-light)
+ifneq (,$(filter-out e2k%,$(ARCH)))
+	@$(call add,INSTALL2_PACKAGES,installer-feature-desktop-suspend-stage2)
+endif
+ifeq (,$(filter-out i586 x86_64,$(ARCH)))
+	@$(call add,INSTALL2_PACKAGES,installer-feature-setup-plymouth)
+endif
+	@$(call add,INSTALL2_PACKAGES,strace)
+	@$(call add,INSTALL2_PACKAGES,fdisk)
+	@$(call add,INSTALL2_BRANDING,notes)
+	@$(call add,BASE_KMODULES,kvm virtualbox)
+	@$(call add,CLEANUP_BASE_PACKAGES,acpid-events-power)
+	@$(call add,RESCUE_BOOTARGS,nomodeset vga=0)
+	@$(call add,EFI_BOOTARGS,lang=ru_RU)
+ifeq (,$(filter-out e2k,$(ARCH)))
+	@$(call set,META_APP_ID,ALT Server for Elbrus-4.4)
+endif
+ifeq (,$(filter-out e2kv4,$(ARCH)))
+	@$(call set,META_APP_ID,ALT Server for Elbrus-80x)
+endif
+
+ifeq (,$(filter-out x86_64 i586,$(ARCH)))
+distro/alt-server:: use/memtest; @:
+endif
+
+ifeq (,$(filter-out x86_64 aarch64,$(ARCH)))
+distro/alt-server:: use/efi/refind +efi; @:
+endif
+
+ifeq (,$(filter-out ppc64le aarch64 e2k%,$(ARCH)))
+distro/alt-server:: use/install2/vnc/listen; @:
+endif
+
+ifeq (,$(filter-out e2k%,$(ARCH)))
+distro/alt-server:: +power +net-eth; @:
+endif
+
+endif
--- a/conf.d/armh.mk
+++ b/conf.d/armh.mk
@@ -2,12 +2,6 @@ ifeq (armh,$(ARCH))

 ifeq (ve,$(IMAGE_CLASS))

-# aliases for autobuild
-ve/regular-nexus7-e17: ve/nexus7-e17; @:
-ve/regular-nexus7-kde4: ve/nexus7-kde4; @:
-ve/altlinux-p7-nexus7-e17: ve/nexus7-e17; @:
-ve/altlinux-p7-nexus7-kde4: ve/nexus7-kde4; @:
-
 ve/.tegra3-base: ve/.base use/armh use/kernel
 	@$(call add,BASE_PACKAGES,nvidia-tegra)

@@ -22,11 +16,6 @@ ve/.nexus7-tablet: ve/.tegra3-tablet use/armh-nexus7 \
 	@$(call add,BASE_PACKAGES,firmware-nexus7)
 	@$(call add,BASE_PACKAGES,livecd-ru)	### until l10n is there

-ve/nexus7-e17: ve/.nexus7-tablet use/x11/e17 use/x11/lightdm/gtk; @:
-
-ve/nexus7-kde4: ve/.nexus7-tablet use/x11/lightdm/kde +systemd +pulse +nm
-	@$(call add,BASE_LISTS,$(call tags,base kde4mobile))
-
 ve/nexus7-xfce: ve/.nexus7-tablet use/x11/xfce use/x11/lightdm/gtk +systemd
 	@$(call add,BASE_PACKAGES,florence at-spi2-atk)

@@ -71,12 +60,6 @@ vm/cubox-mate: vm/.cubox-gtk use/x11/mate; @:
 	@$(call set,BRANDING,altlinux-centaurus)
 	@$(call add,THE_BRANDING,mate-settings)

-vm/cubox-tde: vm/.cubox-oem use/net-eth/dhcp use/x11-autostart +tde
-	@$(call add,BASE_LISTS,openscada)
-
-vm/cubox-kde4: vm/.cubox-oem use/x11/kde4 use/x11/kdm4 use/fonts/zerg +pulse
-	@$(call add,BASE_LISTS,$(call tags,desktop && kde4 && !extra))
-
 vm/cubox-server: vm/.cubox-bare use/deflogin/altlinuxroot use/control/sudo-su \
 	+sysvinit
 	@$(call set,BRANDING,altlinux-centaurus)
--- a/conf.d/basealt.mk
+++ b/conf.d/basealt.mk
@@ -0,0 +1,66 @@
+ifeq (distro,$(IMAGE_CLASS))
+
+distro/alt-workstation: workstation_groups_x86 = $(addprefix workstation/,\
+	3rdparty blender clamav cloud-clients freecad \
+	gtk-dictionary kvm smartcard voip-clients)
+
+distro/alt-workstation: distro/.base +vmguest +wireless +efi \
+	mixin/desktop-installer mixin/alt-workstation \
+	mixin/alt-workstation-install \
+        use/memtest use/rescue/base use/bootloader/grub use/luks \
+        use/efi/refind use/efi/memtest86 use/efi/shell \
+	use/install2/repo use/install2/suspend use/live/suspend \
+        use/live/install use/live/x11 use/live/repo use/live/rw \
+        use/vmguest/kvm/x11 use/stage2/kms \
+	use/branding/complete use/docs/license \
+        use/domain-client/full use/x11/amdgpu use/x11/lightdm/gtk \
+	use/e2k/multiseat/801/full use/e2k/x11/101 use/e2k/sound/401
+ifeq (,$(filter-out i586 x86_64,$(ARCH)))
+	@$(call add,MAIN_GROUPS,$(workstation_groups_x86))
+endif
+ifeq (,$(filter-out x86_64,$(ARCH)))
+	@$(call add,MAIN_GROUPS,workstation/virtualbox)
+	@$(call add,BASE_KMODULES,kvm virtualbox)
+endif
+ifeq (,$(filter-out e2k%,$(ARCH)))
+	@$(call add,THE_PACKAGES,python-module-serial)
+	@$(call add,THE_PACKAGES,setup-mate-nocomposite)
+	@$(call add,THE_PACKAGES,xorg-drv-smi)	# use/x11/smi
+	@$(call add,MAIN_GROUPS,workstation/alterator-web)
+	@$(call add,SERVICES_ENABLE,ahttpd)	# in case it gets installed
+ifeq (,$(filter-out e2k,$(ARCH)))
+	@$(call set,META_VOL_ID,ALT Workstation for Elbrus 401-PC)
+endif	# e2k
+ifeq (,$(filter-out e2kv4,$(ARCH)))
+	@$(call set,META_VOL_ID,ALT Workstation for Elbrus 801/101-PC)
+endif	# e2kv4
+endif	# e2k%
+	@$(call add,RESCUE_BOOTARGS,nomodeset vga=0)
+	@$(call add,EFI_BOOTARGS,lang=ru_RU)
+
+endif	# distro
+
+ifeq (vm,$(IMAGE_CLASS))
+ifeq (,$(filter-out aarch64 armh,$(ARCH)))
+vm/alt-workstation: vm/systemd use/x11/armsoc use/x11/lightdm/gtk \
+	use/oem use/repo use/bootloader/uboot mixin/alt-workstation
+	@$(call add,THE_PACKAGES,rootfs-installer-features)
+	@$(call add,THE_PACKAGES,installer-feature-lightdm-stage3)
+	@$(call add,THE_PACKAGES,installer-feature-quota-stage2)
+
+vm/alt-workstation-rpi: vm/alt-workstation use/arm-rpi4/full; @:
+endif
+
+ifeq (,$(filter-out aarch64,$(ARCH)))
+vm/alt-workstation-tegra: vm/alt-workstation use/aarch64-tegra; @:
+endif
+
+ifeq (,$(filter-out armh,$(ARCH)))
+vm/alt-workstation-mcom02: vm/alt-workstation use/armh-mcom02/x11; @:
+endif
+
+vm/alt-workstation-cloud: vm/alt-p9-cloud use/x11/lightdm/gtk \
+	mixin/alt-workstation
+	@$(call add,THE_PACKAGES,cloud-init-config-netplan)
+	@$(call add,SYSTEMD_SERVICES_DISABLE,network.service)
+endif
--- a/conf.d/desktop.mk
+++ b/conf.d/desktop.mk
@@ -4,27 +4,11 @@ ifeq (distro,$(IMAGE_CLASS))
 distro/.desktop-base: distro/.installer use/syslinux/ui/vesamenu use/x11/xorg
 	@$(call set,INSTALLER,desktop)

-distro/.desktop-mini: distro/.desktop-base use/x11/xdm +power; @:
-
-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-mini: distro/.desktop-base use/x11/xdm; @:

 distro/.desktop-network: distro/.desktop-mini mixin/desktop-installer; @:

-distro/.desktop-extra:
-	@$(call add,BASE_LISTS,$(call tags,(archive || base) && (extra)))
-
-distro/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
--- a/conf.d/e2k.mk
+++ b/conf.d/e2k.mk
@@ -0,0 +1,74 @@
+ifeq (vm,$(IMAGE_CLASS))
+
+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 \
+	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/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-installer-base: distro/.base mixin/e2k-base \
+	use/install2 use/install2/packages use/e2k \
+	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_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; @:
+
+endif
--- a/conf.d/education.mk
+++ b/conf.d/education.mk
@@ -1,12 +1,141 @@
-# Education Set
+# ALT Education
+
+mixin/education: use/kernel use/firmware \
+	+systemd \
+	use/services \
+	use/ntp/chrony \
+	use/volumes/education \
+	use/x11/xorg use/x11/amdgpu use/x11/lightdm/gtk +pulse \
+	+nm use/x11/gtk/nm use/net-eth/dhcp \
+	use/xdg-user-dirs/deep \
+	use/office/LibreOffice/still \
+	use/office/LibreOffice/gtk3 \
+	use/office/LibreOffice/extensions \
+	use/office/LibreOffice/integrated
+	@$(call set,BRANDING,alt-education)
+	@$(call add,THE_BRANDING,indexhtml)
+	@$(call add,THE_BRANDING,menu xfce-settings system-settings)
+	@$(call add,THE_LISTS,slinux/xfce-base)
+	@$(call add,THE_LISTS,slinux/misc-base)
+	@$(call add,THE_LISTS,gnome-p2p)
+	@$(call add,THE_LISTS,$(call tags,base l10n))
+	@$(call add,BASE_LISTS,education/base)
+	@$(call add,BASE_LISTS,workstation/3rdparty)
+	@$(call add,THE_LISTS,education/misc)
+	@$(call add,THE_PACKAGES,usbutils pv lftp links2 openssh-server)
+	@$(call add,THE_PACKAGES,xinput xorg-drv-libinput)
+	@$(call add,THE_PACKAGES,net-tools fdisk gdisk parted partclone)
+	@$(call add,THE_PACKAGES,disable-usb-autosuspend)
+	@$(call add,THE_LISTS,$(call tags,base regular))

 ifeq (distro,$(IMAGE_CLASS))

-distro/education-junior: distro/.installer use/slinux/full \
-	use/l10n/default/ru_RU +vmguest
-	@$(call set,INSTALLER,junior)
-	@$(call set,BRANDING,school-junior)
-	@$(call set,META_VOL_SET,Education Junior)
-	@$(call add,THE_LISTS,education/desktop)
+mixin/education-live: \
+	use/live/install use/live/suspend \
+	use/live/repo use/live/x11 use/live/rw \
+	use/cleanup/live-no-cleanupdb
+	@$(call add,LIVE_PACKAGES,livecd-timezone)
+	@$(call add,LIVE_LISTS,slinux/net-base)
+	@$(call add,LIVE_LISTS,$(call tags,base rescue))
+
+mixin/education-installer: \
+	use/memtest \
+	use/branding/complete \
+	use/install2/vnc use/install2/full \
+	use/l10n/default/ru_RU +vmguest \
+	+efi use/efi/refind use/efi/shell \
+	use/isohybrid use/luks \
+	use/install2/fonts \
+	+plymouth +wireless \
+	use/stage2/fs use/stage2/hid use/stage2/md \
+	use/stage2/mmc use/stage2/net use/stage2/net-nfs \
+	use/stage2/rtc use/stage2/sbc use/stage2/scsi use/stage2/usb
+	@$(call set,INSTALLER,education)
+	@$(call set,META_VOL_ID,ALT Education 9.1 $(ARCH))
+	@$(call set,META_PUBLISHER,BaseALT Ltd)
+	@$(call set,META_APP_ID,$(DISTRO_VERSION) $(ARCH))
+	@$(call set,META_VOL_SET,ALT)
+	@$(call add,INSTALL2_PACKAGES,disable-usb-autosuspend)
+	@$(call add,INSTALL2_PACKAGES,installer-feature-samba-usershares-stage2)
+	@$(call add,MAIN_LISTS,slinux/not-install-full)
+	@$(call add,MAIN_GROUPS,education/01_preschool)
+	@$(call add,MAIN_GROUPS,education/02_gradeschool)
+	@$(call add,MAIN_GROUPS,education/03_highschool)
+	@$(call add,MAIN_GROUPS,education/04_secondary_vocational)
+	@$(call add,MAIN_GROUPS,education/05_university)
+	@$(call add,MAIN_GROUPS,education/07_teacher)
+	@$(call add,MAIN_GROUPS,education/08_server-apps-edu)
+	@$(call add,THE_PACKAGES,bluez pulseaudio-bluez)
+	@$(call add,THE_PACKAGES,alterator-fbi)
+	@$(call add,THE_PACKAGES,alt-rootfs-installer)
+	@$(call add,BASE_PACKAGES,os-prober)
+	@$(call add,BASE_PACKAGES,guest-account)
+	@$(call add,MAIN_PACKAGES,iperf3)
+	@$(call add,MAIN_PACKAGES,stellarium)
+	@$(call add,MAIN_PACKAGES,libreoffice-block-macros)
+	@$(call add,MAIN_PACKAGES,lmms)
+	@$(call add,STAGE2_PACKAGES,xorg-conf-libinput-touchpad)
+	@$(call add,STAGE2_PACKAGES,chrony)
+	@$(call add,STAGE1_MODLISTS,stage2-mmc)
+
+#FIXME#	mixin/education-live \
+	#
+distro/education: distro/alt-education; @:
+distro/alt-education: distro/.installer \
+	mixin/education \
+	mixin/education-live \
+	mixin/education-installer \
+	use/e2k/multiseat/801/full +power
+	@$(call set,INSTALLER,education)
+ifeq (,$(filter-out e2k%,$(ARCH)))
+	@$(call add,MAIN_GROUPS,education/06_kdesc)
+	@$(call add,MAIN_PACKAGES,xorg-conf-noblank)
+	@$(call add,THE_PACKAGES,firefox-esr-ru flashrom)
+	@$(call add,THE_PACKAGES,xscreensaver-hacks-rss_glx)
+	@$(call add,DEFAULT_SERVICES_ENABLE,acpid dnsmasq)
+	@$(call add,DEFAULT_SERVICES_DISABLE,upower clamd clamsmtpd)
+	@$(call add,CLEANUP_PACKAGES,plymouth plymouth-scripts)
+	@$(call add,CONTROL,pam_mktemp:disabled)	### private /tmp dirs
+	@$(call add,INSTALL2_PACKAGES,ImageMagick-tools)	### DROPME: for import on /pkg ###
+else
+	@$(call add,MAIN_GROUPS,education/06_kde5)
+	@$(call add,MAIN_GROUPS,education/09_video-conferencing)
+endif	# e2k%
+ifeq (,$(filter-out i586 x86_64,$(ARCH)))
+	@$(call set,KFLAVOURS,un-def std-def)
+	@$(call add,MAIN_PACKAGES,kernel-headers-un-def)
+	@$(call add,MAIN_PACKAGES,kernel-headers-modules-un-def)
+	@$(call add,MAIN_PACKAGES,kernel-headers-std-def)
+	@$(call add,MAIN_PACKAGES,kernel-headers-modules-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,BASE_PACKAGES,nextcloud-client)
+	@$(call add,THE_PACKAGES,xorg-drv-vmware xorg-drv-vmmouse)
+	@$(call add,THE_PACKAGES,syslinux)
+	@$(call add,MAIN_PACKAGES,owamp-server)
+
+endif
+
+endif # distro
+
+ifeq (vm,$(IMAGE_CLASS))
+
+ifeq (,$(filter-out aarch64 armh,$(ARCH)))
+vm/education: vm/alt-education; @:
+vm/alt-education: vm/systemd use/repo use/x11/armsoc \
+	use/oem use/bootloader/uboot mixin/education
+	@$(call add,DEFAULT_SERVICES_DISABLE,multipathd)
+	@$(call add,THE_PACKAGES,installer-feature-lightdm-stage3)
+	@$(call add,THE_PACKAGES,installer-feature-quota-stage2)
+
+vm/alt-education-rpi: vm/alt-education use/arm-rpi4/full; @:
+endif
+
+ifeq (,$(filter-out aarch64,$(ARCH)))
+vm/alt-education-tegra: vm/alt-education use/aarch64-tegra; @:
+endif

 endif
--- a/conf.d/kworkstation.mk
+++ b/conf.d/kworkstation.mk
@@ -0,0 +1,214 @@
+# desktop distributions
+ifeq (distro,$(IMAGE_CLASS))
+
+mixin/kworkstation-common-deps: \
+	use/kernel/desktop use/kernel/net use/kernel/laptop \
+	use/live/x11 use/live use/live/sound use/live/repo/online \
+	use/syslinux/ui/gfxboot use/plymouth/full \
+	use/efi/refind use/efi/shell \
+	use/x11/xorg \
+	use/branding/complete \
+	use/firmware/wireless use/firmware/laptop use/firmware/cpu use/wireless/full \
+	use/vmguest/complete use/vmguest/vbox/x11 use/vmguest/vmware/x11 \
+	use/power/acpi \
+	use/luks \
+	use/net-eth/dhcp use/net-ssh use/net/nm/nodelay \
+	use/ntp/chrony \
+	use/docs/full \
+	use/xdg-user-dirs \
+	use/l10n/default/ru_RU \
+	use/control use/services \
+	use/x11/3d use/x11/radeon use/x11/amdgpu use/x11/nvidia \
+	use/x11/sddm \
+	use/memtest \
+	use/init/systemd/settings/optimal \
+	+net-eth +wireless +pulse +plymouth +systemd-optimal +wireless +vmguest +efi +nm
+#	use/x11/nvidia/optimus \
+
+mixin/kworkstation-common-opts:
+ifeq (,$(filter-out aarch64,$(ARCH)))
+	@$(call add,INSTALL2_PACKAGES,installer-feature-cleanup-kernel-stage3)
+	@$(call add,LIVE_PACKAGES,installer-feature-cleanup-kernel-stage3)
+endif
+	@$(call add,EFI_BOOTARGS,lang=ru_RU)
+	@$(call add,STAGE1_MODLISTS,stage2-mmc)
+	@$(call set,BRANDING,xalt-kworkstation)
+	@$(call set,DOCS,alt-kworkstation)
+	@$(call add,BASE_KMODULES,kvm virtualbox)
+	@$(call add,THE_KMODULES,staging)
+	@$(call add,BASE_PACKAGES,os-prober)
+	@$(call add,BASE_PACKAGES,plymouth-plugin-label)
+	@$(call add,THE_PACKAGES,pam-limits-desktop)
+	@$(call add,THE_PACKAGES,systemd-presets-kdesktop)
+	@$(call add,THE_PACKAGES,etcnet-defaults-desktop)
+	@$(call add,THE_PACKAGES,btrfs-progs)
+	@$(call add,THE_PACKAGES,fonts-ttf-dejavu)
+	@$(call add,THE_PACKAGES,fonts-ttf-google-droid-sans)
+	@$(call add,THE_PACKAGES,fonts-ttf-google-droid-serif)
+	@$(call add,THE_PACKAGES,fonts-ttf-google-droid-sans-mono)
+	@$(call add,THE_PACKAGES,fonts-ttf-google-crosextra-caladea)
+	@$(call add,THE_PACKAGES,fonts-ttf-google-crosextra-carlito)
+	@$(call add,THE_PACKAGES,fonts-ttf-google-noto-sans-symbols)
+	@$(call add,THE_LISTS,$(call tags,basesystem alterator))
+	@$(call add,MAIN_LISTS,kworkstation/disk-install)
+	@$(call add,THE_LISTS,tagged/desktop+xorg)
+	@$(call add,THE_LISTS,tagged/xorg+misc)
+	@$(call add,CONTROL,xdg-user-dirs:enabled)
+	@$(call add,SERVICES_ENABLE,smb)
+	@$(call add,SERVICES_ENABLE,nmb)
+	@$(call add,SERVICES_ENABLE,postfix)
+	@$(call add,SERVICES_ENABLE,crond)
+	@$(call add,SERVICES_ENABLE,x11presetdrv)
+	@$(call add,SERVICES_ENABLE,bluetooth)
+	@$(call add,SERVICES_ENABLE,ModemManager)
+	@$(call add,SERVICES_ENABLE,NetworkManager)
+	@$(call add,SERVICES_DISABLE,NetworkManager-wait-online)
+	@$(call add,SERVICES_ENABLE,autofs)
+	@$(call add,SERVICES_ENABLE,fstrim.timer)
+	@$(call add,SERVICES_ENABLE,org.cups.cupsd.socket)
+	@$(call add,SERVICES_ENABLE,cups.socket)
+	@$(call add,SERVICES_ENABLE,org.cups.cupsd.path)
+	@$(call add,SERVICES_ENABLE,cups.path)
+	@$(call add,SERVICES_ENABLE,cups-browsed.service)
+	@$(call add,SERVICES_DISABLE,org.cups.cupsd.service)
+	@$(call add,SERVICES_DISABLE,cups.service)
+	@$(call add,SERVICES_ENABLE,rngd)
+	@$(call add,SERVICES_ENABLE,alteratord ahttpd)
+	@$(call add,SERVICES_DISABLE,sysreport)
+	@$(call add,SERVICES_DISABLE,rescue-remote)
+	@$(call add,SERVICES_DISABLE,nscd)
+	@$(call add,SERVICES_DISABLE,lircd)
+	@$(call add,SERVICES_DISABLE,openl2tp)
+	@$(call add,SERVICES_DISABLE,slapd)
+	@$(call add,CLEANUP_BASE_PACKAGES,'libwbclient-sssd')
+	@$(call add,CLEANUP_PACKAGES,'^kernel-modules-drm-nouveau.*')
+	@$(call set,META_VOL_SET,ALT)
+	@$(call set,META_PUBLISHER,BaseALT Ltd)
+	@$(call set,META_VOL_ID,ALT $(DISTRO_VERSION) Workstation K $(ARCH))
+	@$(call set,META_APP_ID,ALT $(DISTRO_VERSION) Workstation K $(ARCH) $(shell date +%F))
+
+mixin/kworkstation-install-deps: \
+	distro/.installer mixin/desktop-installer \
+	use/install2/suspend use/install2/net use/install2 use/install2/stage3 \
+	use/install2/vmguest \
+	+installer
+
+mixin/kworkstation-install-opts:
+	@$(call set,INSTALLER,centaurus)
+	@$(call add,STAGE1_MODLISTS,stage2-ntfs)
+	@$(call add,STAGE2_KMODULES,drm-nouveau)
+	@$(call add,STAGE2_BOOTARGS,logo.nologo loglevel=3 udev.log-priority=3) # vga=current
+	@$(call add,STAGE2_BOOTARGS,systemd.show_status=0)
+	@$(call add,THE_PACKAGES,installer-feature-nfs-client-stage3)
+	@$(call add,INSTALL2_PACKAGES,ntfs-3g)
+	@$(call add,INSTALL2_PACKAGES,btrfs-progs)
+	@$(call add,INSTALL2_PACKAGES,installer-feature-samba-usershares-stage2)
+	@$(call add,INSTALL2_PACKAGES,installer-feature-samba-automount-stage2)
+	@$(call add,INSTALL2_PACKAGES,installer-feature-weak-passwd)
+	@$(call add,INSTALL2_PACKAGES,installer-feature-desktop-disable-remote-stage2)
+	@$(call add,INSTALL2_PACKAGES,installer-feature-desktop-etcissue)
+	@$(call add,INSTALL2_PACKAGES,installer-feature-kdesktop-tmpfs)
+	@$(call add,INSTALL2_PACKAGES,installer-feature-kdesktop-services)
+	@$(call add,INSTALL2_PACKAGES,installer-feature-vmservices)
+	@$(call add,INSTALL2_PACKAGES,installer-feature-online-repo)
+	@$(call add,INSTALL2_PACKAGES,installer-feature-set-tz)
+	@$(call add,INSTALL2_PACKAGES,installer-feature-rootgtktheme-stage2)
+	@$(call add,INSTALL2_PACKAGES,apt-scripts-nvidia)
+	@$(call add,INSTALL2_PACKAGES,volumes-profile-kdesktop)
+	@$(call add,INSTALL2_PACKAGES,udev-rules-ioschedulers)
+	@$(call add,INSTALL2_CLEANUP_PACKAGES,xorg-dri-nouveau xorg-drv-nouveau)
+	@$(call add,MAIN_GROUPS,$(kworkstation_groups))
+	@$(call add,BASE_PACKAGES,alterator-postinstall)
+	@$(call add,BASE_PACKAGES,make-initrd-mdadm mdadm)
+	@$(call add,BASE_PACKAGES,apt-scripts-nvidia)
+	@$(call add,LIVE_LISTS,$(call tags,base rescue))
+	@$(call add,LIVE_LISTS,$(call tags,rescue fs))
+	@$(call add,LIVE_LISTS,$(call tags,rescue live))
+	@$(call add,LIVE_LISTS,$(call tags,rescue x11 !extra))
+	@$(call add,LIVE_LISTS,$(call tags,rescue crypto))
+	@$(call add,LIVE_LISTS,$(call tags,rescue extra !x11))
+	@$(call add,LIVE_LISTS,sound/pulseaudio)
+	@$(call add,LIVE_LISTS,kworkstation/live-rescue)
+	@$(call add,THE_LISTS,kworkstation/kde5-base)
+	@$(call add,SERVICES_ENABLE,sshd)
+	@$(call set,META_VOL_ID,ALT $(DISTRO_VERSION) Workstation K Install $(ARCH))
+	@$(call set,META_APP_ID,ALT $(DISTRO_VERSION) Workstation K Install $(ARCH) $(shell date +%F))
+
+mixin/kworkstation-live-deps: \
+	distro/.base use/rescue/base \
+	use/x11/xorg use/x11-autostart \
+	use/cleanup/live-no-cleanupdb \
+	+net-eth +vmguest
+
+mixin/kworkstation-live-opts:
+	@$(call add,BASE_LISTS, \
+		$(call tags,(base || desktop) && (l10n || network)))
+	@$(call add,EFI_BOOTARGS,live_rw)
+	@$(call add,SYSLINUX_CFG,live_rw)
+	@$(call add,SYSLINUX_CFG,live_rw_default)
+	@$(call add,LIVE_LISTS,kworkstation/kde5-base)
+	@$(call add,LIVE_LISTS,kworkstation/kde5)
+	@$(call add,LIVE_LISTS,kworkstation/emulators)
+	@$(call add,LIVE_LISTS,kworkstation/graphics-editing)
+	@$(call add,LIVE_LISTS,kworkstation/printing)
+	@$(call add,LIVE_LISTS,kworkstation/publishing)
+	@$(call add,LIVE_LISTS,kworkstation/scanning)
+	@$(call add,LIVE_LISTS,kworkstation/remote-desktop)
+	@$(call add,LIVE_LISTS,kworkstation/sound-editing)
+	@$(call add,LIVE_LISTS,kworkstation/video-editing)
+	@$(call add,SERVICES_DISABLE,sshd)
+	@$(call set,META_VOL_ID,ALT $(DISTRO_VERSION) Workstation K Live $(ARCH))
+	@$(call set,META_APP_ID,ALT $(DISTRO_VERSION) Workstation K Live $(ARCH) $(shell date +%F))
+
+distro/kworkstation-install: \
+	kworkstation_groups = $(addprefix kworkstation/,\
+	kde5 \
+	games \
+	emulators remote-desktop \
+	printing scanning \
+	video-editing sound-editing graphics-editing \
+	z01-add-clients clients-ad clients-ipa clients-backup clients-cloud clients-monitor)
+
+distro/kworkstation-install: \
+	mixin/kworkstation-install-deps \
+	mixin/kworkstation-common-deps \
+	mixin/kworkstation-common-opts \
+	mixin/kworkstation-install-opts
+
+distro/kworkstation-live: \
+	mixin/kworkstation-live-deps \
+	mixin/kworkstation-common-deps \
+	mixin/kworkstation-common-opts \
+	mixin/kworkstation-live-opts
+
+distro/kworkstation-install-undef: \
+	distro/kworkstation-install
+	@$(call set,KFLAVOURS,un-def)
+
+distro/kworkstation-live-undef: \
+	distro/kworkstation-live
+	@$(call set,KFLAVOURS,un-def)
+
+mixin/kworkstation-fsin-opts:
+	@$(call add,THE_PACKAGES,libwbclient task-auth-ad-sssd)
+	@$(call add,THE_PACKAGES,task-auth-freeipa task-auth-ldap-sssd)
+	@$(call add,THE_PACKAGES,task-samba-dc bind-utils tdb-utils installer-feature-sambaDC-stage3)
+	@$(call add,THE_PACKAGES,task-auth-ldap-sssd)
+	@$(call add,THE_PACKAGES,kde5-autofs-shares krb5-ticket-watcher kde5-file-actions-gost)
+	@$(call add,THE_PACKAGES,openssl-gost-engine)
+	@$(call add,THE_PACKAGES,openvpn-gostcrypto openvpn-plugins-gostcrypto alterator-openvpn-server)
+	@$(call add,THE_PACKAGES,alt-customize-branding)
+	@$(call add,THE_PACKAGES,alterator-kiosk)
+	@$(call add,SERVICES_ENABLE,kiosk)
+
+distro/kworkstation-install-fsin: \
+	distro/kworkstation-install \
+	mixin/kworkstation-fsin-opts
+	@$(call set,KFLAVOURS,std-def)
+
+endif
+
+
+#	@$(call add,RESCUE_BOOTARGS,nomodeset vga=0)
+#	use/mediacheck \
+#	use/domain-client/full \
--- a/conf.d/live.mk
+++ b/conf.d/live.mk
@@ -1,9 +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
@@ -11,10 +12,10 @@ 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; @:
+distro/.live-base: distro/.base use/live/base; @:
 distro/.live-x11: distro/.live-base use/live/x11; @:

 distro/.live-desktop: distro/.base +live use/live/install use/stage2/net-eth \
@@ -23,7 +24,7 @@ distro/.live-desktop-ru: distro/.live-desktop use/live/ru; @:

 distro/.live-kiosk: distro/.base use/live/base use/live/autologin \
 	use/syslinux/timeout/1 use/cleanup use/stage2/net-eth \
-	use/fonts/otf/adobe +power
+	use/fonts/otf/adobe
 	@$(call add,CLEANUP_PACKAGES,'alterator*' 'guile*' 'vim-common')
 	@$(call set,SYSLINUX_UI,none)
 	@$(call set,SYSLINUX_CFG,live)
@@ -42,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
@@ -106,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)
@@ -116,13 +114,11 @@ distro/live-gimp: distro/live-icewm use/live/ru
 	@$(call add,LIVE_PACKAGES,qtfm openssh-clients rsync usbutils)
 	@$(call add,LIVE_PACKAGES,design-graphics-sisyphus2)

-distro/live-robo: distro/live-icewm +robotics use/live/ru; @:
-
 # NB: use/browser won't do as it provides a *single* browser ATM
-distro/live-privacy: distro/.base +power +efi +systemd +vmguest \
+distro/live-privacy: distro/.base +efi +systemd +vmguest \
 	use/live/base use/live/privacy use/live/ru \
 	use/x11/xorg use/x11/lightdm/gtk use/x11/mate use/x11-autologin \
-	use/browser/firefox/i18n use/sound \
+	use/browser/firefox/esr use/browser/firefox/i18n use/sound \
 	use/fonts/otf/adobe use/fonts/otf/mozilla \
 	use/fonts/ttf/google use/fonts/ttf/redhat
 	@$(call set,KFLAVOURS,un-def)
--- a/conf.d/mixin-alt-server.mk
+++ b/conf.d/mixin-alt-server.mk
@@ -0,0 +1,56 @@
+mixin/alt-server: server_groups = $(addprefix centaurus/,\
+	10-alterator 20-server-apps  50-freeipa 70-dev 90-docs sambaDC buildsystem dhcp-server-a diag-tools dns-server-a ftp-server-a mail-server-a mediawiki owncloud domain-server freeipa-client)
+
+mixin/alt-server: +installer +systemd \
+	use/branding/notes use/syslinux/ui/gfxboot \
+	use/plymouth/stage2 use/control use/services \
+	use/l10n/default/ru_RU use/install2/stage3 \
+	use/install2/vnc use/install2/xfs use/install2/fat \
+	use/volumes/cliff-server \
+	use/apt-conf/branch \
+	use/fonts/install2 \
+	use/install2/stage3 \
+	use/firmware/server \
+	use/net/etcnet
+	@$(call set,INSTALLER,centaurus)
+	@$(call set,BRANDING,alt-server)
+	@$(call add,THE_BRANDING,alterator)
+ifeq (,$(filter-out i586 x86_64 aarch64,$(ARCH)))
+	@$(call add,THE_BRANDING,bootloader bootsplash)
+	@$(call set,KFLAVOURS,std-def)
+endif
+	@$(call add,BASE_LISTS,centaurus/base)
+	@$(call add,BASE_LISTS,centaurus/base-server)
+	@$(call add,LIVE_LISTS,centaurus/live)
+	@$(call add,LIVE_LISTS,centaurus/remmina)
+	@$(call add,LIVE_LISTS,centaurus/cups)
+	@$(call add,LIVE_LISTS,centaurus/nm)
+	@$(call add,LIVE_LISTS,centaurus/domain-client)
+	@$(call add,MAIN_GROUPS,$(server_groups))
+	@$(call add,MAIN_LISTS,centaurus/cppcheck)
+	@$(call add,MAIN_LISTS,centaurus/disk)
+	@$(call add,THE_PROFILES,centaurus-10-server)
+	@$(call add,THE_PROFILES,centaurus-20-serverDC)
+ifeq (,$(filter-out i586 x86_64 aarch64 e2k%,$(ARCH)))
+	@$(call add,THE_PROFILES,centaurus-30-desktop)
+endif
+	@$(call add,THE_PROFILES,minimal)
+	@$(call add,STAGE1_MODLISTS,stage2-mmc)
+	@$(call add,INSTALL2_PACKAGES,installer-feature-multipath)
+	@$(call add,INSTALL2_PACKAGES,installer-feature-desktop-other-fs-stage2)
+	@$(call add,INSTALL2_PACKAGES,installer-feature-alphabet-profiles)
+	@$(call add,INSTALL2_PACKAGES,installer-feature-load-tun)
+	@$(call add,INSTALL2_PACKAGES,installer-feature-network-shares-stage3)
+	@$(call add,INSTALL2_PACKAGES,installer-feature-auto-domain)
+ifneq (,$(filter-out e2k%,$(ARCH)))
+	@$(call add,INSTALL2_PACKAGES,installer-feature-quota-stage2)
+	@$(call add,MAIN_GROUPS,centaurus/jitsi-meet)
+endif
+	@$(call add,INSTALL2_PACKAGES,fdisk)
+	@$(call add,INSTALL2_PACKAGES,xorg-conf-synaptics)
+	@$(call add,COMMON_PACKAGES,vim-console)
+	@$(call add,DEFAULT_SERVICES_ENABLE,rpcbind sshd bind)
+	@$(call set,META_VOL_ID,ALT Server 9.1 $(ARCH))
+	@$(call set,META_PUBLISHER,BaseALT Ltd)
+	@$(call set,META_VOL_SET,ALT)
+	@$(call set,META_APP_ID,ALT Server 9.1.0 $(ARCH) $(shell date +%F))
--- a/conf.d/mixin-basealt.mk
+++ b/conf.d/mixin-basealt.mk
@@ -0,0 +1,75 @@
+# shared across all supported arches, can be complemented per arch
+
+mixin/alt-workstation-install: 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: +systemd +systemd-optimal +pulse +nm +power \
+	use/kernel/net use/l10n/default/ru_RU \
+	use/x11/xorg use/x11-autostart use/x11/gtk/nm \
+	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 \
+	use/cleanup/live-no-cleanupdb
+	@$(call set,BRANDING,alt-workstation)
+	@$(call add,THE_BRANDING,mate-settings)
+	@$(call add,COMMON_PACKAGES,vim-console)
+	@$(call add,THE_LISTS,$(call tags,archive extra))
+	@$(call add,THE_LISTS,$(call tags,mobile mate))
+	@$(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,xorg vaapi))
+	@$(call add,THE_KMODULES,staging)
+	@$(call add,CONTROL,xdg-user-dirs:enabled)
+	@$(call add,SERVICES_DISABLE,sshd)
+	@$(call add,SERVICES_DISABLE,auditd)
+	@$(call add,SERVICES_ENABLE,cups smb nmb httpd2 bluetoothd libvirtd)
+	@$(call add,SERVICES_ENABLE,chronyd)
+	@$(call add,SERVICES_ENABLE,crond)
+	@$(call add,SERVICES_ENABLE,fstrim.timer)
+	@$(call add,SERVICES_DISABLE,powertop bridge gpm)
+	@$(call set,META_PUBLISHER,BaseALT Ltd)
+	@$(call set,META_VOL_SET,ALT)
+	@$(call set,META_VOL_ID,ALT Workstation $(DISTRO_VERSION) $(ARCH))
+	@$(call set,META_APP_ID,ALT Workstation $(DISTRO_VERSION) $(ARCH) $(shell date +%F))
+	@$(call set,DOCS,alt-workstation)
+
+mixin/alt-workstation-install: +installer \
+	use/install2/fat use/install2/vnc \
+	use/stage2/fs use/stage2/hid use/stage2/md \
+	use/stage2/mmc use/stage2/net use/stage2/net-nfs \
+	use/stage2/rtc use/stage2/sbc use/stage2/scsi use/stage2/usb
+	@$(call set,INSTALLER,alt-workstation)
+	@$(call add,INSTALL2_PACKAGES,installer-feature-slideshow)
+	@$(call add,INSTALL2_PACKAGES,alterator-notes)
+	@$(call add,INSTALL2_PACKAGES,fdisk)
+	@$(call add,INSTALL2_PACKAGES,btrfs-progs)
+	@$(call add,INSTALL2_PACKAGES,open-iscsi)
+	@$(call add,INSTALL2_PACKAGES,xorg-conf-libinput-touchpad)
+ifneq (,$(filter-out e2k%,$(ARCH)))
+	@$(call add,INSTALL2_PACKAGES,installer-feature-quota-stage2)
+	@$(call add,LIVE_PACKAGES,installer-feature-quota-stage2)
+	@$(call add,MAIN_LISTS,workstation/extras)
+endif
+	@$(call add,LIVE_PACKAGES,livecd-installer-features)
+	@$(call add,LIVE_PACKAGES,installer-feature-lightdm-stage3)
+	@$(call add,MAIN_PACKAGES,solaar)
+	@$(call add,STAGE2_PACKAGES,chrony)
+	@$(call add,MAIN_GROUPS,$(workstation_groups))
--- a/conf.d/mixin.mk
+++ b/conf.d/mixin.mk
@@ -0,0 +1,161 @@
+### 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)
+	@$(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: +alsa +power use/x11/xorg use/xdg-user-dirs use/l10n \
+	use/fonts/otf/adobe use/fonts/otf/mozilla use/net-eth use/branding/notes
+	@$(call add,THE_PACKAGES,pam-limits-desktop beesu polkit dvd+rw-tools)
+	@$(call add,THE_BRANDING,alterator graphics indexhtml)
+ifneq (,$(filter-out e2k%,$(ARCH)))
+	@$(call add,THE_BRANDING,notes)
+endif
+	@$(call add,THE_PACKAGES,$$(THE_IMAGEWRITER))
+	@$(call set,THE_IMAGEWRITER,altmediawriter)
+	@$(call add,THE_PACKAGES,upower bluez udev-rules-rfkill-uaccess)
+	@$(call add,DEFAULT_SERVICES_DISABLE,gssd idmapd krb5kdc rpcbind)
+	@$(call add,DEFAULT_SERVICES_ENABLE,bluetoothd)
+	@$(call add,DEFAULT_SERVICES_ENABLE,cups)
+	@$(call add,DEFAULT_SERVICES_ENABLE,alteratord)
+
+mixin/desktop-extra:
+	@$(call add,BASE_LISTS,$(call tags,(archive || base) && extra))
+
+mixin/regular-wmaker: use/efi/refind use/syslinux/ui/gfxboot \
+	use/fonts/ttf/redhat use/x11/wmaker
+	@$(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)
+
+mixin/regular-icewm: use/fonts/ttf/redhat +icewm +nm-gtk
+	@$(call add,THE_LISTS,$(call tags,regular icewm))
+	@$(call add,THE_LISTS,$(call tags,desktop nm))
+	@$(call add,THE_PACKAGES,icewm-startup-networkmanager)
+	@$(call add,THE_PACKAGES,mnt)
+
+# gdm2.20 can reboot/halt with both sysvinit and systemd, and is slim
+mixin/regular-gnustep: use/x11/gnustep use/x11/gdm2.20 use/mediacheck \
+	use/browser/seamonkey/i18n
+	@$(call add,THE_BRANDING,graphics)
+
+mixin/regular-cinnamon: use/x11/cinnamon use/x11/lightdm/slick +nm-gtk \
+	use/fonts/ttf/google use/net/nm/mmgui use/im; @:
+
+mixin/regular-gnome3: use/x11/gnome3 use/fonts/ttf/redhat +nm-gtk
+	@$(call add,THE_PACKAGES,gnome3-regular xcalib templates)
+	@$(call add,THE_PACKAGES,chrome-gnome-shell)
+	@$(call add,THE_PACKAGES,gnome-software-disable-updates)
+
+mixin/regular-kde5: use/x11/kde5 use/browser/falkon \
+	use/fonts/ttf/google use/fonts/ttf/redhat use/fonts/zerg \
+	+nm +pulse
+	@$(call add,THE_PACKAGES,kde5-telepathy falkon-kde5)
+
+mixin/xfce-base: use/x11/xfce +nm-gtk \
+	use/fonts/ttf/redhat use/fonts/ttf/google/extra
+	@$(call add,THE_BRANDING,xfce-settings)
+	@$(call add,THE_PACKAGES,xreader)
+	@$(call add,THE_PACKAGES,xdg-user-dirs-gtk)
+
+mixin/regular-xfce: mixin/xfce-base use/x11/xfce/full \
+	use/domain-client; @:
+
+mixin/regular-xfce-sysv: mixin/xfce-base \
+	use/fonts/otf/adobe use/fonts/otf/mozilla
+	@$(call add,THE_PACKAGES,pnmixer pm-utils elinks mpg123)
+	@$(call add,THE_PACKAGES,alsa-oss ossp whdd wget cdrkit)
+	@$(call add,THE_PACKAGES,qasmixer)
+	@$(call add,THE_PACKAGES,xfce4-screensaver)
+	@$(call add,THE_PACKAGES,sysstat leafpad)
+	@$(call add,THE_PACKAGES,nload)
+	@$(call add,THE_PACKAGES,NetworkManager-tui)
+	@$(call add,THE_PACKAGES,apt-conf-ignore-systemd)
+	@$(call add,THE_PACKAGES,pandoc)
+
+mixin/regular-lxde: use/x11/lxde use/im +nm-gtk
+	@$(call add,THE_PACKAGES,qasmixer qpdfview)
+
+mixin/regular-lxqt: use/x11/lxqt +nm-gtk; @:
+
+mixin/mate-base: use/x11/mate use/fonts/ttf/google +nm-gtk
+	@$(call add,THE_LISTS,$(call tags,mobile mate))
+
+mixin/regular-mate: mixin/mate-base use/domain-client
+	@$(call add,THE_LISTS,$(call tags,base smartcard))
+
+mixin/office: use/fonts/ttf/google use/fonts/ttf/xo
+	@$(call add,THE_LISTS,$(call tags,desktop && (cups || office)))
+	@$(call add,THE_PACKAGES,apt-indicator)
+
+# NB: never ever use/syslinux/ui/gfxboot here as gfxboot mangles
+#     kernel cmdline resulting in method:disk instead of method:cdrom
+#     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 use/ntp/chrony
+	@$(call add,THE_PACKAGES,bash-completion elinks gpm lftp openssh)
+	@$(call add,THE_PACKAGES,rpm-utils screen tmux wget zsh)
+	@$(call add,THE_PACKAGES,apt-repo eepm)
+	@$(call add,DEFAULT_SERVICES_ENABLE,gpm)
+
+### vm.mk
+mixin/cloud-init:
+	@$(call add,BASE_PACKAGES,cloud-init)
+	@$(call add,DEFAULT_SERVICES_ENABLE,cloud-config cloud-final)
+	@$(call add,DEFAULT_SERVICES_ENABLE,cloud-init cloud-init-local)
+	@$(call set,GLOBAL_NET_ETH,)
+
+mixin/opennebula-context:
+	@$(call add,BASE_PACKAGES,opennebula-context)
+	@$(call add,DEFAULT_SERVICES_ENABLE,one-context-local one-context)
+
+mixin/icewm: use/x11/lightdm/gtk +icewm; @:
--- a/conf.d/p7.mk
+++ b/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
--- a/conf.d/p8.mk
+++ b/conf.d/p8.mk
@@ -1,52 +0,0 @@
-# p8 base kits
-
-mixin/p8: use/browser/firefox/esr
-	@$(call set,BRANDING,basealt-starterkit)
-	@$(call set,IMAGE_FLAVOUR,$(subst basealt-p8-,,$(IMAGE_NAME)))
-	@$(call set,META_VOL_ID,BaseALT p8 $$(IMAGE_FLAVOUR)/$(ARCH))
-
-ifeq (distro,$(IMAGE_CLASS))
-
-distro/basealt-p8-cinnamon: distro/regular-cinnamon mixin/p8; @:
-distro/basealt-p8-icewm: distro/regular-icewm mixin/p8; @:
-distro/basealt-p8-gnome3: distro/regular-gnome3 mixin/p8; @:
-distro/basealt-p8-gnustep: distro/regular-gnustep mixin/p8; @:
-distro/basealt-p8-kde4: distro/regular-kde4 mixin/p8; @:
-distro/basealt-p8-kde5: distro/regular-kde5 mixin/p8; @:
-distro/basealt-p8-lxde: distro/regular-lxde mixin/p8; @:
-distro/basealt-p8-lxqt: distro/regular-lxqt mixin/p8; @:
-distro/basealt-p8-lxqt-sysv: distro/regular-lxqt-sysv mixin/p8; @:
-distro/basealt-p8-mate: distro/regular-mate mixin/p8; @:
-distro/basealt-p8-rescue: distro/regular-rescue mixin/p8; @:
-distro/basealt-p8-tde: distro/regular-tde mixin/p8; @:
-distro/basealt-p8-tde-sysv: distro/regular-tde-sysv mixin/p8; @:
-distro/basealt-p8-wmaker: distro/regular-wmaker mixin/p8; @:
-distro/basealt-p8-xfce: distro/regular-xfce mixin/p8; @:
-distro/basealt-p8-xfce-sysv: distro/regular-xfce-sysv mixin/p8; @:
-
-distro/basealt-p8-enlightenment: distro/regular-enlightenment mixin/p8
-	@$(call set,META_VOL_ID,BaseALT p8 E/$(ARCH))
-
-distro/basealt-p8-sysv-tde: distro/regular-sysv-tde mixin/p8; @:
-
-distro/basealt-p8-jeos: distro/regular-jeos mixin/p8; @:
-distro/basealt-p8-jeos-ovz: distro/regular-jeos-ovz mixin/p8; @:
-distro/basealt-p8-server: distro/regular-server mixin/p8; @:
-distro/basealt-p8-server-ovz: distro/regular-server-ovz mixin/p8; @:
-distro/basealt-p8-server-hyperv: distro/regular-server-hyperv mixin/p8; @:
-distro/basealt-p8-server-samba4: distro/regular-server-samba4 mixin/p8; @:
-distro/basealt-p8-server-openstack: distro/regular-server-openstack mixin/p8; @:
-distro/basealt-p8-server-pve: distro/regular-server-pve mixin/p8; @:
-
-distro/basealt-p8-builder: distro/regular-builder mixin/p8; @:
-
-endif
-
-ifeq (ve,$(IMAGE_CLASS))
-ve/basealt-p8-ovz-generic: ve/generic mixin/p8; @:
-endif
-
-ifeq (vm,$(IMAGE_CLASS))
-vm/basealt-p8-vm-net: vm/net mixin/p8; @:
-vm/basealt-p8-cloud: vm/cloud-systemd mixin/p8; @:
-endif
--- a/conf.d/p9.mk
+++ b/conf.d/p9.mk
@@ -0,0 +1,103 @@
+# p9 base kits
+
+mixin/p9: use/browser/firefox/esr
+	@$(call set,BRANDING,alt-starterkit)
+	@$(call set,IMAGE_FLAVOUR,$(subst alt-p9-,,$(IMAGE_NAME)))
+	@$(call set,META_VOL_ID,ALT p9 $$(IMAGE_FLAVOUR)/$(ARCH))
+
+ifeq (distro,$(IMAGE_CLASS))
+
+distro/alt-p9-cinnamon distro/alt-p9-enlightenment \
+	distro/alt-p9-gnome3 distro/alt-p9-gnustep-sysv \
+	distro/alt-p9-icewm-sysv distro/alt-p9-kde5 \
+	distro/alt-p9-lxde distro/alt-p9-lxqt \
+	distro/alt-p9-mate distro/alt-p9-rescue \
+	distro/alt-p9-wmaker-sysv distro/alt-p9-xfce \
+	distro/alt-p9-xfce-sysv distro/alt-p9-xfce-sysv-install: \
+	distro/alt-p9-%: distro/regular-% mixin/p9; @:
+
+distro/alt-p9-jeos-sysv distro/alt-p9-jeos-ovz distro/alt-p9-jeos-systemd \
+	distro/alt-p9-server-systemd distro/alt-p9-server-sysv \
+	distro/alt-p9-server-ovz \
+	distro/alt-p9-server-hyperv distro/alt-p9-server-samba4 \
+	distro/alt-p9-server-pve distro/alt-p9-server-lxd: \
+	distro/alt-p9-%: distro/regular-% mixin/p9; @:
+
+distro/alt-p9-builder: distro/regular-builder mixin/p9; @:
+
+distro/alt-p9-engineering: distro/regular-engineering mixin/p9; @:
+
+ifeq (,$(filter-out x86_64,$(ARCH)))
+distro/alt-p9-cnc-rt: distro/cnc-rt mixin/p9; @:
+endif
+endif
+
+ifeq (ve,$(IMAGE_CLASS))
+ve/alt-p9-ovz-generic: ve/generic mixin/p9; @:
+
+ve/docker-p9: ve/docker; @:
+	@$(call set,BRANDING,alt-starterkit)
+endif
+
+ifeq (vm,$(IMAGE_CLASS))
+vm/alt-p9-vm-net: vm/net mixin/p9; @:
+vm/alt-p9-cloud: vm/cloud-systemd mixin/p9; @:
+vm/alt-p9-opennebula: vm/opennebula-systemd mixin/p9; @:
+
+# universal builds rootfs and image for all platforms
+vm/alt-p9-jeos-systemd vm/alt-p9-jeos-sysv vm/alt-p9-builder \
+	vm/alt-p9-cinnamon vm/alt-p9-gnome3 vm/alt-p9-kde5 \
+	vm/alt-p9-icewm-sysv vm/alt-p9-lxde \
+	vm/alt-p9-lxqt vm/alt-p9-mate \
+	vm/alt-p9-xfce: \
+	vm/alt-p9-%: vm/regular-% mixin/p9; @:
+
+ifeq (,$(filter-out aarch64 armh,$(ARCH)))
+vm/alt-p9-jeos-systemd-rpi vm/alt-p9-jeos-sysv-rpi \
+	vm/alt-p9-builder-rpi \
+	vm/alt-p9-lxde-rpi vm/alt-p9-lxqt-rpi \
+	vm/alt-p9-mate-rpi vm/alt-p9-xfce-rpi: \
+	vm/alt-p9-%-rpi: vm/regular-%-rpi mixin/p9; @:
+
+ifeq (,$(filter-out aarch64,$(ARCH)))
+vm/alt-p9-cinnamon-tegra vm/alt-p9-kde5-tegra \
+	vm/alt-p9-lxqt-tegra \
+	vm/alt-p9-mate-tegra vm/alt-p9-xfce-tegra: \
+	vm/alt-p9-%-tegra: vm/regular-%-tegra mixin/p9; @:
+
+# DBM BE-M1000
+vm/alt-p9-gnome3-dbm vm/alt-p9-xfce-dbm: \
+	vm/alt-p9-%-dbm: vm/regular-%-dbm mixin/p9; @:
+endif
+
+ifeq (,$(filter-out armh,$(ARCH)))
+vm/alt-p9-lxde-mcom02 vm/alt-p9-lxqt-mcom02 \
+	vm/alt-p9-mate-mcom02 vm/alt-p9-xfce-mcom02: \
+	vm/alt-p9-%-mcom02: vm/regular-%-mcom02 mixin/p9; @:
+
+vm/alt-p9-lxde-mcom02-mali vm/alt-p9-lxqt-mcom02-mali \
+	vm/alt-p9-mate-mcom02-mali vm/alt-p9-xfce-mcom02-mali: \
+	vm/alt-p9-%-mcom02-mali: vm/regular-%-mcom02-mali mixin/p9; @:
+endif
+endif
+
+ifeq (,$(filter-out mipsel,$(ARCH)))
+vm/alt-p9-jeos-systemd-tavolga vm/alt-p9-jeos-sysv-tavolga \
+	vm/alt-p9-builder-tavolga: \
+	vm/alt-p9-%-tavolga: vm/regular-%-tavolga mixin/p9; @:
+
+vm/alt-p9-lxde-tavolga vm/alt-p9-lxqt-tavolga \
+	vm/alt-p9-mate-tavolga vm/alt-p9-xfce-tavolga \
+	vm/alt-p9-icewm-sysv-tavolga: \
+	vm/alt-p9-%-tavolga: vm/regular-%-tavolga mixin/p9; @:
+
+vm/alt-p9-jeos-systemd-bfk3 vm/alt-p9-jeos-sysv-bfk3 \
+	vm/alt-p9-builder-bfk3: \
+	vm/alt-p9-%-bfk3: vm/regular-%-bfk3 mixin/p9; @:
+
+vm/alt-p9-lxde-bfk3 vm/alt-p9-lxqt-bfk3 vm/alt-p9-mate-bfk3 \
+	vm/alt-p9-xfce-bfk3 vm/alt-p9-icewm-sysv-bfk3: \
+	vm/alt-p9-%-bfk3: vm/regular-%-bfk3 mixin/p9; @:
+endif
+
+endif
--- a/conf.d/realtime.mk
+++ b/conf.d/realtime.mk
@@ -0,0 +1,20 @@
+mixin/cnc-rt: use/cleanup +nm-gtk
+	@$(call set,KFLAVOURS,rt)
+	@$(call add,THE_LISTS,realtime/tests)
+	@$(call add,THE_LISTS,engineering/cnc)
+	@$(call add,THE_LISTS,engineering/misc)
+	@$(call add,CLEANUP_PACKAGES,virtualbox-guest-common)
+	@$(call add,CLEANUP_PACKAGES,open-vm-tools)
+	@$(call add,CLEANUP_PACKAGES,xorg-drv-vboxvideo xorg-drv-qxl)
+	@$(call add,CLEANUP_PACKAGES,spice-vdagent qemu-guest-agent)
+	@$(call add,CLEANUP_PACKAGES,xorg-drv-vmware xorg-drv-vmmouse open-vm-tools-desktop)
+
+ifeq (distro,$(IMAGE_CLASS))
+distro/cnc-rt: distro/regular-lxde mixin/cnc-rt
+	@$(call add,EFI_BOOTARGS,efi=runtime)
+endif
+
+ifeq (vm,$(IMAGE_CLASS))
+vm/cnc-rt: vm/regular-lxde mixin/vm-archdep mixin/cnc-rt; @:
+vm/cnc-rt-efi: vm/cnc-rt +efi; @:
+endif
--- a/conf.d/regular-vm.mk
+++ b/conf.d/regular-vm.mk
@@ -0,0 +1,215 @@
+ifeq (vm,$(IMAGE_CLASS))
+
+ifeq (,$(filter-out armh aarch64,$(ARCH)))
+mixin/vm-archdep: use/bootloader/uboot use/no-sleep
+else
+ifeq (,$(filter-out mipsel,$(ARCH)))
+mixin/vm-archdep: use/tty/S0
+	@$(call set,KFLAVOURS,un-malta)
+else
+ifeq (,$(filter-out riscv64,$(ARCH)))
+mixin/vm-archdep: use/bootloader/uboot use/tty/S0
+	@$(call set,KFLAVOURS,un-def)
+else
+mixin/vm-archdep: ; @:
+endif
+endif
+endif
+	@$(call add,KMODULES,staging)
+ifeq (,$(filter-out i586 x86_64 armh aarch64,$(ARCH)))
+	@$(call set,KFLAVOURS,un-def std-def)
+endif
+
+mixin/regular-vm-base: use/firmware use/ntp/chrony use/repo \
+	use/services/lvm2-disable
+ifneq (,$(filter-out i586 x86_64,$(ARCH)))
+	@$(call add,DEFAULT_SERVICES_DISABLE,multipathd)
+endif
+	@$(call add,THE_PACKAGES,bash-completion mc update-kernel)
+	@$(call add,THE_PACKAGES,vim-console)
+
+mixin/regular-vm-jeos: mixin/regular-vm-base use/deflogin/root
+	@$(call add,DEFAULT_SERVICES_ENABLE,getty@tty1)
+
+ifeq (,$(filter-out riscv64,$(ARCH)))
+mixin/regular-vm-x11: mixin/regular-vm-base mixin/regular-x11 \
+	mixin/regular-desktop use/oem/vnc +wireless; @:
+else
+mixin/regular-vm-x11: mixin/regular-vm-base mixin/regular-x11 \
+	mixin/regular-desktop use/oem +wireless; @:
+endif
+ifeq (,$(filter-out armh aarch64,$(ARCH)))
+	@$(call add,THE_PACKAGES,xorg-96dpi)
+	@$(call add,THE_LISTS,remote-access)
+endif
+
+vm/.regular-desktop: vm/systemd mixin/regular-vm-x11 +systemd +systemd-optimal \
+	+plymouth; @:
+
+vm/.regular-desktop-sysv: vm/bare mixin/regular-vm-x11 use/x11/gdm2.20 \
+	use/init/sysv/polkit +power; @:
+
+vm/.regular-gtk: vm/.regular-desktop use/x11/lightdm/gtk
+	@$(call add,THE_PACKAGES,blueberry)
+
+vm/.regular-qt: vm/.regular-desktop use/x11/sddm; @:
+
+vm/regular-jeos-systemd: vm/systemd-net \
+	mixin/regular-vm-jeos mixin/vm-archdep
+	@$(call add,THE_PACKAGES,glibc-locales)
+
+vm/regular-jeos-sysv: vm/net mixin/regular-vm-jeos mixin/vm-archdep +power; @:
+
+vm/regular-builder: vm/regular-jeos-sysv mixin/regular-builder
+	@$(call set,VM_SIZE,10737418240)
+
+vm/regular-icewm-sysv: vm/.regular-desktop-sysv mixin/regular-icewm \
+	mixin/vm-archdep; @:
+
+vm/regular-cinnamon: vm/.regular-gtk mixin/regular-cinnamon mixin/vm-archdep; @:
+
+vm/regular-gnome3: vm/.regular-gtk mixin/regular-gnome3 mixin/vm-archdep; @:
+
+vm/regular-lxde: vm/.regular-gtk mixin/regular-lxde mixin/vm-archdep; @:
+
+vm/regular-mate: vm/.regular-gtk mixin/mate-base mixin/vm-archdep
+	@$(call add,THE_PACKAGES,mate-reduced-resource)
+
+vm/regular-xfce: vm/.regular-gtk mixin/regular-xfce mixin/vm-archdep
+	@$(call add,THE_PACKAGES,xfce-reduced-resource)
+ifeq (,$(filter-out armh aarch64,$(ARCH)))
+	@$(call set,KFLAVOURS,mp lts)
+endif
+
+vm/regular-kde5: vm/.regular-gtk mixin/regular-kde5 mixin/vm-archdep; @:
+
+vm/regular-lxqt: vm/.regular-gtk mixin/regular-lxqt mixin/vm-archdep; @:
+
+ifeq (,$(filter-out aarch64 armh,$(ARCH)))
+# Raspberry Pi 4
+vm/regular-jeos-systemd-rpi: vm/systemd-net mixin/regular-vm-jeos use/tty/AMA0 \
+	use/arm-rpi4/kernel; @:
+
+vm/regular-jeos-sysv-rpi: vm/net mixin/regular-vm-jeos use/tty/AMA0 \
+	use/arm-rpi4/kernel +power; @:
+
+vm/regular-builder-rpi: vm/regular-jeos-systemd-rpi mixin/regular-builder; @:
+
+vm/regular-lxde-rpi: vm/.regular-gtk mixin/regular-lxde use/arm-rpi4/full; @:
+
+vm/regular-lxqt-rpi: vm/.regular-gtk mixin/regular-lxqt use/arm-rpi4/full; @:
+
+vm/regular-mate-rpi: vm/.regular-gtk mixin/regular-mate use/arm-rpi4/full; @:
+
+vm/regular-xfce-rpi: vm/.regular-gtk mixin/regular-xfce use/arm-rpi4/full; @:
+
+ifeq (,$(filter-out aarch64,$(ARCH)))
+# Nvidia Tegra (Jetson Nano only)
+vm/regular-cinnamon-tegra: vm/.regular-gtk mixin/regular-cinnamon \
+	use/x11/lightdm/slick use/aarch64-tegra; @:
+
+vm/regular-kde5-tegra: vm/.regular-gtk mixin/regular-kde5 use/aarch64-tegra
+	@$(call add,THE_PACKAGES,kde5-ksplash-disabled)
+
+vm/regular-lxqt-tegra: vm/.regular-gtk mixin/regular-lxqt use/aarch64-tegra; @:
+
+vm/regular-mate-tegra: vm/.regular-gtk mixin/regular-mate use/aarch64-tegra; @:
+
+vm/regular-xfce-tegra: vm/.regular-gtk mixin/regular-xfce use/aarch64-tegra; @:
+
+# DBM BE-M1000
+vm/regular-xfce-dbm: vm/.regular-gtk mixin/regular-xfce use/aarch64-dbm; @:
+
+vm/regular-gnome3-dbm: vm/.regular-gtk mixin/regular-gnome3 use/aarch64-dbm; @:
+endif
+
+ifeq (,$(filter-out armh,$(ARCH)))
+# ELVIS mcom02 (free videodriver)
+vm/regular-lxde-mcom02: vm/.regular-gtk mixin/regular-lxde \
+	use/armh-mcom02/x11; @:
+
+vm/regular-lxqt-mcom02: vm/.regular-gtk mixin/regular-lxqt \
+	use/armh-mcom02/x11; @:
+
+vm/regular-mate-mcom02: vm/.regular-gtk mixin/regular-mate \
+	use/armh-mcom02/x11
+	@$(call add,THE_PACKAGES,mate-reduced-resource)
+
+vm/regular-xfce-mcom02: vm/.regular-gtk mixin/regular-xfce \
+	use/armh-mcom02/x11
+	@$(call add,THE_PACKAGES,xfce-reduced-resource)
+
+# ELVIS mcom02 (propietary videodriver)
+vm/regular-lxde-mcom02-mali: vm/.regular-gtk mixin/regular-lxde \
+	use/armh-mcom02/mali; @:
+
+vm/regular-lxqt-mcom02-mali: vm/.regular-gtk mixin/regular-lxqt \
+	use/armh-mcom02/mali; @:
+
+vm/regular-mate-mcom02-mali: vm/.regular-gtk mixin/mate-base \
+	use/armh-mcom02/mali
+	@$(call add,THE_PACKAGES,mate-reduced-resource)
+
+vm/regular-xfce-mcom02-mali: vm/.regular-gtk mixin/regular-xfce \
+	use/armh-mcom02/mali
+	@$(call add,THE_PACKAGES,xfce-reduced-resource)
+endif
+endif
+
+ifeq (,$(filter-out mipsel,$(ARCH)))
+# Tavolga
+vm/regular-jeos-systemd-tavolga: vm/systemd-net mixin/regular-vm-jeos \
+	use/mipsel-mitx; @:
+
+vm/regular-jeos-sysv-tavolga: vm/net mixin/regular-vm-jeos \
+	use/mipsel-mitx +power; @:
+
+vm/regular-builder-tavolga: vm/regular-jeos-sysv-tavolga \
+	mixin/regular-builder; @:
+
+vm/regular-icewm-sysv-tavolga: vm/.regular-desktop-sysv mixin/regular-icewm \
+	use/mipsel-mitx/x11; @:
+
+vm/regular-lxde-tavolga: vm/.regular-gtk mixin/regular-lxde \
+	use/mipsel-mitx/x11; @:
+
+vm/regular-lxqt-tavolga: vm/.regular-gtk mixin/regular-lxqt \
+	use/mipsel-mitx/x11; @:
+
+vm/regular-mate-tavolga: vm/.regular-gtk mixin/regular-mate \
+	use/mipsel-mitx/x11
+	@$(call add,THE_PACKAGES,mate-reduced-resource)
+
+vm/regular-xfce-tavolga: vm/.regular-gtk mixin/regular-xfce \
+	use/mipsel-mitx/x11
+	@$(call add,THE_PACKAGES,xfce-reduced-resource)
+
+# bfk3
+vm/regular-jeos-systemd-bfk3: vm/systemd-net mixin/regular-vm-jeos \
+	use/mipsel-bfk3; @:
+
+vm/regular-jeos-sysv-bfk3: vm/net mixin/regular-vm-jeos \
+	use/mipsel-bfk3 +power; @:
+
+vm/regular-builder-bfk3: vm/regular-jeos-sysv-bfk3 \
+	mixin/regular-builder; @:
+
+vm/regular-icewm-sysv-bfk3: vm/.regular-desktop-sysv mixin/regular-icewm \
+	use/mipsel-bfk3/x11; @:
+
+vm/regular-lxde-bfk3: vm/.regular-gtk mixin/regular-lxde \
+	use/mipsel-bfk3/x11; @:
+
+vm/regular-lxqt-bfk3: vm/.regular-gtk mixin/regular-lxqt \
+	use/mipsel-bfk3/x11; @:
+
+vm/regular-mate-bfk3: vm/.regular-gtk mixin/regular-mate \
+	use/mipsel-bfk3/x11
+	@$(call add,THE_PACKAGES,mate-reduced-resource)
+
+vm/regular-xfce-bfk3: vm/.regular-gtk mixin/regular-xfce \
+	use/mipsel-bfk3/x11
+	@$(call add,THE_PACKAGES,xfce-reduced-resource)
+endif
+
+endif
--- a/conf.d/regular.mk
+++ b/conf.d/regular.mk
@@ -2,246 +2,190 @@
 ifeq (distro,$(IMAGE_CLASS))

 # common ground (really lowlevel)
-distro/.regular-bare: distro/.base +net-eth use/kernel/net use/docs/license
+distro/.regular-bare: distro/.base +net-eth use/kernel/net use/docs/license \
+	use/stage2/fs use/stage2/hid use/stage2/md \
+	use/stage2/mmc use/stage2/net use/stage2/net-nfs \
+	use/stage2/rtc use/stage2/sbc use/stage2/scsi use/stage2/usb
 	@$(call try,SAVE_PROFILE,yes)

 # base target (for most images)
 distro/.regular-base: distro/.regular-bare use/vmguest use/memtest +efi; @:

 # 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
-	@$(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_ENABLE,gpm)
+	@$(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,installer-feature-desktop-other-fs-stage2)
-	@$(call add,THE_PACKAGES,alterator-notes)
-	@$(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
-	@$(call add,LIVE_LISTS,domain-client)
+distro/.regular-desktop: distro/.regular-wm use/branding/full \
+	use/syslinux/ui/gfxboot use/firmware/laptop +systemd +systemd-optimal
 	@$(call add,THE_BRANDING,bootloader)
-	@$(call add,THE_PACKAGES,upower bluez)
-	@$(call add,DEFAULT_SERVICES_DISABLE,gssd idmapd krb5kdc rpcbind)
-	@$(call add,DEFAULT_SERVICES_ENABLE,powertop)
+	@$(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-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 \
+distro/.regular-desktop-sysv: distro/.regular-wm use/init/sysv/polkit; @:
+
+distro/.regular-gtk-sysv: distro/.regular-desktop-sysv \
+	use/syslinux/ui/gfxboot use/x11/gdm2.20; @:
+
+distro/.regular-install: distro/.regular-base +installer \
+	use/branding use/bootloader/grub use/luks use/stage2/kms \
 	use/install2/fs use/install2/vnc use/install2/repo
+	@$(call add,INSTALL2_PACKAGES,fdisk)
+	@$(call add,INSTALL2_PACKAGES,xorg-conf-synaptics)
 	@$(call add,THE_LISTS,$(call tags,base regular))
 	@$(call add,INSTALL2_BRANDING,alterator notes)
 	@$(call add,THE_BRANDING,alterator)

 # common base for the very bare distros
-distro/.regular-jeos: distro/.regular-bare use/isohybrid +sysvinit \
-	use/branding use/bootloader/lilo use/syslinux/lateboot.cfg \
+distro/.regular-jeos-base: distro/.regular-bare \
+	use/isohybrid use/branding \
 	use/install2/repo use/install2/packages \
-	use/install2/cleanup/everything use/install2/cleanup/kernel/everything \
-	use/cleanup/jeos use/net/etcnet use/power/acpi/button
-	@$(call add,STAGE2_BOOTARGS,vga=0)
-	@$(call add,BASE_KMODULES,guest scsi vboxguest)
-	@$(call add,BASE_PACKAGES,make-initrd-mdadm cpio)
+	use/net/etcnet use/power/acpi/button
+	@$(call set,BOOTVGA,)
 	@$(call set,INSTALLER,altlinux-generic)
 	@$(call add,INSTALL2_BRANDING,alterator notes)
 	@$(call add,THE_BRANDING,alterator) # just to be cleaned up later on
-	@$(call add,THE_PACKAGES,apt basesystem dhcpcd vim-console)
+	@$(call add,THE_PACKAGES,apt basesystem dhcpcd vim-console su agetty)
 	@$(call add,THE_LISTS,openssh)

+# ...and for somewhat bare distros
+distro/.regular-jeos: distro/.regular-jeos-base use/stage2/kms \
+	use/install2/cleanup/everything use/install2/cleanup/kernel/everything \
+	use/syslinux/lateboot.cfg use/cleanup/jeos
+	@$(call add,BASE_PACKAGES,make-initrd-mdadm cpio)
+
+distro/.regular-jeos-full: distro/.regular-jeos \
+	use/volumes/jeos use/ntp/chrony use/bootloader/grub +efi
+	@$(call add,BASE_PACKAGES,nfs-utils gdisk)
+	@$(call add,INSTALL2_PACKAGES,fdisk)
+ifeq (,$(filter-out e2k%,$(ARCH)))
+	@$(call add,CLEANUP_PACKAGES,acpid-events-power)
+else
+	@$(call add,MAIN_PACKAGES,firmware-linux)
+	@$(call add,CLEANUP_PACKAGES,libffi 'libltdl*')
+	@$(call add,CLEANUP_PACKAGES,bridge-utils)
+	@$(call set,KFLAVOURS,std-def)
+endif
+	@$(call add,DEFAULT_SERVICES_DISABLE,fbsetfont)
+	@$(call add,BASE_KMODULES,drm)
+
 # 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
-	@$(call add,MAIN_PACKAGES,firmware-linux)
-	@$(call add,INSTALL2_PACKAGES,volumes-profile-jeos)
-	@$(call add,CLEANUP_PACKAGES,'glib2*' libffi 'libltdl*')
-	@$(call add,CLEANUP_PACKAGES,bridge-utils)
-	@$(call add,STAGE2_BOOTARGS,quiet)
-	@$(call set,KFLAVOURS,un-def)
+distro/regular-jeos-sysv: distro/.regular-jeos-full use/cleanup/jeos/full \
+	+sysvinit
+	@$(call add,BASE_PACKAGES,apt-conf-ignore-systemd)

+distro/regular-jeos-systemd: distro/.regular-jeos-full \
+	+systemd +systemd-optimal
+	@$(call add,BASE_PACKAGES,glibc-locales)
+
+ifeq (,$(filter-out i586 x86_64,$(ARCH)))
 # NB: no +efi as it brings in grub2 (no ELILO support for system boot)
-distro/regular-jeos-ovz: distro/.regular-jeos \
-	use/server/ovz-base use/control/server/ldv use/firmware
+distro/regular-jeos-ovz: distro/.regular-jeos use/cleanup/jeos/full +sysvinit \
+	use/server/ovz-base use/control/server/ldv use/firmware use/bootloader/lilo
 	@$(call add,THE_PACKAGES,ipmitool lm_sensors3 mailx)
+endif

-distro/.regular-install-x11: distro/.regular-install \
-	use/install2/suspend mixin/regular-desktop +vmguest +wireless
+distro/.regular-install-x11: distro/.regular-install +vmguest +wireless \
+	use/install2/suspend mixin/regular-desktop mixin/regular-x11 \
+	use/branding/complete use/branding/slideshow/once use/efi/refind
 	@$(call set,INSTALLER,altlinux-desktop)
-	@$(call add,THE_LISTS,$(call tags,regular desktop))

-distro/regular-icewm: distro/.regular-sysv-gtk +icewm \
-	use/browser/seamonkey/i18n use/fonts/ttf/redhat
-	@$(call add,LIVE_LISTS,$(call tags,regular icewm))
-	@$(call add,LIVE_PACKAGES,mnt winswitch xpra)
-	@$(call set,KFLAVOURS,un-def)
+# assumes somewhat more experienced user
+distro/.regular-install-x11-full: distro/.regular-install-x11 \
+	use/fonts/otf/adobe use/fonts/otf/mozilla use/fonts/chinese \
+	mixin/desktop-installer use/install2/fs use/efi/shell use/rescue/base
+	@$(call add,RESCUE_LISTS,$(call tags,rescue misc))
+	@$(call add,MAIN_PACKAGES,anacron man-whatis usb-modeswitch)

-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)
+distro/regular-icewm-sysv: distro/.regular-gtk-sysv mixin/regular-icewm \
+	use/browser/chromium use/kernel/latest; @:

 # 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/seamonkey/i18n
+distro/regular-wmaker-sysv: distro/.regular-desktop-sysv \
+	mixin/regular-wmaker use/live/autologin
 	@$(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 \
+distro/regular-gnustep-sysv: distro/.regular-desktop-sysv \
 	mixin/regular-wmaker mixin/regular-gnustep; @:
 distro/regular-gnustep-systemd: distro/.regular-wm +systemd \
 	mixin/regular-wmaker mixin/regular-gnustep; @:

-distro/regular-xfce: distro/.regular-gtk \
-	use/x11/xfce use/domain-client/full use/browser/firefox/classic \
-	use/fonts/ttf/redhat use/x11/gtk/nm +nm; @:
+distro/regular-xfce: distro/.regular-gtk mixin/regular-xfce use/kernel/latest;@:

-distro/regular-xfce-sysv: distro/.regular-sysv-gtk \
-	use/init/sysv/polkit use/x11/xfce \
-	use/fonts/ttf/redhat use/fonts/otf/adobe use/fonts/otf/mozilla
-	@$(call set,KFLAVOURS,un-def)
-	@$(call add,LIVE_PACKAGES,xfce4-mixer pm-utils elinks mpg123)
+distro/regular-xfce-sysv: distro/.regular-gtk-sysv mixin/regular-xfce-sysv; @:

-distro/regular-lxde: distro/.regular-gtk use/x11/lxde use/fonts/infinality \
-	use/x11/gtk/nm use/im +nm
-	@$(call add,LIVE_LISTS,$(call tags,desktop gvfs))
+distro/regular-xfce-sysv-install: distro/.regular-install-x11-full \
+	mixin/regular-xfce-sysv use/init/sysv/polkit use/x11/gdm2.20; @:
+
+distro/regular-lxde: distro/.regular-gtk mixin/regular-lxde; @:

 distro/regular-xmonad: distro/.regular-gtk use/x11/xmonad
 	@$(call add,LIVE_PACKAGES,livecd-regular-xmonad)

-distro/regular-mate: distro/.regular-gtk +nm \
-	use/x11/mate use/fonts/ttf/google use/domain-client/full
-	@$(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; @:

-distro/regular-e17: distro/.regular-gtk use/x11/e17 use/fonts/infinality; @:
+distro/regular-enlightenment: distro/.regular-gtk use/x11/enlightenment +power; @:

-distro/regular-enlightenment: distro/.regular-gtk \
-	use/x11/enlightenment use/fonts/infinality
-	@$(call set,META_VOL_ID,ALT Linux regular-E/$(ARCH))
-
-distro/regular-enlightenment-sysv: distro/.regular-sysv-gtk \
-	use/x11/enlightenment
-	@$(call set,META_VOL_ID,ALT Linux regular-E-SysV/$(ARCH))
-
-distro/regular-cinnamon: distro/.regular-gtk \
-	use/x11/cinnamon use/fonts/infinality use/net/nm/mmgui use/im
-	@$(call set,META_VOL_ID,ALT Linux $(IMAGE_NAME)) # see also #28271
+distro/regular-cinnamon: distro/.regular-gtk mixin/regular-cinnamon; @:

 # not .regular-gtk due to gdm vs lightdm
-distro/regular-gnome3: distro/.regular-desktop +plymouth +nm \
-	use/x11/gnome3 use/browser/epiphany use/fonts/ttf/redhat
-	@$(call set,KFLAVOURS,un-def)
+distro/regular-gnome3: distro/.regular-desktop mixin/regular-gnome3 \
+	use/kernel/latest +plymouth
 	@$(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 bluez)
-
-distro/regular-tde: distro/.regular-desktop mixin/regular-tde +plymouth \
-	use/x11/gtk/nm use/net/nm/mmgui
-	@$(call add,THE_LISTS,openscada)
-
-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/full \
-	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/net/connman use/browser/qupzilla +plymouth
-	@$(call add,THE_PACKAGES,qconnman-ui)
-	@$(call set,THE_IMAGEWRITER,rosa-imagewriter)
-
-distro/regular-lxqt: distro/.regular-desktop mixin/regular-lxqt; @:
-
-distro/regular-lxqt-sysv: distro/.regular-sysv mixin/regular-lxqt \
-	use/net-eth/dhcp use/efi/refind; @:
-
-distro/regular-sugar: distro/.regular-gtk use/x11/sugar; @:
-
-distro/regular-leechcraft: distro/.regular-desktop \
-	use/x11/leechcraft use/x11/lightdm/lxqt +pulse; @:
+distro/regular-lxqt: distro/.regular-gtk mixin/regular-lxqt +plymouth
+	@$(call add,THE_LISTS,$(call tags,lxqt desktop))

 distro/regular-kde5: distro/.regular-desktop \
-	use/x11/kde5 use/x11/sddm \
-	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
-distro/regular-rescue: distro/.regular-base use/rescue/rw use/luks \
-	use/branding use/efi/refind use/efi/shell use/efi/memtest86 \
-	use/hdt use/syslinux/ui/menu use/syslinux/timeout/600 \
-	use/syslinux/rescue_fm.cfg use/syslinux/rescue_remote.cfg \
-	use/firmware/qlogic use/mediacheck test/rescue/no-x11 \
-	+wireless +sysvinit
-	@$(call set,KFLAVOURS,un-def)
+distro/regular-robo: distro/regular-mate +robotics use/live/ru; @:
+
+distro/regular-rescue: distro/.regular-base mixin/regular-rescue  \
+	use/rescue/rw use/efi/refind use/efi/shell use/efi/memtest86 \
+	use/hdt use/syslinux/rescue_fm.cfg use/syslinux/rescue_remote.cfg \
+	use/grub/rescue_fm.cfg use/grub/rescue_remote.cfg \
+	use/mediacheck use/stage2/kms use/kernel/latest +wireless
 	@$(call add,RESCUE_PACKAGES,gpm livecd-net-eth)
-	@$(call add,RESCUE_LISTS,$(call tags,base && (smartcard || bench)))
+	@$(call add,RESCUE_LISTS,$(call tags,base bench))
 	@$(call add,RESCUE_LISTS,$(call tags,network security))

-distro/regular-sysv-tde: distro/.regular-install-x11 \
-	mixin/desktop-installer mixin/regular-tde use/install2/fs \
-	use/branding/complete use/branding/slideshow/once \
-	use/net-eth/dhcp use/efi/refind use/efi/shell use/rescue/base \
-	use/fonts/otf/adobe use/fonts/otf/mozilla
-	@$(call add,RESCUE_LISTS,$(call tags,rescue misc))
-	@$(call add,THE_LISTS,$(call tags,base desktop))
-	@$(call add,THE_LISTS,$(call tags,regular tde))
-	@$(call add,THE_PACKAGES,kpowersave)
-	@$(call add,MAIN_PACKAGES,anacron man-whatis usb-modeswitch)
+distro/regular-rescue-netbootxyz: distro/.regular-bare mixin/regular-rescue
+	@$(call set,RELNAME,en.altlinux.org/rescue (netboot.xyz edition))
+	@$(call set,META_VOL_ID,ALT Rescue)
+	@$(call set,META_APP_ID,$(ARCH))

-distro/.regular-server-base: distro/.regular-install \
-	use/server/base use/stage2/kms
-	@$(call add,THE_LISTS,$(call tags,regular server))
+distro/.regular-server-base: distro/.regular-install use/server/base
+	@$(call add,THE_LISTS,$(call tags,server && (regular || network)))
 	@$(call set,INSTALLER,altlinux-server)
+	@$(call add,SYSTEM_PACKAGES,multipath-tools)
+	@$(call add,INSTALL2_PACKAGES,installer-feature-multipath)

 distro/.regular-server: distro/.regular-server-base \
-	use/server/mini use/firmware/qlogic use/rescue/base use/cleanup/x11
+	use/server/mini use/firmware/qlogic use/rescue/base \
+	use/ntp/chrony use/cleanup/libs use/bootloader/grub +efi
+	@$(call add,RESCUE_LISTS,$(call tags,rescue misc))
 	@$(call add,MAIN_PACKAGES,aptitude)
-	@$(call add,CLEANUP_PACKAGES,qt4-common)
+	@$(call add,CLEANUP_PACKAGES,qt4-common qt5-base-common)
 	@$(call add,DEFAULT_SERVICES_DISABLE,bridge)
+	@$(call add,DEFAULT_SERVICES_ENABLE,getty@tty1)

 distro/.regular-server-managed: distro/.regular-server
 	@$(call add,THE_PACKAGES,alterator-fbi)
@@ -249,50 +193,73 @@ distro/.regular-server-managed: distro/.regular-server
 	@$(call add,INSTALL2_PACKAGES,ntfs-3g)
 	@$(call add,DEFAULT_SERVICES_DISABLE,ahttpd alteratord)

-distro/regular-server: distro/.regular-server-managed use/server/groups/base
+distro/.regular-server-full: distro/.regular-server-managed \
+	use/server/groups/base use/dev/groups/builder use/install2/vnc/full
 	@$(call add,MAIN_GROUPS,server/sambaDC)
 	@$(call add,MAIN_GROUPS,tools/hyperv)
+	@$(call add,BASE_KMODULES,staging)

-distro/regular-server-ovz: distro/.regular-server \
+distro/regular-server-systemd: distro/.regular-server-full \
+	+systemd +systemd-optimal; @:
+
+distro/regular-server-sysv: distro/.regular-server-full +sysvinit; @:
+
+distro/.regular-server-ovz: distro/.regular-server \
 	use/server/ovz use/server/groups/tools use/cleanup/x11-alterator
 	@$(call add,MAIN_GROUPS,tools/vzstats)

-distro/regular-server-hyperv: distro/.regular-server-managed
-	@$(call set,KFLAVOURS,un-def)
+distro/regular-server-ovz: distro/.regular-server-ovz +systemd; @:
+distro/regular-server-ovz-sysv: distro/.regular-server-ovz +sysvinit; @:
+
+distro/regular-server-hyperv: distro/.regular-server-managed \
+	use/kernel/latest +systemd
 	@$(call add,THE_PACKAGES,hyperv-daemons)
 	@$(call add,DEFAULT_SERVICES_DISABLE,bridge smartd)
 	@$(call add,DEFAULT_SERVICES_DISABLE,cpufreq-simple powertop)

-distro/.regular-server-openstack: distro/.regular-server-base \
-	use/firmware/qlogic use/server/groups/openstack
-	@$(call add,MAIN_GROUPS,tools/ipmi tools/monitoring)
-
-distro/regular-server-openstack: distro/.regular-server-openstack +systemd; @:
-
-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
-	@$(call set,BASE_BOOTLOADER,grub)
+distro/regular-server-pve: distro/.regular-server-base +systemd \
+	use/kernel/server use/firmware/qlogic
 	@$(call set,INSTALLER,altlinux-server)
-	@$(call add,THE_PACKAGES,pve-manager)
-	@$(call add,THE_KMODULES,ipset kvm)
-	@$(call add,DEFAULT_SERVICES_ENABLE,pve-manager)
+	@$(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,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 \
-	use/dev/builder/full +sysvinit +efi +power \
+distro/regular-builder: distro/.regular-bare mixin/regular-builder \
+	use/dev/builder/full use/stage2/kms +sysvinit +efi +power \
 	use/live/base use/live/rw use/live/repo/online use/live/textinstall \
-	use/isohybrid use/syslinux/timeout/30 \
-	use/stage2/net-eth use/net-eth/dhcp
-	@$(call add,LIVE_PACKAGES,cifs-utils elinks lftp openssh wget)
-	@$(call add,LIVE_PACKAGES,bash-completion gpm screen tmux zsh)
-	@$(call add,LIVE_PACKAGES,ccache rpm-utils wodim)
-	@$(call add,DEFAULT_SERVICES_ENABLE,gpm)
+	use/isohybrid use/syslinux/timeout/300 use/grub/timeout/30 use/stage2/net-eth
+	@$(call add,THE_PACKAGES,ccache cifs-utils wodim)

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

 # /dev/pty and friends start here
-ve/base: ve/bare
+ve/base: ve/bare use/net-dns/level3
 	@$(call add,BASE_PACKAGES,interactivesystem)

 # a particular package list
-ve/ldv: ve/bare
+ve/ldv: ve/bare use/control/server/ldv
 	@$(call add,BASE_PACKAGES,xz bzip2 glibc hostinfo less)
 	@$(call add,BASE_PACKAGES,vim-console netlist rsync time)
 	@$(call add,BASE_PACKAGES,openssh-blacklist openssh-server)
 	@$(call add,BASE_PACKAGES,shadow-edit shadow-groups)

-ve/docker: ve/.base use/repo; @:
+ve/docker: ve/.apt use/repo
+	@$(call add,BASE_PACKAGES,iproute2)
+
+# build environment
+ve/builder: ve/base use/dev/builder/base use/repo
+	@$(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)))

@@ -29,8 +34,21 @@ ve/openvpn: ve/bare
 ve/pgsql94: ve/generic
 	@$(call add,BASE_PACKAGES,postgresql9.4-server)

-ve/systemd-bare: ve/.base use/control/sudo-su use/repo use/net/networkd +systemd
+ve/samba-DC: ve/generic
+	@$(call add,BASE_PACKAGES,task-samba-dc glibc-locales net-tools)
+
+ve/sysvinit-etcnet: ve/base use/net/etcnet \
+        use/control/sudo-su use/repo use/net-ssh
+	@$(call add,BASE_PACKAGES,glibc-gconv-modules glibc-locales tzdata bash-completion iptables curl)
+
+ve/systemd-bare: ve/.apt +systemd \
+	use/control/sudo-su use/repo use/net-ssh
 	@$(call add,BASE_PACKAGES,interactivesystem su)
-	@$(call add,BASE_LISTS,openssh)
+
+ve/systemd-networkd: ve/systemd-bare use/net/networkd
+	@$(call add,BASE_PACKAGES,glibc-gconv-modules glibc-locales tzdata bash-completion iptables curl)
+
+ve/systemd-etcnet: ve/systemd-bare use/net/etcnet
+	@$(call add,BASE_PACKAGES,glibc-gconv-modules glibc-locales tzdata bash-completion iptables curl)

 endif
--- a/conf.d/vm.mk
+++ b/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,18 @@ 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 use/tty/S0
+	@$(call add,THE_KMODULES,drm)
+	@$(call add,DEFAULT_SERVICES_ENABLE,getty@tty1 getty@ttyS0)
 	@$(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 +38,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
@@ -45,7 +46,9 @@ vm/icewm-setup: vm/.desktop-bare mixin/icewm use/oem use/x11-autostart
 	@$(call add,THE_LISTS,$(call tags,base l10n))

 # some arbitrary gigabyte
+ifeq (,$(filter-out i586 x86_64,$(ARCH)))
 vm/vagrant-base: vm/net use/vagrant
 	@$(call set,VM_SIZE,10737418240)
+endif

 endif
--- a/doc/archdep.txt
+++ b/doc/archdep.txt
@@ -22,7 +22,7 @@

 В скриптовых хуках ({image-,}scripts.d/*) проверяйте $GLOBAL_ARCH.

-=== списки пакетов ===
+=== списки пакетов, профили групп ===

 Бывает так, что в списке пакетов есть смысл упоминать какой-либо из них
 только для определённой архитектуры (например, wine или steam); в таких
@@ -40,7 +40,27 @@
  haspd@i586
  i586-haspd@x86_64

+или упрощённо (с версии 1.2.12):
+
+  haspd@IA32
+
+С версии 1.3.15 поддерживается макрос E2K ("любое поколение e2k*"),
+а также выборка "для любой архитектуры, кроме" (например, @!E2K).
+
 Для преобразования можно воспользоваться следующей командой:

  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.
--- a/doc/assumptions.txt
+++ b/doc/assumptions.txt
@@ -4,7 +4,7 @@
 других частей mkimage-profiles либо содержание переменных.

 NB: пути приводятся от верхнего уровня; проект в целом предполагает
-ALT Linux 7.0+ и GNU make 3.82+ (на которых и разрабатывается),
+наличие ALT 8.0+ и GNU make 3.82+ (на которых и разрабатывается),
 но может быть портирован вместе с mkimage.  Если что-либо не работает
 или не собирается, стоит проверить на Sisyphus (mkimage, make, hasher,
 собственно пакетная база), поскольку именно на нём происходит основная
@@ -16,12 +16,14 @@ ALT Linux 7.0+ и GNU make 3.82+ (на которых и разрабатыва
 ** ожидает, что каждая подлежащая трассированию цель каждого
    makefile при сборке конфигурации образа содержит непустой
    recipe -- хотя бы "; @:" -- т.к. зависит от запуска $(SHELL)
+** трассировка выполняется при REPORT=1 для формирования графа
+    зависимостей между промежуточными целями сборки конечного образа
 ** характерный признак пропуска -- разрыв графа (report-targets.png)

 * pkg.in/lists/Makefile
-** ожидает, что названия пакаджлистов указываются в переменных
+** ожидает, что названия списков пакетов указываются в переменных
    вида *_LISTS, и копирует в генерируемый профиль только их
-** если задать имя файла пакаджлиста непосредственно в Makefile
+** если задать имя файла списка пакетов непосредственно в Makefile
    субпрофиля, он не будет скопирован
 ** характерное сообщение об ошибке:

@@ -35,6 +37,7 @@ ALT Linux 7.0+ и GNU make 3.82+ (на которых и разрабатыва
    в KFLAVOURS)
 ** если добавить какой-либо kernel-image в STAGE1_PACKAGES*,
    результат может быть неожиданным
+** обратите внимание: bin/tar2fs умеет несколько ядер
 ** вероятная ошибка: незагрузка полученного squashfs

 * features.in/install2/install2/stage2cfg.mk
--- a/doc/debug.txt
+++ b/doc/debug.txt
@@ -16,6 +16,7 @@
   этого коммита;
 ** содержит список конфигурационных переменных и их конечных значений,
   созданный на основании distcfg.mk (см. тж. build/vars.mk)
+
 * REPORT=1 включает генерацию дополнительного вывода:
 ** build/reports/targets.png -- граф зависимостей между целями
 ** build/reports/scripts.log -- порядок запуска скриптовых хуков
--- a/doc/mkimage-profiles.7.in
+++ b/doc/mkimage-profiles.7.in
@@ -16,16 +16,16 @@
 .\" along with this program; if not, write to the Free Software
 .\" Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
 .\" 
-.TH "MKIMAGE-PROFILES" "7" "February 2016" "mkimage-profiles @VERSION@" "ALT Linux"
+.TH "MKIMAGE-PROFILES" "9" "June 2017" "mkimage-profiles @VERSION@" "ALT"
 .SH "NAME"
-mkimage-profiles \- ALT Linux distribution family metaprofile
+mkimage-profiles \- ALT distribution family metaprofile
 .SH "SYNOPSIS"
 .B make
 .IR "" [ options ]
 .I "" [ <goal> ... ]
 .SH "DESCRIPTION"
 .BR mkimage-profiles
-builds operating environment images based on ALT Linux package repositories.
+builds operating environment images based on ALT package repositories.

 Run
 .BR make\ help
@@ -50,7 +50,7 @@ can be used to obtain build dependency graphs.
 Long time ago when Linux distribution images were worked upon by hand
 there was little need for generalization and sharing the common base.

-Building several "generic" ALT Linux distros in a team and maintaining
+Building several "generic" ALT{, Linux} distros in a team and maintaining
 their educational flavours at the same time proved the need to be able
 to describe what's common and what's different in a way that doesn't
 resemble more or less complete forks.
@@ -59,7 +59,7 @@ Enter mkimage-profiles: choose what's closest to your dream image
 and add what's missing, or roll on your own using the rich library
 of existing parts and bits.
 .SH "REQUIREMENTS"
-The next-generation image build system for ALT Linux must:
+The next-generation image build system for ALT must:
 .TP
 1.
 provide reasonable means to describe common/differing aspects within
@@ -108,7 +108,7 @@ Report bugs to http://bugzilla.altlinux.org
 .br
 (Sisyphus project, mkimage-profiles component).
 .SH "COPYRIGHT"
-Copyright \(co) 2010-2016  Michael Shigorin <mike@altlinux.org>
+Copyright \(co) 2010-2017  Michael Shigorin <mike@altlinux.org>
 .br
 This is free software; see the source for copying conditions.
 There is NO WARRANTY; not even for MERCHANTABILITY or
--- a/doc/params.txt
+++ b/doc/params.txt
@@ -10,7 +10,7 @@

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

 * ARCHES
@@ -18,6 +18,11 @@
 ** значение: пусто (по умолчанию авто) либо список через пробел
 ** см. Makefile, doc/profiles.mk.sample

+* AUTOCLEAN
+** включает уборку (distclean) после успешной сборки образа
+** значение: пусто (по умолчанию нет) либо любая строка
+** см. lib/build.mk
+
 * BELL
 ** подаёт сигнал после завершения сборки
 ** значение: пусто (по умолчанию нет) либо любая строка
@@ -55,6 +60,11 @@
 ** значение: пусто (по умолчанию), 1 или 2
 ** см. lib/log.mk, lib/clean.mk

+* DISTRO_VERSION
+** задаёт версию дистрибутива, если применимо
+** значение: пусто (по умолчанию) либо любая строка
+** см. image.in/Makefile
+
 * HOMEPAGE, HOMENAME, HOMEWAIT
 ** указывают адрес, название и таймаут перехода для домашней страницы
 ** значение: корректный URL, строка, целое неотрицательное число
--- a/doc/pkglists.txt
+++ b/doc/pkglists.txt
@@ -1,8 +1,7 @@
 == Списки пакетов ==

 Состав пакетной базы субпрофилей определяется значениями
-следующих переменных профиля (см. тж. conf.d/README;
-некоторые "*" ниже заэкранированы ради парсера asciidoc):
+следующих переменных профиля (см. тж. conf.d/README):

 * main: пакетная база для установки
 ** sub.in/main/Makefile, features.in/*/main/lib/
--- a/doc/qemu.txt
+++ b/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
--- a/doc/style.txt
+++ b/doc/style.txt
@@ -33,7 +33,7 @@

 * предпочтительно применение $() вместо `` (особенно при вложенности);

-* постарайтесь не вылазить за 80 колонок;
+* постарайтесь не вылезать за 80 колонок;

 * избегайте merge-коммитов в коде, который предлагаете для включения
  в основную ветку: поддерживается линейная история для удобства
--- a/doc/vm.txt
+++ b/doc/vm.txt
@@ -14,7 +14,9 @@
 При работе с локальной копией mkimage-profiles.git следует иметь
 в виду, что предоставлять недоверенному пользователю право выполнять
 от имени root доступный ему по записи скрипт равнозначно предоставлению
-полных привилегий root.
+полных привилегий root (поэтому фича build-vm сперва проверяет наличие
+системно установленного пакета и по возможности старается запустить
+под sudo скрипт из него, доступный по записи только root).

 Для работы с более специфичными форматами, чем raw ("буквальный"
 образ диска), потребуется утилита qemu-img из одноименного пакета;
--- a/features.in/Makefile
+++ b/features.in/Makefile
@@ -25,6 +25,9 @@ define grepper_body
 	done
 endef

+check:
+	@../bin/check-recipe */config.mk
+
 %:
 	$(error BUILDDIR not defined)

--- a/features.in/aarch64-dbm/README
+++ b/features.in/aarch64-dbm/README
@@ -0,0 +1 @@
+Настраивает систему для загрузки на плате DBM с SoC BE-M1000 (aarch64).
--- a/features.in/aarch64-dbm/config.mk
+++ b/features.in/aarch64-dbm/config.mk
@@ -0,0 +1,11 @@
+ifeq (,$(filter-out aarch64,$(ARCH)))
+use/aarch64-dbm: use/efi/grub use/tty/S0
+	@$(call add_feature)
+	@$(call set,KFLAVOURS,bfkm)
+	@$(call add,BASE_BOOTARGS,video=HDMI-A-1:D fbcon=map:0)
+	@$(call try,DBM_DTB,bm-bfkm)
+	@$(call xport,DBM_DTB)
+
+use/aarch64-dbm/mini-itx: use/aarch64-dbm
+	@$(call set,DBM_DTB,bm-bfkm)
+endif
--- a/features.in/aarch64-dbm/image-scripts.d/93-grub2-param-dbm
+++ b/features.in/aarch64-dbm/image-scripts.d/93-grub2-param-dbm
@@ -0,0 +1,15 @@
+#!/bin/sh -efu
+
+# To load a Linux kernel onto a DBM board using GRUB2,
+# you need specific parameters on the kernel command line
+# and an explicit definition the dtb file to load.
+# This script creates the required settings in the file
+# /etc/sysconfig/grub2
+
+cfgfile="/etc/sysconfig/grub2"
+
+if [ -f "$cfgfile" ]
+then
+	echo "# Configure GRUB2 Special Settings for DBM board" >> "$cfgfile"
+	echo "GRUB_FDT_LINUX=$GLOBAL_DBM_DTB.dtb" >> "$cfgfile"
+fi
--- a/features.in/aarch64-dbm/image-scripts.d/98-dbm-startup-nsh
+++ b/features.in/aarch64-dbm/image-scripts.d/98-dbm-startup-nsh
@@ -0,0 +1,20 @@
+#!/bin/sh
+# The tar2fs script writes the contents of the /boot/efi directory
+# to a disk image partition for EFI.
+# Place the scripts executed by EFI Shell in /boot/efi
+
+mkdir -p /boot/efi
+# Script startup.nsh to boot with GRUB2 by default
+cat > /boot/efi/startup.nsh << EOF
+\EFI\BOOT\BOOTAA64.EFI
+
+EOF
+
+# The efidrvext.nsh script can be run manually from the EFI Shell
+# to boot using the ext2, ext3, ext4 driver for EFI
+cat > /boot/efi/efidrvext.nsh << EOF
+load fs0:\efi\drivers\ext2_aa64.efi
+map -r
+FS1:\boot\vmlinuz root=/dev/sda2 ro console=ttyS0,115200 video=HDMI-A-1:D fbcon=map:0 initrd=/boot/initrd.img dtb=/boot/dtb/bm-bfkm.dtb
+
+EOF
--- a/features.in/aarch64-dbm/rootfs/files/etc/modules-load.d/snd-dummy.conf
+++ b/features.in/aarch64-dbm/rootfs/files/etc/modules-load.d/snd-dummy.conf
@@ -0,0 +1 @@
+snd-dummy
--- a/features.in/aarch64-tegra/README
+++ b/features.in/aarch64-tegra/README
@@ -0,0 +1,2 @@
+Настраивает систему для загрузки на компьютерах с SoC tegra (aarch64).
+Пока поддерживается только Jetson Nano.
--- a/features.in/aarch64-tegra/config.mk
+++ b/features.in/aarch64-tegra/config.mk
@@ -0,0 +1,6 @@
+
+ifeq (,$(filter-out aarch64,$(ARCH)))
+use/aarch64-tegra: use/bootloader/uboot
+	@$(call add_feature)
+	@$(call set,KFLAVOURS,tegra)
+endif
--- a/features.in/aarch64-tegra/image-scripts.d/98-tegra-extlinux-conf
+++ b/features.in/aarch64-tegra/image-scripts.d/98-tegra-extlinux-conf
@@ -0,0 +1,17 @@
+#!/bin/sh
+
+# Rewrite extlinux.conf
+mkdir -p /boot/extlinux
+cat > /boot/extlinux/extlinux.conf << EOF
+menu title ALT Boot Options
+
+default linux
+timeout 20
+
+append ${cbootargs} rootfstype=ext4 root=LABEL=ROOT rw rootwait console=tty1
+
+label linux
+	menu label linux
+	linux /boot/vmlinuz
+	initrd /boot/initrd.img
+EOF
--- a/features.in/aarch64-tegra/image-scripts.d/99-tegra-initrd-conf
+++ b/features.in/aarch64-tegra/image-scripts.d/99-tegra-initrd-conf
@@ -0,0 +1,4 @@
+#!/bin/sh
+
+echo 'PUT_FILES += /lib/firmware/tegra21x_xusb_firmware' \
+  >> /etc/initrd.mk
--- a/features.in/apt-conf/README
+++ b/features.in/apt-conf/README
@@ -0,0 +1 @@
+Данная фича определяет то, какая конфигурация apt попадёт в образ.
--- a/features.in/apt-conf/config.mk
+++ b/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)
--- a/features.in/arm-rpi4/README
+++ b/features.in/arm-rpi4/README
@@ -0,0 +1,2 @@
+Настраивает систему для Raspberry Pi 4
+
--- a/features.in/arm-rpi4/config.mk
+++ b/features.in/arm-rpi4/config.mk
@@ -0,0 +1,34 @@
+ifeq (,$(filter-out aarch64 armh,$(ARCH)))
+ifeq (aarch64,$(ARCH))
+use/arm-rpi4: use/efi/grub use/uboot
+else
+use/arm-rpi4: use/bootloader/uboot
+endif
+	@$(call add_feature)
+	@$(call set,VM_PARTTABLE,msdos)
+	@$(call add,BASE_KMODULES,staging)
+	@$(call add,THE_LISTS,uboot)
+	@$(call add,THE_PACKAGES,u-boot-tools)
+	@$(call add,THE_PACKAGES,rpi4-boot-switch)
+	@$(call add,THE_PACKAGES,rpi4-boot-nouboot-filetrigger)
+	@$(call add,THE_PACKAGES,rpi4-boot-uboot-filetrigger)
+	@$(call add,THE_PACKAGES,firmware-bcm4345)
+	@$(call add,THE_PACKAGES,brcm-patchram-plus)
+	@$(call add,THE_PACKAGES,rpi4-resize-rootpart)
+	@$(call add,DEFAULT_SERVICES_ENABLE,bluetoothd attach-bluetooth)
+	@$(call add,DEFAULT_SERVICES_DISABLE,systemd-networkd-wait-online)
+
+use/arm-rpi4/x11: use/arm-rpi4 \
+	use/browser/firefox/i18n use/browser/firefox/esr
+	@$(call add,THE_PACKAGES,celluloid celluloid-csd-disabled)
+
+use/arm-rpi4/kernel: use/arm-rpi4
+ifeq (aarch64,$(ARCH))
+	@$(call set,KFLAVOURS,rpi-def rpi-un)
+else
+	@$(call set,KFLAVOURS,rpi-def)
+endif
+
+use/arm-rpi4/full: use/arm-rpi4/kernel use/arm-rpi4/x11; @:
+
+endif
--- a/features.in/arm-rpi4/image-scripts.d/80-chromium-to-firefox-in-panel
+++ b/features.in/arm-rpi4/image-scripts.d/80-chromium-to-firefox-in-panel
@@ -0,0 +1,10 @@
+#!/bin/sh -efu
+
+fffile="/usr/share/applications/firefox.desktop"
+panfile="/etc/skel/.config/xfce4/panel/launcher-5/15592088901.desktop"
+
+if [ -f "$fffile" -a -f "$panfile" ]
+then
+	sed -i 's/Chromium/Firefox/' "$panfile"
+	sed -i 's/chromium/firefox/' "$panfile"
+fi
--- a/features.in/arm-rpi4/image-scripts.d/81-mplayer-to-celluloid-in-mimeapps
+++ b/features.in/arm-rpi4/image-scripts.d/81-mplayer-to-celluloid-in-mimeapps
@@ -0,0 +1,15 @@
+#!/bin/sh -efu
+# Change the default application for all file types from mplayer to celluloid
+
+cfile="/usr/share/applications/io.github.celluloid_player.Celluloid.desktop"
+mimeappsfile="/usr/share/applications/mimeapps.list"
+mimeappslocalfile="/etc/skel/.config/mimeapps.list"
+
+if [ -f "$cfile" -a -f "$mimeappsfile" ]
+then
+echo "[Default Applications]" > "$mimeappslocalfile"
+sed '/[=;]mplayer.desktop/!d ; /[=;]mplayer.desktop/s/=.*/=io.github.celluloid_player.Celluloid.desktop;/' "$mimeappsfile" >> "$mimeappslocalfile"
+echo "" >> "$mimeappslocalfile"
+echo "[Added Associations]" >> "$mimeappslocalfile"
+sed '/[=;]mplayer.desktop/!d ; /[=;]mplayer.desktop/s/=.*/=io.github.celluloid_player.Celluloid.desktop;/' "$mimeappsfile" >> "$mimeappslocalfile"
+fi
--- a/features.in/arm-rpi4/image-scripts.d/82-timer-based-to-interrupt-driven
+++ b/features.in/arm-rpi4/image-scripts.d/82-timer-based-to-interrupt-driven
@@ -0,0 +1,11 @@
+#!/bin/sh -efu
+
+# Changed audio scheduling from timer-based to
+# interrupt-driven to prevent unwanted crackle.
+
+pafile="/etc/pulse/default.pa"
+
+if [ -f "$pafile" ]
+then
+	sed -i 's/^load-module module-udev-detect$/load-module module-udev-detect tsched=0/' "$pafile"
+fi
--- a/features.in/arm-rpi4/image-scripts.d/91-edit-fstab-growfs
+++ b/features.in/arm-rpi4/image-scripts.d/91-edit-fstab-growfs
@@ -0,0 +1,5 @@
+#!/bin/sh -efu
+
+# For resize rootfs with systemd-growfs@-.service
+# set x-systemd.growfs option  in /etc/fstab for rootfs
+sed -i '/^LABEL=ROOT/s/defaults/defaults,x-systemd.growfs/' /etc/fstab
--- a/features.in/arm-rpi4/image-scripts.d/93-default-gouvernor-conservative
+++ b/features.in/arm-rpi4/image-scripts.d/93-default-gouvernor-conservative
@@ -0,0 +1,12 @@
+#!/bin/sh -efu
+# By default, in cpufreq-simple feature the ondemand governor is configured.
+# But only the conservative governor is available at Raspberry Pi 4 kernels.
+# This is change the default governor to conservative.
+
+cfgfile="/etc/sysconfig/cpufreq-simple"
+
+if [ -f "$cfgfile" ]
+then
+	echo "GOVERNOR_AC_ON=conservative" >> "$cfgfile"
+	echo "GOVERNOR_AC_OFF=conservative" >> "$cfgfile"
+fi
--- a/features.in/arm-rpi4/image-scripts.d/96-gen-brcmfmac43455
+++ b/features.in/arm-rpi4/image-scripts.d/96-gen-brcmfmac43455
@@ -0,0 +1,3 @@
+#!/bin/sh -efu
+
+sed 's/Raspberry Pi 3 Model B+/Raspberry Pi 4/ ; s/boardflags3=0x48200100/boardflags3=0x44200100/' /lib/firmware/brcm/brcmfmac43455-sdio.raspberrypi,3-model-b-plus.txt > /lib/firmware/brcm/brcmfmac43455-sdio.txt
--- a/features.in/arm-rpi4/image-scripts.d/97-gen-uboot-env
+++ b/features.in/arm-rpi4/image-scripts.d/97-gen-uboot-env
@@ -0,0 +1,58 @@
+#!/bin/sh -efu
+
+target_dir='/boot/efi'
+mkdir -p "$target_dir"
+
+(
+cat << 'EOF'
+arch=arm
+baudrate=115200
+board=rpi
+board_name=4 Model B
+board_rev=0x11
+board_rev_scheme=1
+board_revision=0xC03111
+boot_a_script=load ${devtype} ${devnum}:${distro_bootpart} ${scriptaddr} ${prefix}${script}; source ${scriptaddr}
+boot_efi_binary=if fdt addr ${fdt_addr_r}; then bootefi bootmgr ${fdt_addr_r};else bootefi bootmgr ${fdtcontroladdr};fi;load ${devtype} ${devnum}:${distro_bootpart} ${kernel_addr_r} efi/boot/bootaa64.efi; if fdt addr ${fdt_addr_r}; then bootefi ${kernel_addr_r} ${fdt_addr_r};else bootefi ${kernel_addr_r} ${fdtcontroladdr};fi
+boot_extlinux=sysboot ${devtype} ${devnum}:${distro_bootpart} any ${scriptaddr} ${prefix}${boot_syslinux_conf}
+boot_prefixes=/ /boot/
+boot_script_dhcp=boot.scr.uimg
+boot_scripts=boot.scr.uimg boot.scr
+boot_syslinux_conf=extlinux/extlinux.conf
+boot_targets=mmc0 mmc1 pxe dhcp 
+bootcmd=run distro_bootcmd
+bootcmd_dhcp=if dhcp ${scriptaddr} ${boot_script_dhcp}; then source ${scriptaddr}; fi;setenv efi_fdtfile ${fdtfile}; setenv efi_old_vci ${bootp_vci};setenv efi_old_arch ${bootp_arch};setenv bootp_vci PXEClient:Arch:00011:UNDI:003000;setenv bootp_arch 0xb;if dhcp ${kernel_addr_r}; then tftpboot ${fdt_addr_r} dtb/${efi_fdtfile};if fdt addr ${fdt_addr_r}; then bootefi ${kernel_addr_r} ${fdt_addr_r}; else bootefi ${kernel_addr_r} ${fdtcontroladdr};fi;fi;setenv bootp_vci ${efi_old_vci};setenv bootp_arch ${efi_old_arch};setenv efi_fdtfile;setenv efi_old_arch;setenv efi_old_vci;
+bootcmd_mmc0=devnum=0; run mmc_boot
+bootcmd_mmc1=devnum=1; run mmc_boot
+bootcmd_pxe=dhcp; if pxe get; then pxe boot; fi
+bootdelay=2
+cpu=armv8
+dhcpuboot=usb start; dhcp u-boot.uimg; bootm
+distro_bootcmd=for target in ${boot_targets}; do run bootcmd_${target}; done
+efi_dtb_prefixes=/ /dtb/ /dtb/current/
+fdt_addr=6000000
+fdt_addr_r=0x06000000
+fdt_high=ffffffffffffffff
+fdtcontroladdr=3af59a70
+initrd_high=ffffffffffffffff
+kernel_addr_r=0x00080000
+load_efi_dtb=load ${devtype} ${devnum}:${distro_bootpart} ${fdt_addr_r} ${prefix}${efi_fdtfile}
+loadaddr=0x00200000
+mmc_boot=if mmc dev ${devnum}; then devtype=mmc; run scan_dev_for_boot_part; fi
+pxefile_addr_r=0x02500000
+ramdisk_addr_r=0x06100000
+scan_dev_for_boot=echo Scanning ${devtype} ${devnum}:${distro_bootpart}...; for prefix in ${boot_prefixes}; do run scan_dev_for_extlinux; run scan_dev_for_scripts; done;run scan_dev_for_efi;
+scan_dev_for_boot_part=part list ${devtype} ${devnum} -bootable devplist; env exists devplist || setenv devplist 1; for distro_bootpart in ${devplist}; do if fstype ${devtype} ${devnum}:${distro_bootpart} bootfstype; then run scan_dev_for_boot; fi; done; setenv devplist
+scan_dev_for_efi=setenv efi_fdtfile ${fdtfile}; for prefix in ${efi_dtb_prefixes}; do if test -e ${devtype} ${devnum}:${distro_bootpart} ${prefix}${efi_fdtfile}; then run load_efi_dtb; fi;done;if test -e ${devtype} ${devnum}:${distro_bootpart} efi/boot/bootaa64.efi; then echo Found EFI removable media binary efi/boot/bootaa64.efi; run boot_efi_binary; echo EFI LOAD FAILED: continuing...; fi; setenv efi_fdtfile
+scan_dev_for_extlinux=if test -e ${devtype} ${devnum}:${distro_bootpart} ${prefix}${boot_syslinux_conf}; then echo Found ${prefix}${boot_syslinux_conf}; run boot_extlinux; echo SCRIPT FAILED: continuing...; fi
+scan_dev_for_scripts=for script in ${boot_scripts}; do if test -e ${devtype} ${devnum}:${distro_bootpart} ${prefix}${script}; then echo Found U-Boot script ${prefix}${script}; run boot_a_script; echo SCRIPT FAILED: continuing...; fi; done
+scriptaddr=0x02400000
+serial#=100000000a137b9c
+soc=bcm283x
+stderr=serial,vidconsole
+stdin=serial,usbkbd
+stdout=serial,vidconsole
+vendor=raspberrypi
+
+EOF
+) | mkenvimage -s 16384 -o "$target_dir/uboot.env" -
--- a/features.in/arm-rpi4/image-scripts.d/98-bootstrap-boot-by-firmware
+++ b/features.in/arm-rpi4/image-scripts.d/98-bootstrap-boot-by-firmware
@@ -0,0 +1,45 @@
+#!/bin/sh -eu
+
+kflavour=
+kflavour="${GLOBAL_KFLAVOURS%% *}"
+
+mkdir -p /boot/efi
+
+uboots="rpi_3 rpi_3_32b rpi_4 rpi_4_32b"
+for uboot in $uboots; do
+	[ -d /usr/share/u-boot/$uboot ] &&
+	  cp -f /usr/share/u-boot/$uboot/* /boot/efi/
+	[ -f /boot/efi/kernel8.img ] &&
+	  mv /boot/efi/{kernel8.img,uboot-$uboot.bin}
+	[ -f /boot/efi/kernel7.img ] &&
+	  mv /boot/efi/{kernel7.img,uboot-$uboot.bin}
+done
+
+rm -f /boot/efi/config.txt
+
+[ "$GLOBAL_ARCH" = aarch64 ] && \
+	echo "arm_64bit=1" > /boot/efi/config.txt
+
+cat >> /boot/efi/config.txt <<EOF
+enable_uart=1
+disable_overscan=1
+dtparam=audio=on
+
+[pi3]
+kernel=uboot-rpi_3.bin
+# dtoverlay=vc4-kms-v3d
+
+[pi4]
+kernel=uboot-rpi_4.bin
+dtoverlay=vc4-fkms-v3d
+
+[all]
+EOF
+
+[ "$GLOBAL_ARCH" = armh ] && \
+	sed -i 's/.bin/_32b.bin/g' /boot/efi/config.txt
+
+# Enable bootloading without u-boot
+sh -x rpi4-boot-nouboot $kflavour
+
+exit 0
--- a/features.in/armh-mcom02/README
+++ b/features.in/armh-mcom02/README
@@ -0,0 +1,2 @@
+Фича предназначена для обеспечения поддержки процессорного модуля
+"ЭЛВИС Салют ЭЛ24ПМ2".  Подробнее: http://altlinux.org/mcom02
--- a/features.in/armh-mcom02/config.mk
+++ b/features.in/armh-mcom02/config.mk
@@ -0,0 +1,15 @@
+
+ifeq (,$(filter-out armh,$(ARCH)))
+use/armh-mcom02: use/bootloader/uboot use/tty/S0 use/no-sleep
+	@$(call add_feature)
+	@$(call set,KFLAVOURS,mcom02)
+	@$(call add,THE_PACKAGES,u-boot-mcom02-firmware-tools u-boot-mcom02)
+	@$(call add,THE_PACKAGES,extlinux-fdtdir-cleanup-filetrigger)
+
+use/armh-mcom02/x11: use/armh-mcom02
+	@$(call add,THE_PACKAGES,xorg-drv-fbturbo)
+
+use/armh-mcom02/mali: use/armh-mcom02/x11
+	@$(call add,THE_KMODULES,mali)
+	@$(call add,THE_PACKAGES,libmali-mcom02)
+endif
--- a/features.in/armh-mcom02/image-scripts.d/01-uboot-prepare
+++ b/features.in/armh-mcom02/image-scripts.d/01-uboot-prepare
@@ -0,0 +1,15 @@
+#!/bin/sh
+
+# Rewrite extlinux.conf
+mkdir -p /boot/extlinux
+cat > /boot/extlinux/extlinux.conf << EOF
+menu title ALT Boot Options
+
+default linux
+timeout 20
+
+label linux
+	kernel /boot/vmlinuz
+	initrd /boot/initrd.img
+	append root=LABEL=ROOT ro console=ttyS0,115200 video=HDMI:1920x1080
+EOF
--- a/features.in/armh-mcom02/image-scripts.d/50-alsa-set-initial-options-ports
+++ b/features.in/armh-mcom02/image-scripts.d/50-alsa-set-initial-options-ports
@@ -0,0 +1,6 @@
+#!/bin/sh -efu
+
+[ -f /etc/firsttime.d/alsa-set-initial-options ] &&
+	sed -i '/snd-seq-midi/d' /etc/firsttime.d/alsa-set-initial-options
+
+exit 0
--- a/features.in/armh-mcom02/image-scripts.d/90-fbturbo
+++ b/features.in/armh-mcom02/image-scripts.d/90-fbturbo
@@ -0,0 +1,13 @@
+#!/bin/sh -x
+
+[ -d /etc/X11/xorg.conf.d ] || exit 0
+cat > /etc/X11/xorg.conf.d/10-monitor.conf << EOF
+Section "Monitor"
+    Identifier "Monitor0"
+EndSection
+
+Section "Device"
+    Identifier "Card0"
+    Driver "fbturbo"
+EndSection
+EOF
--- a/features.in/armh-mcom02/image-scripts.d/99-extlinux-conf-fix
+++ b/features.in/armh-mcom02/image-scripts.d/99-extlinux-conf-fix
@@ -0,0 +1,4 @@
+#!/bin/sh
+
+# Drop fdtdir PATH
+sed -i '/fdtdir/d' /boot/extlinux/extlinux.conf
--- a/features.in/armh/config.mk
+++ b/features.in/armh/config.mk
@@ -1,2 +1,2 @@
-use/armh: use/control/sudo-su
+use/armh: use/control/sudo-su use/net-dns/google
 	@$(call add_feature)
--- a/features.in/armh/rootfs/image-scripts.d/50-network
+++ b/features.in/armh/rootfs/image-scripts.d/50-network
@@ -1,40 +0,0 @@
-#!/bin/sh
-
-#     DESCRIPTION
-#
-# Setup network settings
-# 1. Truncate /etc/resolv.conf
-# 2. Init /etc/hosts with "127.0.0.1 localhost"
-# 3. Set hostname, domainname
-# 4. Set defaults for NetworkManager.
-
-
-#     REQUIRES
-#
-# Nothing
-
-
-#     INFO
-# At startup time hostname may be changed by live-hostname package.
-
-. shell-config
-
-NAME="init3-network"
-
-verbose()
-{
-    if [ -n "$GLOBAL_VERBOSE" ]; then
-        echo "HOOK: $NAME: $@"
-    fi
-}
-
-verbose "has started"
-
-DOMAINNAME="localdomain"
-HOSTNAME="localhost.localdomain"
-
-verbose "Init /etc/hosts with 127.0.0.1 localhost"
-echo "127.0.0.1 localhost localhost.localdomain" > /etc/hosts
-
-verbose "Truncate /etc/resolv.conf"
-echo nameserver 8.8.8.8 >/etc/resolv.conf
--- a/features.in/bootloader/README
+++ b/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-образы.

 Обратите внимание: в процессе конфигурирования дистрибутива
 "переключение" загрузчика может происходить только в одну сторону
--- a/features.in/bootloader/config.mk
+++ b/features.in/bootloader/config.mk
@@ -4,9 +4,47 @@
 #       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
+ifneq (,$(filter-out e2k%,$(ARCH)))
+	@$(call add_feature)
+	@$(call try,BASE_BOOTLOADER,grub)
+	@$(call xport,BASE_BOOTLOADER)
+	@$(call add,BASE_LISTS,$$(BASE_BOOTLOADER))
+	@$(call xport,BASE_BOOTARGS)
+ifeq (distro,$(IMAGE_CLASS))
+	@$(call add,BASE_PACKAGES,installer-feature-bootloader-$$(BASE_BOOTLOADER))
+	@$(call add,PINNED_PACKAGES,alterator-$$(BASE_BOOTLOADER))
+	@$(call add,PINNED_PACKAGES,installer-bootloader-$$(BASE_BOOTLOADER)-stage2)
+endif
+endif
+
+ifeq (,$(filter-out i586 x86_64,$(ARCH)))
+use/bootloader/lilo: \
+	use/bootloader/%: use/bootloader
 	@$(call set,BASE_BOOTLOADER,$*)
+else
+use/bootloader/lilo: ; @:
+endif
+
+ifeq (,$(filter-out $(GRUB_ARCHES),$(ARCH)))
+use/bootloader/grub: \
+	use/bootloader/%: use/bootloader
+	@$(call set,BASE_BOOTLOADER,$*)
+else
+use/bootloader/grub: ; @:
+endif
+
+use/bootloader/uboot: use/bootloader use/uboot
+	@$(call set,BASE_BOOTLOADER,uboot)
+
+use/bootloader/live: use/bootloader; @:
+ifneq (,$(filter-out e2k%,$(ARCH)))
+	@$(call add,LIVE_PACKAGES,alterator-$$(BASE_BOOTLOADER))
+endif
+
+use/bootloader/os-prober: use/bootloader
+	@$(call add,BASE_PACKAGES,os-prober)
--- a/features.in/bootloader/rootfs/image-scripts.d/50-bootargs
+++ b/features.in/bootloader/rootfs/image-scripts.d/50-bootargs
@@ -0,0 +1,9 @@
+#!/bin/sh -eu
+
+if [ -n "${GLOBAL_BASE_BOOTARGS-}" ]; then
+    if [ -s /etc/sysconfig/grub2 ]; then
+        sed -Ei \
+            "s/(GRUB_CMDLINE_LINUX_DEFAULT=)(.*)(['\"])/\1\2 $GLOBAL_BASE_BOOTARGS\3/" \
+            /etc/sysconfig/grub2
+    fi
+fi
--- a/features.in/branding/config.mk
+++ b/features.in/branding/config.mk
@@ -2,13 +2,29 @@
 use/branding:
 	@$(call add_feature)

+# license notes, if any
+use/branding/notes: use/branding
+ifneq (,$(filter-out e2k%,$(ARCH)))
+	@$(call add,THE_BRANDING,notes)
+endif
+
 # NB: not every distro might have all the branding of its own
-use/branding/full: use/branding use/syslinux/ui/gfxboot
-	@$(call add,THE_BRANDING,alterator bootloader bootsplash graphics)
-	@$(call add,THE_BRANDING,indexhtml notes slideshow)
+use/branding/full: use/branding/notes use/syslinux/ui/gfxboot \
+	use/grub/ui/gfxboot
+	@$(call add,THE_BRANDING,alterator graphics)
+	@$(call add,THE_BRANDING,indexhtml slideshow)
+ifeq (,$(filter-out i586 x86_64 aarch64,$(ARCH)))
+	@$(call add,THE_BRANDING,bootloader)
+endif
+ifeq (,$(filter-out i586 x86_64,$(ARCH)))
+	@$(call add,THE_BRANDING,bootsplash)
+endif

 use/branding/complete: use/branding/full use/plymouth/full
-	@$(call add,INSTALL2_BRANDING,notes slideshow)
+	@$(call add,INSTALL2_BRANDING,slideshow)
+ifneq (,$(filter-out e2k%,$(ARCH)))
+	@$(call add,INSTALL2_BRANDING,notes)
+endif

 # http://altlinux.org/branding/slideshow
 use/branding/slideshow/once: use/branding
--- a/features.in/branding/lib/20-branding.mk
+++ b/features.in/branding/lib/20-branding.mk
@@ -2,5 +2,8 @@

 DOT_BASE += $(call branding,$(THE_BRANDING))

+# needed for refind only
+ifeq (,$(filter-out x86_64,$(ARCH)))
 CHROOT_PACKAGES_REGEXP += $(call branding,bootloader)
 CHROOT_PACKAGES += ImageMagick-tools
+endif
--- a/features.in/browser/config.mk
+++ b/features.in/browser/config.mk
@@ -1,27 +1,39 @@
 use/browser:
 	@$(call add_feature)
-	@$(call add,THE_PACKAGES_REGEXP,$$(THE_BROWSER))
-	@$(call try,THE_BROWSER,webclient)	# fallback
+	@$(call add,THE_PACKAGES,$$(THE_BROWSER))
+	@$(call try,THE_BROWSER,elinks)	# X11-less fallback
+
+# amend as neccessary; firefox is treated separately due to its flavours
+BROWSERS_i586 = chromium seamonkey netsurf epiphany falkon otter-browser \
+		elinks links2
+BROWSERS_x86_64 := $(BROWSERS_i586)
+BROWSERS_ppc64el = netsurf epiphany falkon otter-browser elinks links2
+BROWSERS_aarch64 = chromium netsurf epiphany falkon otter-browser elinks links2
+BROWSERS_armh = netsurf epiphany falkon otter-browser elinks links2
+BROWSERS_mipsel = chromium seamonkey netsurf epiphany falkon otter-browser \
+		  elinks links2
+BROWSERS_riscv64 = netsurf elinks
+BROWSERS_e2k = netsurf elinks links2
+BROWSERS_e2kv4 := $(BROWSERS_e2k)
+BROWSERS := $(BROWSERS_$(ARCH))
+
+$(addprefix use/browser/,$(BROWSERS)): use/browser/%: use/browser
+	@$(call set,THE_BROWSER,$*)
+
+ifneq (,$(filter-out x86_64 i586 aarch64 mipsel,$(ARCH)))
+use/browser/chromium: use/browser/firefox use/browser/firefox/esr; @:
+endif
+
+ifeq (,$(filter-out e2k%,$(ARCH)))
+use/browser/falkon: use/browser/firefox use/browser/firefox/esr; @:
+endif

 # support both firefox and firefox-esr
 use/browser/firefox: use/browser
 	@$(call set,THE_BROWSER,firefox$$(FX_FLAVOUR))

-use/browser/seamonkey \
-	use/browser/chromium use/browser/epiphany \
-	use/browser/qupzilla use/browser/rekonq \
-	use/browser/elinks use/browser/links2: \
-	use/browser/%: use/browser
-	@$(call set,THE_BROWSER,$*)
-
-use/browser/konqueror: use/browser
-	@$(call set,THE_BROWSER,kdebase-konqueror)
-
-use/browser/konqueror4: use/browser
-	@$(call set,THE_BROWSER,kde4base-konqueror)
-
 # the complete lack of dependencies is intentional
-use/browser/firefox/esr: use/browser
+use/browser/firefox/esr:
 	@$(call set,FX_FLAVOUR,-esr)

 use/browser/firefox/h264: use/browser/firefox
@@ -33,15 +45,10 @@ 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)

--- a/features.in/build-distro/README
+++ b/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.
--- a/features.in/build-distro/install2/image-scripts.d/86-all-groups
+++ b/features.in/build-distro/install2/image-scripts.d/86-all-groups
@@ -0,0 +1,24 @@
+#!/bin/sh -efu
+### Ensure that all the necesary system groups exist
+
+SCRIPT="/usr/share/install2/postinstall.d/86-all-groups"
+
+cat > "$SCRIPT" << EOF
+#!/bin/sh -efu
+
+. install2-init-functions
+
+# don't override the script start message on the same line
+echo "Ensuring that all the necesary system groups exist"
+
+echo '/usr/share/install3/default-groups
+/etc/alterator/auth/user-groups
+/etc/alterator/auth/admin-groups' \
+| while read LIST; do
+    [ -s "\$destdir\$LIST" ] || continue
+    for GROUP in \$(cat "\$destdir\$LIST"); do
+        exec_chroot groupadd -r "\$GROUP" &>/dev/null ||:
+    done
+done
+EOF
+chmod +x "$SCRIPT"
--- a/features.in/build-distro/lib/90-build-distro.mk
+++ b/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,19 +9,50 @@ 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 aarch64,$(ARCH)))
+BOOT_TYPE := grubaa64boot
+endif
+ifeq (,$(filter-out ppc64le,$(ARCH)))
+BOOT_TYPE := ieee1275boot
+endif
+endif

-all: $(GLOBAL_DEBUG) prep copy-subdirs copy-tree run-scripts pack-image \
+all: | $(GLOBAL_DEBUG) prep copy-subdirs copy-tree run-scripts pack-image \
 	postprocess $(GLOBAL_CLEAN_WORKDIR)

-prep: $(GLOBAL_DEBUG) dot-disk $(WHATEVER)
+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 \
--- a/features.in/build-distro/rootfs/image-scripts.d/30-all-groups
+++ b/features.in/build-distro/rootfs/image-scripts.d/30-all-groups
@@ -0,0 +1,13 @@
+#!/bin/sh -eu
+
+# ensure that all the necesary system groups exist
+
+echo '/usr/share/install3/default-groups
+/etc/alterator/auth/user-groups
+/etc/alterator/auth/admin-groups' \
+| while read LIST; do
+    [ -s "$LIST" ] || continue
+    for GROUP in $(cat "$LIST"); do
+        groupadd -r "$GROUP" &>/dev/null ||:
+    done
+done
--- a/features.in/build-ve/image-scripts.d/03-services
+++ b/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
 :
--- a/features.in/build-ve/image-scripts.d/08-resolv
+++ b/features.in/build-ve/image-scripts.d/08-resolv
@@ -1,9 +0,0 @@
-#!/bin/sh
-# by default hasher copy resolv.conf and /etc/hosts from host system
-# we need to change it to useful defaults
-
-echo 'nameserver 8.8.8.8' > /etc/resolv.conf
-echo 'nameserver 8.8.4.4' > /etc/resolv.conf
-#echo 'nameserver 2001:4860:4860::8888' > /etc/resolv.conf
-#echo 'nameserver 2001:4860:4860::8844' > /etc/resolv.conf
-echo '127.0.0.1 localhost.localdomain localhost' > /etc/hosts
--- a/features.in/build-ve/lib/90-build-ve.mk
+++ b/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)
--- a/features.in/build-vm/README
+++ b/features.in/build-vm/README
@@ -1,3 +1,6 @@
-Эта фича конфигурирует создание образа виртуальной машины (VM).
+Эта фича конфигурирует создание образа виртуальной машины (VM)
+или тарбола rootfs для использования его на реальном компьютере.
 Дополняет финальную стадию сборки (lib/, image-scripts.d/).
-Требует для работы sudo(8) -- см. тж. doc/vm.txt
+Для создания образа виртуальной машины требуется sudo(8)
+Для создания тарбола sudo не требуется.
+-- см. тж. doc/vm.txt
--- a/features.in/build-vm/config.mk
+++ b/features.in/build-vm/config.mk
@@ -1,3 +1,3 @@
 # hooked from lib/sugar.mk
-use/build-vm: sub/rootfs@/ use/kernel
+use/build-vm: sub/rootfs@/ use/kernel/initrd-setup
 	@$(call add_feature)
--- a/features.in/build-vm/image-scripts.d/03-services
+++ b/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
 :
--- a/features.in/build-vm/image-scripts.d/04-inittab
+++ b/features.in/build-vm/image-scripts.d/04-inittab
@@ -1,4 +0,0 @@
-#!/bin/sh -e
-# we don't need no extra gettys in VMs
-[ -s /etc/inittab ] || exit 0
-sed -i 's,^[3-9]\+:[0-9]\+:respawn:/sbin/mingetty.*,#&,' /etc/inittab
--- a/features.in/build-vm/image-scripts.d/07-kernel
+++ b/features.in/build-vm/image-scripts.d/07-kernel
@@ -1,13 +0,0 @@
-#!/bin/sh
-# predictable file locations make bootloader configuration simple;
-# this script relates to features.in/stage2/stage1/scripts.d/81-make-initfs
-
-kver="$(rpm -qa 'kernel-image*' \
-            --qf '%{installtime} %{version}-%{name}-%{release}\n' \
-        | sort -n \
-        | tail -n 1 \
-        | cut -f 2 -d ' ' \
-        | sed 's/kernel-image-//')"
-
-ln -s vmlinuz-$kver /boot/vmlinuz
-ln -s initrd-$kver.img /boot/initrd.img
--- a/features.in/build-vm/image-scripts.d/17-kernel
+++ b/features.in/build-vm/image-scripts.d/17-kernel
@@ -0,0 +1,45 @@
+#!/bin/sh
+# predictable file locations make bootloader configuration simple;
+# this script relates to features.in/stage2/stage1/scripts.d/81-make-initfs
+
+[ -n "$GLOBAL_KFLAVOURS" ] ||
+  { echo "** KFLAVOURS is empty" >&2; exit 0; }
+
+kver=
+echo $GLOBAL_KFLAVOURS
+for KFLAVOUR in $GLOBAL_KFLAVOURS; do
+	kver+=" $(rpm -qa 'kernel-image*' \
+		--qf '%{version}-%{name}-%{release}\n' \
+	| grep "$KFLAVOUR" \
+	| sed 's/kernel-image-//')"
+done
+
+[ ! -z "${kver#"${kver%%[! ]*}"}" ] ||
+  { echo "** unable to deduce kernel version" >&2; exit 1; }
+
+cd /boot
+
+if [ -n "$GLOBAL_VM_INITRDFEATURES" ]; then
+	for INITRDFEATURE in $GLOBAL_VM_INITRDFEATURES; do
+		echo "FEATURES += $INITRDFEATURE" >> /etc/initrd.mk
+	done
+fi
+
+for KVER in $kver; do
+	make-initrd -N -k "$KVER" AUTODETECT= \
+	  MODULES_TRY_ADD+="$GLOBAL_VM_INITRDMODULES" \
+	  || { echo "** Error: make-initrd failed" >&2; exit 1; }
+done
+
+case "$GLOBAL_ARCH" in
+e2k)
+	kname=image;;
+*)
+	kname=vmlinuz;;
+esac
+
+rm -f $kname initrd.img
+ln -s $kname-$KVER $kname ||:
+ln -s initrd-$KVER.img initrd.img
+
+:
--- a/features.in/build-vm/image-scripts.d/50-fstab
+++ b/features.in/build-vm/image-scripts.d/50-fstab
@@ -0,0 +1,4 @@
+#!/bin/sh
+
+grep -qe "[[:space:]]/[[:space:]]" /etc/fstab ||
+  printf "LABEL=ROOT\t/\t$GLOBAL_VM_FSTYPE\tdefaults\t1 1\n" >> /etc/fstab
--- a/features.in/build-vm/lib/90-build-vm.mk
+++ b/features.in/build-vm/lib/90-build-vm.mk
@@ -7,44 +7,98 @@ IMAGE_PACKAGES = $(DOT_BASE) \
 		 $(THE_PACKAGES) \
 		 $(call list,$(BASE_LISTS) $(THE_LISTS))

+IMAGE_PACKAGES_REGEXP = $(THE_PACKAGES_REGEXP) \
+                        $(BASE_PACKAGES_REGEXP)
+
+ifdef EFI_BOOTLOADER
+VM_BOOTLOADER=$(EFI_BOOTLOADER)
+else
+VM_BOOTLOADER=$(BASE_BOOTLOADER)
+endif
+
 # intermediate chroot archive
 VM_TARBALL := $(IMAGE_OUTDIR)/$(IMAGE_NAME).tar
 VM_RAWDISK := $(IMAGE_OUTDIR)/$(IMAGE_NAME).raw
 VM_FSTYPE ?= ext4
 VM_SIZE ?= 0

+VM_GZIP_COMMAND ?= gzip
+VM_XZ_COMMAND ?= xz -T0
+
+# tavolga
+RECOVERY_LINE ?= Press ENTER to start
+
 check-sudo:
 	@if ! type -t sudo >&/dev/null; then \
 		echo "** error: sudo not available, see doc/vm.txt" >&2; \
+	fi
+
+check-qemu:
+	@if ! type -t qemu-img >&/dev/null; then \
+		echo "** error: qemu-img not available" >&2; \
 		exit 1; \
 	fi

-prepare-image: check-sudo
-	@if ! sudo $(TOPDIR)/bin/tar2fs \
-		"$(VM_TARBALL)" "$(VM_RAWDISK)"  $(VM_SIZE) $(VM_FSTYPE); then \
-		echo "** error: sudo tar2fs failed, see also doc/vm.txt" >&2; \
+tar2fs: check-sudo prepare-tarball-qemu
+	@if [ -x /usr/share/mkimage-profiles/bin/tar2fs ]; then \
+		TOPDIR=/usr/share/mkimage-profiles; \
+	fi; \
+	if ! sudo $$TOPDIR/bin/tar2fs \
+		"$(VM_TARBALL)" "$(VM_RAWDISK)" "$(VM_SIZE)" "$(VM_FSTYPE)" \
+			"$(VM_BOOTLOADER)" "$(ARCH)" "$(VM_PARTTABLE)"; 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;; \
+# copy $(BUILDDIR)/.work/chroot/.host/qemu* into chroot if qemu is used
+prepare-tarball-qemu:
+	@(cd "$(BUILDDIR)/.work/chroot/"; \
+		tar -rf "$(VM_TARBALL)" ./.host/qemu*) ||:
+
+convert-image/tar:
+	mv "$(VM_TARBALL)" "$(IMAGE_OUTPATH)"
+
+convert-image/tar.gz:
+	$(VM_GZIP_COMMAND) < "$(VM_TARBALL)" > "$(IMAGE_OUTPATH)"
+
+convert-image/tar.xz:
+	$(VM_XZ_COMMAND) < "$(VM_TARBALL)" > "$(IMAGE_OUTPATH)"
+
+convert-image/img: tar2fs
+	mv "$(VM_RAWDISK)" "$(IMAGE_OUTPATH)"
+
+convert-image/qcow2 convert-image/qcow2c convert-image/vmdk \
+	convert-image/vdi convert-image/vhd: check-qemu tar2fs
+	@VM_COMPRESS=; \
+	case "$(IMAGE_TYPE)" in \
 	"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; \
-	else \
-		qemu-img convert -O "$$VM_FORMAT" \
-			"$(VM_RAWDISK)" "$(IMAGE_OUTPATH)"; \
-		rm "$(VM_RAWDISK)"; \
-		if [ -z "$(DEBUG)" ]; then rm "$(VM_TARBALL)"; fi; \
-	fi
+	qemu-img convert $$VM_COMPRESS -O "$$VM_FORMAT" \
+		"$(VM_RAWDISK)" "$(IMAGE_OUTPATH)"
+
+# for tavolga
+convert-image/recovery.tar:
+	build-recovery-tar \
+	    --image-name $(IMAGE_NAME) \
+	    --date $(DATE) \
+	    --compress-command '$(VM_GZIP_COMMAND)' \
+	    --rootfs "$(VM_TARBALL)" \
+	    --output "$(IMAGE_OUTPATH)" \
+	    --line '$(RECOVERY_LINE)'
+
+post-convert:
+	@rm -f "$(VM_RAWDISK)"; \
+	if [ "0$(DEBUG)" -le 1 ]; then rm -f "$(VM_TARBALL)"; fi
+
+convert-image: convert-image/$(IMAGE_TYPE) post-convert; @:

 run-image-scripts: GLOBAL_CLEANUP_PACKAGES := $(CLEANUP_PACKAGES)

 # 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)
--- a/Show More
+++ b/Show More
				`@@ -0,0 +1 @@`
				`Настраивает систему для загрузки на плате DBM с SoC BE-M1000 (aarch64).`
				`@@ -0,0 +1 @@`
				`Данная фича определяет то, какая конфигурация apt попадёт в образ.`
				`@@ -0,0 +1,2 @@`
				`Настраивает систему для Raspberry Pi 4`