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

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

.gear/mkimage-profiles.spec

@@ -1,5 +1,5 @@
 Name: mkimage-profiles
-Version: 1.4.3
+Version: 1.3.15
 Release: alt1
 
 Summary: ALT based distribution metaprofile
@@ -8,7 +8,7 @@ Group: Development/Other
 
 Url: http://altlinux.org/m-p
 Source: %name-%version.tar
-Packager: Anton Midyukov <antohami@altlinux.org>
+Packager: Michael Shigorin <mike@altlinux.org>
 
 BuildArch: noarch
 BuildRequires: rsync
@@ -128,50 +128,6 @@ 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@)

.gear/tags/c4e7ad4a898add7e4fee4e3dd0c9e5141924974d

@@ -1,6 +0,0 @@
-object 7295127cdf9588a56a2466e9258605a666c8a96f
-type commit
-tag v1.4.3
-tagger Anton Midyukov <antohami@altlinux.org> 1601014181 +0700
-
-v1.4.3

.gear/tags/c63e94b72fd43f6fa162ed26a9a80570e77d18c0

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

.gear/tags/list

@@ -1 +1 @@
-c4e7ad4a898add7e4fee4e3dd0c9e5141924974d v1.4.3
+c63e94b72fd43f6fa162ed26a9a80570e77d18c0 v1.3.15

bin/tar2fs

@@ -55,13 +55,6 @@ ppc*)
 	BOOTLOADERPARTSIZEM="8"
 	ROOTPART="2"
 	;;
-arm*|aarch64)
-	BLOCKDEV="/dev/sda"
-	EFIPART="1"
-	EFIPARTSIZEM="256"
-	EFIPARTFSTYPE="fat"
-	ROOTPART="2"
-	;;
 *)
 	if [ "$BOOTLOADER" == grub-efi ]; then
 		EFIPART="1"
@@ -356,18 +349,11 @@ 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
+	EXTLINUX_CONF="$ROOTFS/boot/extlinux/extlinux.conf"
+	sed -i "s/LABEL=ROOT/$ROOTDEV/g" "$EXTLINUX_CONF"
 	;;
 lilo)
 	# configure and install bootloader

conf.d/alt-server.mk

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

conf.d/armh.mk

@@ -2,6 +2,12 @@ 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)
 
@@ -16,6 +22,11 @@ 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)
 
@@ -60,6 +71,12 @@ 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)

conf.d/basealt.mk

@@ -1,8 +1,10 @@
 ifeq (distro,$(IMAGE_CLASS))
 
+ifeq (,$(filter-out i586 x86_64,$(ARCH)))
 distro/alt-workstation: workstation_groups_x86 = $(addprefix workstation/,\
 	3rdparty blender clamav cloud-clients freecad \
 	gtk-dictionary kvm smartcard voip-clients)
+endif
 
 distro/alt-workstation: distro/.base +vmguest +wireless +efi \
 	mixin/desktop-installer mixin/alt-workstation \
@@ -13,8 +15,11 @@ distro/alt-workstation: distro/.base +vmguest +wireless +efi \
         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
+        use/domain-client/full use/x11/amdgpu use/x11/lightdm/gtk
+	@$(call add,INSTALL2_PACKAGES,open-iscsi)
+	@$(call add,INSTALL2_PACKAGES,xorg-conf-libinput-touchpad)
+	@$(call add,INSTALL2_PACKAGES,installer-feature-quota-stage2)
+	@$(call add,MAIN_PACKAGES,solaar)
 ifeq (,$(filter-out i586 x86_64,$(ARCH)))
 	@$(call add,MAIN_GROUPS,$(workstation_groups_x86))
 endif
@@ -22,45 +27,58 @@ 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,MAIN_LISTS,workstation/extras)
+	@$(call add,MAIN_LISTS,$(call tags,xorg vaapi))
+	@$(call add,THE_LISTS,$(call tags,archive extra))
+	@$(call add,THE_LISTS,$(call tags,mobile mate))
+	@$(call add,LIVE_PACKAGES,installer-feature-quota-stage2)
+	@$(call add,LIVE_PACKAGES,livecd-installer-features)
+	@$(call add,LIVE_PACKAGES,installer-feature-lightdm-stage3)
 	@$(call add,RESCUE_BOOTARGS,nomodeset vga=0)
 	@$(call add,EFI_BOOTARGS,lang=ru_RU)
 
-endif	# distro
+ifeq (,$(filter-out e2k%,$(ARCH)))
+distro/.alt-workstation-base: distro/.e2k-installer mixin/alt-workstation
+	@$(call add,THE_PACKAGES,setup-mate-terminal)
+	@$(call add,THE_PACKAGES,setup-mate-nocomposite)
+	@$(call add,THE_PACKAGES,setup-libgl-dri3-disable)
+	@$(call add,THE_PACKAGES,setup-pulseaudio-plain-module-detect)
+	@$(call add,THE_PACKAGES,firmware-linux)
+	@$(call add,THE_BRANDING,graphics)
+	@$(call set,META_APP_ID,ALT Workstation/$(ARCH))
+
+distro/.alt-workstation: distro/.alt-workstation-base use/x11/lightdm/gtk; @:
+
+distro/alt-workstation-101: distro/.alt-workstation use/e2k/101
+	@$(call set,META_VOL_ID,ALT Workstation 101)
+	@$(call add,MAIN_GROUPS,workstation/e101-modesetting)
+	@$(call add,MAIN_GROUPS,workstation/e101-mga2)
+
+distro/alt-workstation-401: distro/.alt-workstation use/e2k/401; @:
+	@$(call set,META_VOL_ID,ALT Workstation 401)
+
+# avoid lightdm; NB: mate-settings pulls it in (hence the dummy)
+distro/alt-workstation-801: distro/.alt-workstation-base use/e2k/install2/801
+	@$(call set,META_VOL_ID,ALT Workstation 801)
+	@$(call add,MAIN_GROUPS,workstation/e801-1seat workstation/e801-2seat)
+	@$(call add,INSTALL2_PACKAGES,installer-feature-e2k-801-dualseat)
+endif
+
+endif
 
 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

conf.d/e2k.mk

@@ -51,14 +51,21 @@ ifeq (distro,$(IMAGE_CLASS))
 distro/.e2k-rescue: distro/.base mixin/e2k-base use/rescue/.base +net-eth
 	@$(call set,META_VOL_ID,ALT Rescue for Elbrus)
 
+distro/e2k-101-rescue: distro/.e2k-rescue
+	@$(call add,KFLAVOURS,elbrus-1cp)
+
+# NB: this one is NOT suited for a particular processor yet!
+# (that's to be done downstream)
 distro/.e2k-installer-base: distro/.base mixin/e2k-base \
-	use/install2 use/install2/packages use/e2k \
+	use/install2 use/install2/packages use/e2k/install2 \
 	use/volumes/regular use/net-ssh +net-eth
 	@$(call set,INSTALLER,altlinux-generic)
 	@$(call set,META_PUBLISHER,BaseALT Ltd)
 	@$(call set,META_VOL_SET,ALT)
 	@$(call set,META_VOL_ID,ALT for Elbrus)
 	@$(call set,META_APP_ID,ALT/$(ARCH))
+	@$(call add,INSTALL2_PACKAGES,agetty)
+	@$(call add,INSTALL2_PACKAGES,ifplugd) ### for net-eth link status
 	@$(call add,INSTALL2_BRANDING,alterator)
 	@$(call add,THE_PACKAGES,agetty gpm fdisk parted smartmontools pv sshfs)
 	@$(call add,THE_PACKAGES,make-initrd dhcpcd hdparm nfs-clients vim-console)
@@ -71,4 +78,28 @@ distro/.e2k-installer-base: distro/.base mixin/e2k-base \
 distro/.e2k-installer-sysv: distro/.e2k-installer-base +sysvinit; @:
 distro/.e2k-installer: distro/.e2k-installer-base +systemd; @:
 
+distro/e2k-801-builder: distro/.e2k-installer-sysv \
+	use/e2k/install2/801 use/dev/groups/builder; @:
+
+distro/alt-jeos-401: distro/.e2k-installer-sysv use/e2k/install2/401
+	@$(call set,META_VOL_ID,ALT JeOS 401)
+
+distro/alt-jeos-801: distro/.e2k-installer-sysv use/e2k/install2/801
+	@$(call set,META_VOL_ID,ALT JeOS 801)
+
+distro/alt-jeos-101: distro/.e2k-installer-sysv use/e2k/install2/101
+	@$(call set,META_VOL_ID,ALT JeOS 101)
+
+distro/e2k-101-mate: distro/.e2k-installer use/e2k/101 \
+	mixin/e2k-desktop mixin/e2k-mate
+	@$(call add,THE_PACKAGES,LibreOffice-integrated LibreOffice-gnome)
+	@$(call add,THE_PACKAGES,LibreOffice-langpack-ru)
+
+distro/e2k-4xx-installer: distro/.e2k-installer-sysv use/e2k/install2/4xx
+	@$(call set,INSTALLER,altlinux-server)
+	@$(call add,BASE_PACKAGES,make-initrd-mdadm make-initrd-lvm)
+
+distro/.e2k-installer-mate: distro/.e2k-installer \
+	mixin/e2k-desktop mixin/e2k-mate; @:
+
 endif

conf.d/education.mk

@@ -4,14 +4,9 @@ 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 \
+	use/x11/xorg 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
+	use/xdg-user-dirs/deep
 	@$(call set,BRANDING,alt-education)
 	@$(call add,THE_BRANDING,indexhtml)
 	@$(call add,THE_BRANDING,menu xfce-settings system-settings)
@@ -22,36 +17,30 @@ mixin/education: use/kernel use/firmware \
 	@$(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,usbutils pv lftp links2 openssh-server xinput xorg-drv-libinput)
 	@$(call add,THE_PACKAGES,net-tools fdisk gdisk parted partclone)
 	@$(call add,THE_PACKAGES,disable-usb-autosuspend)
 	@$(call add,THE_LISTS,$(call tags,base regular))
 
 ifeq (distro,$(IMAGE_CLASS))
 
-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: \
+distro/education: distro/alt-education; @:
+distro/alt-education: distro/.installer mixin/education \
 	use/memtest \
 	use/branding/complete \
+	use/live/install use/live/suspend \
+	use/live/repo use/live/x11 use/live/rw \
 	use/install2/vnc use/install2/full \
 	use/l10n/default/ru_RU +vmguest \
 	+efi use/efi/refind use/efi/shell \
 	use/isohybrid use/luks \
-	use/install2/fonts \
 	+plymouth +wireless \
+	use/install2/fonts \
 	use/stage2/fs use/stage2/hid use/stage2/md \
 	use/stage2/mmc use/stage2/net use/stage2/net-nfs \
 	use/stage2/rtc use/stage2/sbc use/stage2/scsi use/stage2/usb
 	@$(call set,INSTALLER,education)
-	@$(call set,META_VOL_ID,ALT Education 9.1 $(ARCH))
+	@$(call set,META_VOL_ID,ALT Education 9.0 $(ARCH))
 	@$(call set,META_PUBLISHER,BaseALT Ltd)
 	@$(call set,META_APP_ID,$(DISTRO_VERSION) $(ARCH))
 	@$(call set,META_VOL_SET,ALT)
@@ -63,79 +52,50 @@ mixin/education-installer: \
 	@$(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%
+	@$(call add,MAIN_GROUPS,education/teacher)
+	@$(call add,MAIN_GROUPS,education/kde5)
+	@$(call add,MAIN_GROUPS,education/server-apps-edu)
 ifeq (,$(filter-out i586 x86_64,$(ARCH)))
 	@$(call set,KFLAVOURS,un-def std-def)
-	@$(call add,MAIN_PACKAGES,kernel-headers-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,MAIN_PACKAGES,kernel-headers-std-def kernel-headers-modules-std-def)
+	@$(call add,MAIN_PACKAGES,kernel-headers-un-def kernel-headers-modules-un-def)
 	@$(call add,THE_KMODULES,virtualbox)
 	@$(call add,THE_KMODULES,nvidia)
 	@$(call add,THE_KMODULES,lsadrv bbswitch)
 	@$(call add,THE_KMODULES,staging)
 	@$(call add,MAIN_KMODULES,bbswitch)
-	@$(call add,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
+	@$(call add,THE_PACKAGES,bluez pulseaudio-bluez)
+	@$(call add,THE_PACKAGES,alterator-fbi)
+	@$(call add,THE_PACKAGES,alt-rootfs-installer)
+	@$(call add,BASE_PACKAGES,os-prober)
+	@$(call add,BASE_PACKAGES,guest-account)
+	@$(call add,BASE_PACKAGES,nextcloud-client)
+	@$(call add,MAIN_PACKAGES,iperf3)
+	@$(call add,MAIN_PACKAGES,stellarium)
+	@$(call add,MAIN_PACKAGES,libreoffice-block-macros)
+	@$(call add,MAIN_PACKAGES,lmms)
+	@$(call set,GLOBAL_LIVE_NO_CLEANUPDB,true)
+	@$(call add,LIVE_PACKAGES,livecd-timezone)
+	@$(call add,LIVE_LISTS,slinux/net-base)
+	@$(call add,LIVE_LISTS,$(call tags,base rescue))
+	@$(call add,STAGE2_PACKAGES,xorg-conf-libinput-touchpad)
+	@$(call add,STAGE2_PACKAGES,chrony)
+	@$(call add,STAGE1_MODLISTS,stage2-mmc)
 endif
 
-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
+endif

conf.d/kworkstation.mk

@@ -1,214 +0,0 @@
-# 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 \

conf.d/live.mk

@@ -13,7 +13,7 @@ distro/rescue-remote: distro/.base use/rescue/base use/stage2/net-eth
 	@$(call add,RESCUE_PACKAGES,livecd-net-eth)
 
 distro/syslinux: distro/.boot \
-	use/syslinux/localboot.cfg use/syslinux/ui/vesamenu use/hdt; @:
+	use/syslinux/ui/vesamenu use/hdt; @:
 
 distro/.live-base: distro/.base use/live/base; @:
 distro/.live-x11: distro/.live-base use/live/x11; @:

conf.d/mixin-alt-server.mk

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

conf.d/mixin-basealt.mk

@@ -6,7 +6,7 @@ mixin/alt-workstation-install: workstation_groups = $(addprefix workstation/,\
 	libreoffice mate-usershare pidgin raccess scanning scribus \
 	sound-editing thunderbird vlc freeipa-client)
 
-mixin/alt-workstation: +systemd +systemd-optimal +pulse +nm +power \
+mixin/alt-workstation: +systemd +systemd-optimal +pulse +nm \
 	use/kernel/net use/l10n/default/ru_RU \
 	use/x11/xorg use/x11-autostart use/x11/gtk/nm \
 	use/apt-conf/branch use/volumes/regular \
@@ -17,13 +17,10 @@ mixin/alt-workstation: +systemd +systemd-optimal +pulse +nm +power \
 	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
+	use/browser/firefox use/browser/firefox/esr
 	@$(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)
@@ -35,8 +32,9 @@ mixin/alt-workstation: +systemd +systemd-optimal +pulse +nm +power \
 	@$(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,CLEANUP_PACKAGES,xterm)
+	@$(call set,GLOBAL_LIVE_NO_CLEANUPDB,true)
 	@$(call add,CONTROL,xdg-user-dirs:enabled)
 	@$(call add,SERVICES_DISABLE,sshd)
 	@$(call add,SERVICES_DISABLE,auditd)
@@ -61,15 +59,5 @@ mixin/alt-workstation-install: +installer \
 	@$(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))

conf.d/mixin.mk

@@ -17,7 +17,7 @@ mixin/e2k-desktop: use/e2k/x11 use/l10n/default/ru_RU \
 	@$(call add,THE_PACKAGES,fonts-bitmap-terminus)
 
 mixin/e2k-livecd-install: use/e2k/x11
-	@$(call add,THE_PACKAGES,livecd-install)
+	@$(call add,THE_PACKAGES,livecd-install alterator-notes)
 	@$(call add,THE_PACKAGES,fdisk hdparm rsync openssh vim-console)
 	@$(call add,THE_PACKAGES,apt-repo)
 
@@ -48,13 +48,11 @@ mixin/regular-x11: use/luks use/volumes/regular \
 	@$(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
+mixin/regular-desktop: use/x11/xorg +alsa use/xdg-user-dirs use/l10n \
+	use/fonts/otf/adobe use/fonts/otf/mozilla use/net-eth
+	@$(call add,THE_PACKAGES,pam-limits-desktop beesu polkit)
+	@$(call add,THE_PACKAGES,alterator-notes dvd+rw-tools)
+	@$(call add,THE_BRANDING,alterator graphics indexhtml notes)
 	@$(call add,THE_PACKAGES,$$(THE_IMAGEWRITER))
 	@$(call set,THE_IMAGEWRITER,altmediawriter)
 	@$(call add,THE_PACKAGES,upower bluez udev-rules-rfkill-uaccess)
@@ -89,6 +87,7 @@ mixin/regular-cinnamon: use/x11/cinnamon use/x11/lightdm/slick +nm-gtk \
 mixin/regular-gnome3: use/x11/gnome3 use/fonts/ttf/redhat +nm-gtk
 	@$(call add,THE_PACKAGES,gnome3-regular xcalib templates)
 	@$(call add,THE_PACKAGES,chrome-gnome-shell)
+	@$(call add,THE_PACKAGES,firefox-gnome_shell_integration)
 	@$(call add,THE_PACKAGES,gnome-software-disable-updates)
 
 mixin/regular-kde5: use/x11/kde5 use/browser/falkon \
@@ -144,7 +143,6 @@ mixin/regular-rescue: use/rescue use/isohybrid use/luks use/branding \
 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

conf.d/p9.mk

@@ -52,16 +52,14 @@ vm/alt-p9-jeos-systemd vm/alt-p9-jeos-sysv vm/alt-p9-builder \
 	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-jeos-systemd-rpi4 vm/alt-p9-jeos-sysv-rpi4 \
+	vm/alt-p9-lxde-rpi4 vm/alt-p9-lxqt-rpi4 \
+	vm/alt-p9-mate-rpi4 vm/alt-p9-xfce-rpi4: \
+	vm/alt-p9-%-rpi4: vm/regular-%-rpi4 mixin/p9; @:
+
 vm/alt-p9-cinnamon-tegra vm/alt-p9-kde5-tegra \
-	vm/alt-p9-lxqt-tegra \
+	vm/alt-p9-lxde-tegra vm/alt-p9-lxqt-tegra \
 	vm/alt-p9-mate-tegra vm/alt-p9-xfce-tegra: \
 	vm/alt-p9-%-tegra: vm/regular-%-tegra mixin/p9; @:
 
@@ -79,25 +77,24 @@ 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/tavolga-alt-p9-jeos-systemd vm/tavolga-alt-p9-jeos-sysv \
+	vm/tavolga-alt-p9-builder: \
+	vm/tavolga-alt-p9-%: vm/tavolga-regular-% mixin/p9; @:
 
-vm/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/tavolga-alt-p9-lxde vm/tavolga-alt-p9-lxqt \
+	vm/tavolga-alt-p9-mate vm/tavolga-alt-p9-xfce \
+	vm/tavolga-alt-p9-icewm-sysv: \
+	vm/tavolga-alt-p9-%: vm/tavolga-regular-% mixin/p9; @:
 
-vm/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/bfk3-alt-p9-jeos-systemd vm/bfk3-alt-p9-jeos-sysv \
+	vm/bfk3-alt-p9-builder: \
+	vm/bfk3-alt-p9-%: vm/bfk3-regular-% mixin/p9; @:
 
-vm/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; @:
+vm/bfk3-alt-p9-lxde vm/bfk3-alt-p9-lxqt vm/bfk3-alt-p9-mate \
+	vm/bfk3-alt-p9-xfce vm/bfk3-alt-p9-icewm-sysv: \
+	vm/bfk3-alt-p9-%: vm/bfk3-regular-% mixin/p9; @:
 endif
 
 endif

conf.d/regular-vm.mk

@@ -2,42 +2,30 @@ ifeq (vm,$(IMAGE_CLASS))
 
 ifeq (,$(filter-out armh aarch64,$(ARCH)))
 mixin/vm-archdep: use/bootloader/uboot use/no-sleep
+	@$(call set,KFLAVOURS,mp lts)
 else
 ifeq (,$(filter-out mipsel,$(ARCH)))
 mixin/vm-archdep: use/tty/S0
 	@$(call set,KFLAVOURS,un-malta)
 else
-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)
+	@$(call add,THE_LISTS,$(call tags,base regular))
 
 mixin/regular-vm-jeos: mixin/regular-vm-base use/deflogin/root
 	@$(call add,DEFAULT_SERVICES_ENABLE,getty@tty1)
 
-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)
@@ -55,13 +43,11 @@ vm/.regular-gtk: vm/.regular-desktop use/x11/lightdm/gtk
 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)
+	mixin/regular-vm-jeos mixin/vm-archdep; @:
 
 vm/regular-jeos-sysv: vm/net mixin/regular-vm-jeos mixin/vm-archdep +power; @:
 
-vm/regular-builder: vm/regular-jeos-sysv mixin/regular-builder
-	@$(call set,VM_SIZE,10737418240)
+vm/regular-builder: vm/regular-jeos-sysv mixin/regular-builder; @:
 
 vm/regular-icewm-sysv: vm/.regular-desktop-sysv mixin/regular-icewm \
 	mixin/vm-archdep; @:
@@ -77,33 +63,27 @@ vm/regular-mate: vm/.regular-gtk mixin/mate-base mixin/vm-archdep
 
 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)))
+# Raspberry Pi 4
+vm/regular-jeos-systemd-rpi4: vm/systemd-net mixin/regular-vm-jeos \
+	use/aarch64-rpi4; @:
+
+vm/regular-jeos-sysv-rpi4: vm/net mixin/regular-vm-jeos \
+	use/aarch64-rpi4 +power; @:
+
+vm/regular-lxde-rpi4: vm/.regular-gtk mixin/regular-lxde use/aarch64-rpi4; @:
+
+vm/regular-lxqt-rpi4: vm/.regular-gtk mixin/regular-lxqt use/aarch64-rpi4; @:
+
+vm/regular-mate-rpi4: vm/.regular-gtk mixin/regular-mate use/aarch64-rpi4; @:
+
+vm/regular-xfce-rpi4: vm/.regular-gtk mixin/regular-xfce use/aarch64-rpi4; @:
+
 # Nvidia Tegra (Jetson Nano only)
 vm/regular-cinnamon-tegra: vm/.regular-gtk mixin/regular-cinnamon \
 	use/x11/lightdm/slick use/aarch64-tegra; @:
@@ -154,60 +134,59 @@ 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 \
+vm/tavolga-regular-jeos-systemd: vm/systemd-net mixin/regular-vm-jeos \
 	use/mipsel-mitx; @:
 
-vm/regular-jeos-sysv-tavolga: vm/net mixin/regular-vm-jeos \
+vm/tavolga-regular-jeos-sysv: vm/net mixin/regular-vm-jeos \
 	use/mipsel-mitx +power; @:
 
-vm/regular-builder-tavolga: vm/regular-jeos-sysv-tavolga \
+vm/tavolga-regular-builder: vm/tavolga-regular-jeos-sysv \
 	mixin/regular-builder; @:
 
-vm/regular-icewm-sysv-tavolga: vm/.regular-desktop-sysv mixin/regular-icewm \
+vm/tavolga-regular-icewm-sysv: vm/.regular-desktop-sysv mixin/regular-icewm \
 	use/mipsel-mitx/x11; @:
 
-vm/regular-lxde-tavolga: vm/.regular-gtk mixin/regular-lxde \
+vm/tavolga-regular-lxde: vm/.regular-gtk mixin/regular-lxde \
 	use/mipsel-mitx/x11; @:
 
-vm/regular-lxqt-tavolga: vm/.regular-gtk mixin/regular-lxqt \
+vm/tavolga-regular-lxqt: vm/.regular-gtk mixin/regular-lxqt \
 	use/mipsel-mitx/x11; @:
 
-vm/regular-mate-tavolga: vm/.regular-gtk mixin/regular-mate \
+vm/tavolga-regular-mate: 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 \
+vm/tavolga-regular-xfce: 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 \
+vm/bfk3-regular-jeos-systemd: vm/systemd-net mixin/regular-vm-jeos \
 	use/mipsel-bfk3; @:
 
-vm/regular-jeos-sysv-bfk3: vm/net mixin/regular-vm-jeos \
+vm/bfk3-regular-jeos-sysv: vm/net mixin/regular-vm-jeos \
 	use/mipsel-bfk3 +power; @:
 
-vm/regular-builder-bfk3: vm/regular-jeos-sysv-bfk3 \
+vm/bfk3-regular-builder: vm/bfk3-regular-jeos-sysv \
 	mixin/regular-builder; @:
 
-vm/regular-icewm-sysv-bfk3: vm/.regular-desktop-sysv mixin/regular-icewm \
+vm/bfk3-regular-icewm-sysv: vm/.regular-desktop-sysv mixin/regular-icewm \
 	use/mipsel-bfk3/x11; @:
 
-vm/regular-lxde-bfk3: vm/.regular-gtk mixin/regular-lxde \
+vm/bfk3-regular-lxde: vm/.regular-gtk mixin/regular-lxde \
 	use/mipsel-bfk3/x11; @:
 
-vm/regular-lxqt-bfk3: vm/.regular-gtk mixin/regular-lxqt \
+vm/bfk3-regular-lxqt: vm/.regular-gtk mixin/regular-lxqt \
 	use/mipsel-bfk3/x11; @:
 
-vm/regular-mate-bfk3: vm/.regular-gtk mixin/regular-mate \
+vm/bfk3-regular-mate: 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 \
+vm/bfk3-regular-xfce: vm/.regular-gtk mixin/regular-xfce \
 	use/mipsel-bfk3/x11
 	@$(call add,THE_PACKAGES,xfce-reduced-resource)
 endif

conf.d/regular.mk

@@ -67,28 +67,25 @@ distro/.regular-jeos-base: distro/.regular-bare \
 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_KMODULES,guest scsi vboxguest)
 	@$(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
+	use/volumes/jeos use/install2/vmguest use/vmguest/bare \
+	use/ntp/chrony use/bootloader/grub +efi
 	@$(call add,BASE_PACKAGES,nfs-utils gdisk)
 	@$(call add,INSTALL2_PACKAGES,fdisk)
-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)
+	@$(call set,KFLAVOURS,un-def)
+	@$(call add,BASE_KMODULES,staging)
 
 # NB:
 # - stock cleanup is not enough (or installer-common-stage3 deps soaring)
 distro/regular-jeos-sysv: distro/.regular-jeos-full use/cleanup/jeos/full \
-	+sysvinit
-	@$(call add,BASE_PACKAGES,apt-conf-ignore-systemd)
+	+sysvinit; @:
 
 distro/regular-jeos-systemd: distro/.regular-jeos-full \
 	+systemd +systemd-optimal
@@ -114,7 +111,8 @@ distro/.regular-install-x11-full: distro/.regular-install-x11 \
 	@$(call add,MAIN_PACKAGES,anacron man-whatis usb-modeswitch)
 
 distro/regular-icewm-sysv: distro/.regular-gtk-sysv mixin/regular-icewm \
-	use/browser/chromium use/kernel/latest; @:
+	use/browser/chromium
+	@$(call set,KFLAVOURS,un-def)
 
 # wdm can't do autologin so add standalone one for livecd
 distro/regular-wmaker-sysv: distro/.regular-desktop-sysv \
@@ -126,7 +124,8 @@ distro/regular-gnustep-sysv: distro/.regular-desktop-sysv \
 distro/regular-gnustep-systemd: distro/.regular-wm +systemd \
 	mixin/regular-wmaker mixin/regular-gnustep; @:
 
-distro/regular-xfce: distro/.regular-gtk mixin/regular-xfce use/kernel/latest;@:
+distro/regular-xfce: distro/.regular-gtk mixin/regular-xfce; @:
+	@$(call set,KFLAVOURS,un-def)
 
 distro/regular-xfce-sysv: distro/.regular-gtk-sysv mixin/regular-xfce-sysv; @:
 
@@ -145,12 +144,13 @@ distro/regular-enlightenment: distro/.regular-gtk use/x11/enlightenment +power;
 distro/regular-cinnamon: distro/.regular-gtk mixin/regular-cinnamon; @:
 
 # not .regular-gtk due to gdm vs lightdm
-distro/regular-gnome3: distro/.regular-desktop mixin/regular-gnome3 \
-	use/kernel/latest +plymouth
+distro/regular-gnome3: distro/.regular-desktop mixin/regular-gnome3 +plymouth
+	@$(call set,KFLAVOURS,un-def)
 	@$(call add,LIVE_PACKAGES,livecd-gnome3-setup-done)
 	@$(call add,LIVE_PACKAGES,gnome-flashback screenpen)
 
-distro/regular-lxqt: distro/.regular-gtk mixin/regular-lxqt +plymouth
+distro/regular-lxqt: distro/.regular-gtk mixin/regular-lxqt +plymouth \
+	use/browser/falkon
 	@$(call add,THE_LISTS,$(call tags,lxqt desktop))
 
 distro/regular-kde5: distro/.regular-desktop \
@@ -162,7 +162,8 @@ 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
+	use/mediacheck use/stage2/kms +wireless
+	@$(call set,KFLAVOURS,un-def)
 	@$(call add,RESCUE_PACKAGES,gpm livecd-net-eth)
 	@$(call add,RESCUE_LISTS,$(call tags,base bench))
 	@$(call add,RESCUE_LISTS,$(call tags,network security))
@@ -211,8 +212,8 @@ distro/.regular-server-ovz: distro/.regular-server \
 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
+distro/.regular-server-hyperv: distro/.regular-server-managed +systemd
+	@$(call set,KFLAVOURS,un-def)
 	@$(call add,THE_PACKAGES,hyperv-daemons)
 	@$(call add,DEFAULT_SERVICES_DISABLE,bridge smartd)
 	@$(call add,DEFAULT_SERVICES_DISABLE,cpufreq-simple powertop)
@@ -230,7 +231,7 @@ distro/regular-server-pve: distro/.regular-server-base +systemd \
 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/300 use/grub/timeout/30 use/stage2/net-eth
+	use/isohybrid use/syslinux/timeout/30 use/grub/timeout/30 use/stage2/net-eth
 	@$(call add,THE_PACKAGES,ccache cifs-utils wodim)
 
 distro/regular-server-samba4: distro/.regular-server-managed +systemd
@@ -241,7 +242,9 @@ distro/regular-server-samba4: distro/.regular-server-managed +systemd
 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
+	use/lxc/lxd use/tty/S0 \
+	use/init/systemd/multiuser
+	@$(call set,KFLAVOURS,un-def)
 	@$(call add,DEFAULT_SERVICES_ENABLE,sshd)
 	@$(call add,DEFAULT_SERVICES_ENABLE,lxd-startup lxd-bridge lxcfs cgmanager)
 	@$(call add,DEFAULT_SERVICES_ENABLE,getty@tty1 getty@ttyS0)

conf.d/server-v.mk

@@ -33,7 +33,7 @@ distro/server-v: openstack = $(addprefix server-v/openstack/,\
 # storage
 
 distro/server-v: container = $(addprefix server-v/,\
-	docker kubernetes-master kubernetes-node podman lxd)
+	docker kubernetes podman lxd)
 
 distro/server-v: network = $(addprefix server-v/,\
 	apache2 nginx bird dhcp dns haproxy keepalived openvswitch freeipa-client)
@@ -129,7 +129,7 @@ endif
 	@$(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,docker lxd)
 	@$(call add,DEFAULT_SERVICES_ENABLE,bind mysqld openvswitch)
 	@$(call add,DEFAULT_SERVICES_ENABLE,rsyslogd systemd-journal-gatewayd)
 	@$(call add,DEFAULT_SERVICES_DISABLE,powertop bridge gpm)

conf.d/slinux.mk

@@ -21,14 +21,9 @@ 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; @:
+vm/slinux: use/slinux/vm-base use/build-vm; @:
 endif
 endif

conf.d/vm.mk

@@ -2,10 +2,18 @@
 ifeq (vm,$(IMAGE_CLASS))
 
 # NB: interactivesystem pulls in network-config-subsystem anyways
+ifeq (,$(filter-out i586 x86_64,$(ARCH)))
 vm/bare: vm/.base-lilo +sysvinit
+else
+vm/bare: vm/.bare +sysvinit
+endif
 	@$(call add,BASE_PACKAGES,apt)
 
+ifeq (,$(filter-out i586 x86_64 ppc64le,$(ARCH)))
 vm/systemd: vm/.base-grub +systemd
+else
+vm/systemd: vm/.bare +systemd
+endif
 	@$(call add,BASE_PACKAGES,glibc-gconv-modules glibc-locales tzdata)
 	@$(call add,BASE_PACKAGES,apt)
 
@@ -20,8 +28,6 @@ vm/systemd-net: vm/systemd use/net-eth/networkd-dhcp use/net-ssh \
 
 # vm/net or vm/systemd-net
 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)
 
 vm/cloud-sysv: vm/net mixin/cloud-init use/vmguest/kvm use/power/acpi/button; @:
@@ -46,9 +52,7 @@ 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

features.in/aarch64-rpi4/config.mk

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

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

@@ -1,8 +1,5 @@
 #!/bin/sh -efu
 
-target_dir='/boot/efi'
-mkdir -p "$target_dir"
-
 (
 cat << 'EOF'
 arch=arm
@@ -30,10 +27,12 @@ cpu=armv8
 dhcpuboot=usb start; dhcp u-boot.uimg; bootm
 distro_bootcmd=for target in ${boot_targets}; do run bootcmd_${target}; done
 efi_dtb_prefixes=/ /dtb/ /dtb/current/
+ethaddr=dc:a6:32:1a:86:f4
 fdt_addr=6000000
 fdt_addr_r=0x06000000
 fdt_high=ffffffffffffffff
 fdtcontroladdr=3af59a70
+fdtfile=bcm2711-rpi-4-b.dtb
 initrd_high=ffffffffffffffff
 kernel_addr_r=0x00080000
 load_efi_dtb=load ${devtype} ${devnum}:${distro_bootpart} ${fdt_addr_r} ${prefix}${efi_fdtfile}
@@ -52,7 +51,8 @@ soc=bcm283x
 stderr=serial,vidconsole
 stdin=serial,usbkbd
 stdout=serial,vidconsole
+usbethaddr=dc:a6:32:1a:86:f4
 vendor=raspberrypi
 
 EOF
-) | mkenvimage -s 16384 -o "$target_dir/uboot.env" -
+) | mkenvimage -s 16384 -o /usr/share/u-boot/rpi_4/uboot.env -

features.in/arm-rpi4/config.mk

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

features.in/arm-rpi4/image-scripts.d/80-chromium-to-firefox-in-panel

@@ -1,10 +0,0 @@
-#!/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

features.in/arm-rpi4/image-scripts.d/81-mplayer-to-celluloid-in-mimeapps

@@ -1,15 +0,0 @@
-#!/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

features.in/arm-rpi4/image-scripts.d/82-timer-based-to-interrupt-driven

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

features.in/arm-rpi4/image-scripts.d/91-edit-fstab-growfs

@@ -1,5 +0,0 @@
-#!/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

features.in/arm-rpi4/image-scripts.d/93-default-gouvernor-conservative

@@ -1,12 +0,0 @@
-#!/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

features.in/arm-rpi4/image-scripts.d/98-bootstrap-boot-by-firmware

@@ -1,45 +0,0 @@
-#!/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

features.in/armh-mcom02/config.mk

@@ -4,7 +4,6 @@ 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)

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

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

features.in/bootloader/config.mk

@@ -9,7 +9,6 @@
 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)
@@ -20,7 +19,6 @@ ifeq (distro,$(IMAGE_CLASS))
 	@$(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: \
@@ -41,10 +39,8 @@ endif
 use/bootloader/uboot: use/bootloader use/uboot
 	@$(call set,BASE_BOOTLOADER,uboot)
 
-use/bootloader/live: use/bootloader; @:
-ifneq (,$(filter-out e2k%,$(ARCH)))
+use/bootloader/live: use/bootloader
 	@$(call add,LIVE_PACKAGES,alterator-$$(BASE_BOOTLOADER))
-endif
 
 use/bootloader/os-prober: use/bootloader
 	@$(call add,BASE_PACKAGES,os-prober)

features.in/branding/config.mk

@@ -4,27 +4,16 @@ use/branding:
 
 # 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/notes use/syslinux/ui/gfxboot \
 	use/grub/ui/gfxboot
-	@$(call add,THE_BRANDING,alterator graphics)
+	@$(call add,THE_BRANDING,alterator bootloader bootsplash 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,slideshow)
-ifneq (,$(filter-out e2k%,$(ARCH)))
-	@$(call add,INSTALL2_BRANDING,notes)
-endif
+	@$(call add,INSTALL2_BRANDING,notes slideshow)
 
 # http://altlinux.org/branding/slideshow
 use/branding/slideshow/once: use/branding

features.in/browser/config.mk

@@ -3,35 +3,17 @@ use/browser:
 	@$(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/netsurf \
+	use/browser/chromium use/browser/epiphany \
+	use/browser/falkon use/browser/otter-browser \
+	use/browser/elinks use/browser/links2: \
+	use/browser/%: use/browser
+	@$(call set,THE_BROWSER,$*)
+
 # the complete lack of dependencies is intentional
 use/browser/firefox/esr:
 	@$(call set,FX_FLAVOUR,-esr)

features.in/build-distro/install2/image-scripts.d/86-all-groups

@@ -1,24 +0,0 @@
-#!/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"

features.in/build-distro/rootfs/image-scripts.d/30-all-groups

@@ -1,13 +0,0 @@
-#!/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

features.in/cleanup/config.mk

@@ -1,16 +1,9 @@
 use/cleanup:
 	@$(call add_feature)
-	@$(call xport,LIVE_NO_CLEANUPDB)
-	@$(call xport,LIVE_NO_CLEANUP_DOCS)
+	@$(call xport,GLOBAL_LIVE_NO_CLEANUPDB)
 	@$(call xport,CLEANUP_PACKAGES)
 	@$(call xport,CLEANUP_BASE_PACKAGES)
 
-use/cleanup/live-no-cleanupdb:
-	@$(call set,LIVE_NO_CLEANUPDB,yes)
-
-use/cleanup/live-no-cleanup-docs:
-	@$(call set,LIVE_NO_CLEANUP_DOCS,yes)
-
 use/cleanup/libs:
 	@$(call add,BASE_PACKAGES,apt-scripts)
 	@$(call add,INSTALL2_PACKAGES,installer-feature-cleanup-libs-stage3)
@@ -32,7 +25,6 @@ use/cleanup/alterator: use/cleanup
 use/cleanup/x11-alterator: use/cleanup/x11 use/cleanup/alterator
 	@$(call add,CLEANUP_PACKAGES,libmng qt4-common qt5-base-common)
 
-ifeq (,$(filter-out i586 x86_64,$(ARCH)))
 # "basically everything else"; this *will* change with branches and distros
 use/cleanup/jeos: use/cleanup/x11-alterator
 	@$(call add,CLEANUP_PACKAGES,liblcms libjpeg 'libtiff*')
@@ -49,9 +41,3 @@ use/cleanup/jeos/full: use/cleanup/jeos
 	@$(call add,CLEANUP_PACKAGES,console-scripts console-vt-tools 'kbd*')
 	@$(call add,CLEANUP_PACKAGES,libsystemd-journal libsystemd-login)
 	@$(call add,CLEANUP_PACKAGES,dbus libdbus)
-
-else
-# non-x86 systems are much more prone to critical package removals,
-# just avoid those for now => stub it
-use/cleanup/jeos use/cleanup/jeos/full:; @:
-endif

features.in/cleanup/live/image-scripts.d/90-cleanup-docs

@@ -2,9 +2,7 @@
 # remove all docs
 
 # don't cripple the image to be copied over
-[ -n "$GLOBAL_LIVE_NO_CLEANUP_DOCS" ] || \
-	[ -x /usr/sbin/live-install ] || \
-	[ -x /usr/sbin/livecd-install ] && exit 0
+[ -x /usr/sbin/live-install -o -x /usr/sbin/livecd-install ] && exit 0
 
 rpmquery -ad |grep ^/ |xargs -r rm -f --
 rm -rf /usr/share/{doc,man,info,license,gfxboot}

features.in/dev/config.mk

@@ -22,10 +22,7 @@ use/dev/builder/full: use/dev use/dev/builder/live use/dev/repo
 	@$(call set,KFLAVOURS,$(BIGRAM))
 	@$(call add,THE_LISTS,$(call tags,server extra))
 	@$(call add,MAIN_LISTS,$(call tags,live builder))
-ifeq (,$(filter-out i586 x86_64 ,$(ARCH)))
-	@$(call add,MAIN_PACKAGES,syslinux memtest86+)
-endif
-	@$(call add,MAIN_PACKAGES,pciids xorriso)
+	@$(call add,MAIN_PACKAGES,syslinux pciids memtest86+ xorriso)
 	@$(call add,LIVE_PACKAGES,sudo perl-Gear-Remotes)
 
 use/dev/groups/builder: use/dev/repo

features.in/docs/config.mk

@@ -15,11 +15,7 @@ use/docs/manual: use/docs
 	@$(call xport,DOCS)
 	@$(call add,THE_PACKAGES,docs-$$(DOCS))
 
-ifneq (,$(filter-out e2k%,$(ARCH)))
 use/docs/license: use/docs use/branding/notes
 	@$(call set,META_LICENSE_FILE,license.all.html)
-else
-use/docs/license:; @:
-endif
 
 use/docs/full: use/docs/indexhtml use/docs/manual use/docs/license; @:

features.in/e2k/config.mk

@@ -1,52 +1,60 @@
-use/e2k: use/tty/S0 use/l10n/default/ru_RU
+use/e2k:
 	@$(call add_feature)
 	@$(call add,BASE_PACKAGES,installer-feature-e2k-fix-clock-stage3)
-	@$(call add,LIVE_PACKAGES,installer-feature-e2k-fix-boot-stage2)
-	@$(call add,LIVE_PACKAGES,installer-feature-e2k-ignore-cf-stage2)
-	@$(call add,LIVE_PACKAGES,livecd-installer-features)
-	@$(call add,LIVE_PACKAGES,blacklist-ide)	# avoid overwriting hda
-	@$(call add,STAGE2_PACKAGES,agetty)
-	@$(call add,INSTALL2_PACKAGES,installer-feature-e2k-xorg-conf-stage2)
-	@$(call add,INSTALL2_PACKAGES,installer-feature-e2k-fix-boot-stage2)
-	@$(call add,INSTALL2_PACKAGES,installer-feature-fstrim-stage2)
-	@$(call add,INSTALL2_PACKAGES,blacklist-ide)	# avoid overwriting hda
-	@$(call add,INSTALL2_PACKAGES,ifplugd)	# for net-eth link status
-	@$(call add,INSTALL2_CLEANUP_PACKAGES,llvm)
-	@$(call add,BASE_PACKAGES,mirror-e2k-alt)
-	@$(call add,THE_PACKAGES,pwmd)
-	@$(call add,DEFAULT_SERVICES_DISABLE,pwmd)
-	@$(call set,KFLAVOURS,elbrus-def)	# no other flavours for now
-	@$(call xport,STAGE2_BOOTARGS)
+
+# at least one of these is requisite
+use/e2k/1cp use/e2k/4c use/e2k/8c: use/e2k/%: use/e2k
+	@$(call set,KFLAVOURS,elbrus-$*)
 
 use/e2k/x11: use/e2k use/x11
 	@$(call add,THE_PACKAGES,xorg-server xinit)
 
-ifeq (,$(filter-out e2kv4,$(ARCH)))
-use/e2k/x11/101: use/e2k/x11
-	@$(call add,MAIN_GROUPS,x-e2k/91-e101)
-	@$(call add,MAIN_GROUPS,$(addprefix x-e2k/,e101-modesetting))
+use/e2k/x11/401: use/e2k/x11 use/e2k/4c
+	@$(call add,THE_PACKAGES,xorg-conf-e401-radeon)
+	@$(call add,THE_PACKAGES,xorg-drv-ati)
 
-use/e2k/multiseat/801/base:
-	@$(call add,INSTALL2_PACKAGES,installer-feature-e2k-801-multiseat)
-	@$(call add,MAIN_GROUPS,x-e2k/90-e801)
-	@$(call add,MAIN_GROUPS,$(addprefix x-e2k/,e801-1seat e801-2seat))
+use/e2k/x11/801: use/e2k/x11 use/e2k/8c
+	@$(call add,THE_PACKAGES,xorg-conf-e801-radeon)
+	@$(call add,THE_PACKAGES,xorg-drv-ati)
 
-use/e2k/multiseat/801: use/e2k/multiseat/801/base
-	@$(call add,MAIN_GROUPS,$(addprefix x-e2k/,e801-3seat e801-6seat))
+use/e2k/x11/.101: use/e2k/x11 use/e2k/1cp; @:
 
-use/e2k/multiseat/801/full: use/e2k/multiseat/801 use/control
-	@$(call add,MAIN_GROUPS,x-e2k/x-autologin)
-	@$(call add,THE_PACKAGES,test-audio)
-	@$(call add,CONTROL,udisks2:shared)     ### media mount exclusivity
-else
-use/e2k/x11/101:; @:
-use/e2k/multiseat/801/base use/e2k/multiseat/801 use/e2k/multiseat/801/full:; @:
-endif	# e2kv4
+use/e2k/x11/101/modesetting: use/e2k/x11/.101
+	@$(call add,THE_PACKAGES,xorg-conf-e101-modesetting)
+	@$(call add,THE_PACKAGES,dummy-xorg-drv-vivante)
+
+use/e2k/x11/101/mga2: use/e2k/x11/.101
+	@$(call add,THE_PACKAGES,xorg-conf-e101-mga2)
+	@$(call add,THE_PACKAGES,xorg-drv-mga2 vivante_glx)
+
+use/e2k/x11/101: use/e2k/x11/101/modesetting
+	@$(call add,MAIN_PACKAGES,xorg-conf-e101-mga2)
+	@$(call add,MAIN_PACKAGES,xorg-drv-mga2 vivante_glx)
+
+use/e2k/install2: use/e2k
+	@$(call add,INSTALL2_PACKAGES,installer-feature-e2k-fix-boot-stage2)
+	@$(call add,INSTALL2_PACKAGES,installer-feature-fstrim-stage2)
+	@$(call add,INSTALL2_CLEANUP_PACKAGES,llvm)
+
+use/e2k/install2/desktop: use/e2k/install2
+	@$(call add,INSTALL2_PACKAGES,installer-feature-e2k-ignore-cf-stage2)
+
+use/e2k/install2/4xx: use/e2k/install2 use/e2k/4c
+	@$(call add,INSTALL2_PACKAGES,xorg-conf-e4xx-fbdev)
+
+use/e2k/install2/401: use/e2k/install2/desktop use/e2k/4c
+	@$(call add,INSTALL2_PACKAGES,xorg-conf-e401-modesetting)
+
+use/e2k/install2/801: use/e2k/install2/desktop use/e2k/8c
+	@$(call add,INSTALL2_PACKAGES,xorg-conf-e801-modesetting)
+
+use/e2k/install2/101: use/e2k/install2/desktop use/e2k/1cp
+	@$(call add,INSTALL2_PACKAGES,xorg-conf-e101-modesetting)
+	@$(call add,INSTALL2_PACKAGES,dummy-xorg-drv-vivante)
 
-ifeq (,$(filter-out e2k,$(ARCH)))
 use/e2k/sound/401:
 	@$(call add,THE_PACKAGES,setup-alsa-elbrus-401)
 
-else
-use/e2k/sound/401:; @:
-endif	# e2k
+use/e2k/401: use/e2k/install2/401 use/e2k/x11/401 use/e2k/sound/401; @:
+use/e2k/801: use/e2k/install2/801 use/e2k/x11/801; @:
+use/e2k/101: use/e2k/install2/101 use/e2k/x11/101; @:

features.in/e2k/install2/image-scripts.d/01-e2k-acpid

@@ -1,5 +0,0 @@
-#!/bin/sh
-# e2k power button handling relies on acpid-events-e2k and
-# acpid itself; installer-distro-simply-linux breaks that
-
-sed -i '/acpid/d' /usr/share/install2/systemd-disabled ||:

features.in/e2k/install2/image-scripts.d/01-e2k-apt

@@ -1,4 +0,0 @@
-#!/bin/sh
-# do not toss online repos into installer
-
-rm -f -- /etc/apt/sources.list.d/*.list ||:

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

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

features.in/e2k/lib/50-e2k-write.sh

@@ -1,47 +0,0 @@
-#!/bin/sh -efu
-# ALT: write Elbrus boot media
-# public domain 2020 Michael Shigorin <mike@altlinux.org>
-# http://altlinux.org/elbrus
-
-error() { echo "$@" >&2; exit 1; }
-usage() { error "Usage: $0 /path/to/alt-e2k.iso /dev/sdX1_or_/dev/sr0"; }
-
-[ $# = 2  ] || usage
-[ -s "$1" ] || usage
-[ -b "$2" ] || usage
-
-checkuid() { [ "$(id -u)" = 0 ] || error "$0: need to run as root"; }
-format() { mkfs.ext2 -E packed_meta_blocks=1,num_backup_sb=1 -L altinst "$1"; }
-
-case "$2" in
-/dev/sr[0-9]*|dvd*|cd*)
-	grep -qw "^$2" /proc/mounts && checkuid && umount -v "$2"
-	echo "Writing DVD image..."
-	growisofs -dvd-compat -Z "$2"="$1"
-	;;
-/dev/sd*)
-	grep -q "^$1" /proc/mounts && error "$1 mounted already"
-	checkuid
-	[ "$(blkid -o value -s LABEL "$2")" = "altinst" ] || format "$2"
-	src="$(mktemp -d)"
-	dst="$(mktemp -d)"
-	echo -n "mounting image... "
-	mount -o loop,ro "$1" "$src"; echo "done"
-	echo -n "mounting drive... "
-	mount -o noatime "$2" "$dst"; echo "done"
-	echo "copying contents..."
-	rsync -Pavc --inplace --delete --numeric-ids "$src/" "$dst/" ||
-		cp -avt "$dst" -- "$src"/{.disk,*}
-	grep -q "^default=.*_flash$" "$dst/boot.conf" || {
-		echo -n "updating default boot target... "
-		sed -i 's,default=.*$,&_flash,' "$dst/boot.conf"
-		echo "done"
-	}
-	echo -n "unmounting media... "
-	umount "$src" "$dst"
-	echo "done."
-	;;
-*)
-	usage
-	;;
-esac

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

@@ -1,4 +0,0 @@
-WHATEVER += files/write.sh
-
-files/write.sh:
-	@install -pDm755 lib/50-e2k-write.sh files/write.sh

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

@@ -1,6 +0,0 @@
-#!/bin/sh
-# borrowed from installer-feature-local-clock
-
-. shell-config
-
-shell_config_set /etc/sysconfig/clock UTC true

features.in/e2k/scripts.d/20-e2k-boot

@@ -1,50 +0,0 @@
-#!/bin/sh
-
-echo "** 20-e2k-boot START"
-
-cd "$WORKDIR"
-
-# slightly different logic as there's no boot *menu*:
-# ensure the user can install this if possible
-[ -f live    ] && default=live
-[ -f rescue  ] && default=rescue
-[ -f altinst ] && default=install
-
-cat > boot.conf << EOF
-# USB Flash note: write the contents including .disk/ onto
-# an ext2 formatted drive with "altinst" filesystem label
-
-default=$default
-timeout=3
-EOF
-
-for i in live altinst rescue; do
-	[ -f "$i" ] || continue
-
-	if [ "$i" = "altinst" ]; then
-		label=install
-		stage2=
-	else
-		label="$i"
-		stage2="stagename=$i"
-	fi
-
-	cat >> boot.conf << EOF
-
-label=$label
-    partition=0
-    image=/alt0/vmlinux.0
-    cmdline=console=ttyS0,115200 console=tty0 hardreset fastboot live automatic=method:cdrom ${stage2:+$stage2 }${GLOBAL_STAGE2_BOOTARGS:+$GLOBAL_STAGE2_BOOTARGS }${GLOBAL_BOOT_LANG:+lang=$GLOBAL_BOOT_LANG}
-    initrd=/alt0/full.cz
-
-label=${label}_flash
-    partition=0
-    image=/alt0/vmlinux.0
-    cmdline=console=ttyS0,115200 console=tty0 hardreset fastboot live lowmem automatic=method:disk,label:altinst,directory:/ ${stage2:+$stage2 }${GLOBAL_STAGE2_BOOTARGS:+$GLOBAL_STAGE2_BOOTARGS }${GLOBAL_BOOT_LANG:+lang=$GLOBAL_BOOT_LANG}
-    initrd=/alt0/full.cz
-EOF
-done
-
-ls -lh
-
-echo "** 20-e2k-boot END"

features.in/e2k/stage1/scripts.d/20-initrd-e2k-kms

@@ -1,4 +0,0 @@
-#!/bin/sh
-# ensure early kms so stage1 issues can at least be displayed on tty0
-
-echo 'MODULES_PRELOAD += radeon galcore vivante' >> /etc/initrd.mk

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

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

features.in/efi/config.mk

@@ -11,8 +11,10 @@ use/efi:
 	@$(call set,MKI_VER_MINIMAL,0.2.12)	# it's official now
 	@$(call set,MKI_VER_OPTIMAL,0.2.17)	# for EFI_BOOTARGS
 	@$(call try,EFI_BOOTLOADER,grub-efi)	# default one
+	@$(call add,THE_PACKAGES,$$(EFI_BOOTLOADER))
 	@$(call xport,EFI_BOOTLOADER)
 	@$(call add,THE_LISTS,$(EFI_LISTS))
+	@$(call add,THE_PACKAGES,$$(EFI_SHELL))
 ifeq (distro,$(IMAGE_CLASS))
 	@$(call add,RESCUE_LISTS,$(EFI_LISTS))
 	@$(call add,INSTALL2_PACKAGES,dosfstools fatresize)
@@ -20,7 +22,6 @@ ifeq (distro,$(IMAGE_CLASS))
 	@$(call add,EFI_BOOTARGS,$$(STAGE2_BOOTARGS))
 ifeq (x86_64,$(ARCH))
 	@$(call add,RESCUE_PACKAGES,refind $$(EFI_SHELL) $$(EFI_BOOTLOADER))
-	@$(call add,THE_PACKAGES,$$(EFI_SHELL))
 endif
 endif
 

features.in/fonts/config.mk

@@ -1,19 +1,12 @@
 # fontconfig setup
 use/fonts:
 	@$(call add_feature)
-	@$(call try,FONTS,fonts-ttf-google-croscore-arimo)
-	@$(call add,THE_PACKAGES,$$(FONTS))
 	@$(call xport,FONT_FEATURES_ENABLE)
 	@$(call xport,FONT_FEATURES_DISABLE)
 
 # standalone target to specify non-bitmap installer fonts
 use/fonts/install2:
-	@$(call try,INSTALL2_FONTS,fonts-ttf-google-croscore-arimo)
-	@$(call add,INSTALL2_PACKAGES,$$(SYSTEM_FONTS))
-
-use/fonts/system:
-	@$(call try,SYSTEM_FONTS,fonts-ttf-google-croscore-arimo)
-	@$(call add,SYSTEM_PACKAGES,$$(INSTALL2_FONTS))
+	@$(call add,SYSTEM_PACKAGES,fonts-ttf-google-croscore-arimo)
 
 # just stating that kernels and font habits are pretty individual
 use/fonts/zerg: use/fonts
@@ -28,39 +21,39 @@ use/fonts/infinality: use/fonts
 
 # #34142
 use/fonts/chinese: use/fonts
-	@$(call add,FONTS,fonts-bitmap-wqy)
+	@$(call add,THE_PACKAGES,fonts-bitmap-wqy)
 
 # a few typical font collections
 # NB: dejavu is ugly thus missing
 # NB: not depending on use/fonts intentionally,
 #     the scripts are unneeded to add packages
-use/fonts/otf/adobe: use/fonts
-	@$(call add,FONTS,fonts-otf-adobe-source-code-pro)
-	@$(call add,FONTS,fonts-otf-adobe-source-sans-pro)
+use/fonts/otf/adobe:
+	@$(call add,THE_PACKAGES,fonts-otf-adobe-source-code-pro)
+	@$(call add,THE_PACKAGES,fonts-otf-adobe-source-sans-pro)
 
-use/fonts/otf/mozilla: use/fonts
-	@$(call add,FONTS,fonts-otf-mozilla-fira)
+use/fonts/otf/mozilla:
+	@$(call add,THE_PACKAGES,fonts-otf-mozilla-fira)
 
-use/fonts/ttf/google: use/fonts
-	@$(call add,FONTS,fonts-ttf-google-droid-sans)
-	@$(call add,FONTS,fonts-ttf-google-droid-sans-mono)
-	@$(call add,FONTS,fonts-ttf-google-droid-serif)
-	@$(call add,FONTS,fonts-ttf-google-croscore-arimo)
-	@$(call add,FONTS,fonts-ttf-google-croscore-cousine)
-	@$(call add,FONTS,fonts-ttf-google-croscore-tinos)
+use/fonts/ttf/google:
+	@$(call add,THE_PACKAGES,fonts-ttf-google-droid-sans)
+	@$(call add,THE_PACKAGES,fonts-ttf-google-droid-sans-mono)
+	@$(call add,THE_PACKAGES,fonts-ttf-google-droid-serif)
+	@$(call add,THE_PACKAGES,fonts-ttf-google-croscore-arimo)
+	@$(call add,THE_PACKAGES,fonts-ttf-google-croscore-cousine)
+	@$(call add,THE_PACKAGES,fonts-ttf-google-croscore-tinos)
 
 use/fonts/ttf/google/extra: use/fonts/ttf/google
-	@$(call add,FONTS,fonts-ttf-google-crosextra-caladea)
-	@$(call add,FONTS,fonts-ttf-google-crosextra-carlito)
+	@$(call add,THE_PACKAGES,fonts-ttf-google-crosextra-caladea)
+	@$(call add,THE_PACKAGES,fonts-ttf-google-crosextra-carlito)
 
-use/fonts/ttf/redhat: use/fonts
-	@$(call add,FONTS,fonts-ttf-liberation)
+use/fonts/ttf/redhat:
+	@$(call add,THE_PACKAGES,fonts-ttf-liberation)
 
-use/fonts/ttf/ubuntu: use/fonts
-	@$(call add,FONTS,fonts-ttf-ubuntu-font-family)
+use/fonts/ttf/ubuntu:
+	@$(call add,THE_PACKAGES,fonts-ttf-ubuntu-font-family)
 
-use/fonts/ttf/xo: use/fonts
-	@$(call add,FONTS,fonts-ttf-XO)
-	@$(call add,FONTS,fonts-ttf-PT)
-	@$(call add,FONTS,fonts-ttf-Cormorant)
-	@$(call add,FONTS,fonts-ttf-open-sans)
+use/fonts/ttf/xo:
+	@$(call add,THE_PACKAGES,fonts-ttf-XO)
+	@$(call add,THE_PACKAGES,fonts-ttf-PT)
+	@$(call add,THE_PACKAGES,fonts-ttf-Cormorant)
+	@$(call add,THE_PACKAGES,fonts-ttf-open-sans)

features.in/grub/config.mk

@@ -10,6 +10,11 @@ ifeq (,$(filter-out i586 x86_64,$(ARCH)))
 endif
 	@$(call set,RELNAME,ALT ($(IMAGE_NAME)))
 	@$(call set,IMAGE_PACKTYPE,boot)
+else
+
+use/grub: ; @:
+
+endif
 
 # UI is overwritten
 use/grub/ui/%: use/grub
@@ -21,11 +26,6 @@ use/grub/ui/%: use/grub
 use/grub/%.cfg: use/grub
 	@$(call add,GRUB_CFG,$*)
 
+
 use/grub/timeout/%: use/grub
 	@$(call set,GRUB_TIMEOUT,$*)
-else
-
-use/grub: ; @:
-use/grub/ui/% use/grub/%.cfg use/grub/timeout/%: ; @:
-
-endif

features.in/grub/generate.mk

@@ -1,7 +1,7 @@
 ifdef BUILDDIR
 
-# in seconds
-DEFAULT_TIMEOUT = 60
+# in deciseconds
+DEFAULT_TIMEOUT = 90
 
 # prepare data for grub installation;
 # see also stage1/scripts.d/01-grub

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

@@ -40,16 +40,6 @@ fi
 # there should be DEFAULT directive there (at least for alterator-netinst)
 default_change() {
 local CFG=$1
-if [ -n "$GLOBAL_GRUB_DEFAULT" ]; then
-	if [ -n "$(grep -i "$GLOBAL_GRUB_DEFAULT" "$CFG")" ]; then
-		DEFAULT="$GLOBAL_GRUB_DEFAULT"
-		sed -i '/^default/d'
-		echo "default=$DEFAULT" >> "$CFG"
-	else
-		echo "error: $GLOBAL_GRUB_DEFAULT missing in $CFG" >&2
-		exit 1
-	fi
-fi
 if ! grep -i '^default' "$CFG"; then
 	DEFAULT="$(grep -i '\-\-id ' "$CFG" | head -1 | rev| cut -f2 -d' ' |rev)"
 	if [ -n "$DEFAULT" ]; then

features.in/install2/config.mk

@@ -9,10 +9,9 @@ use/install2: use/stage2 sub/stage2@install2 use/metadata \
 	@$(call add,INSTALL2_PACKAGES,installer-distro-$$(INSTALLER)-stage2)
 	@$(call add,INSTALL2_PACKAGES,branding-$$(BRANDING)-alterator)
 	@$(call add,BASE_PACKAGES,branding-$$(BRANDING)-release)
-	@$(call add,BASE_PACKAGES,installer-distro-$$(INSTALLER)-stage3)
 	@$(call add,BASE_PACKAGES,installer-common-stage3)
 	@$(call add,BASE_PACKAGES,glibc-gconv-modules)	# for guile22
-	@$(call add,BASE_LISTS,$(call tags,basesystem && !alterator))
+	@$(call add,BASE_LISTS,$(call tags,basesystem))
 	@$(call xport,BASE_BOOTLOADER)
 	@$(call xport,INSTALL2_CLEANUP_PACKAGES)
 	@$(call xport,INSTALL2_CLEANUP_KDRIVERS)
@@ -20,7 +19,7 @@ use/install2: use/stage2 sub/stage2@install2 use/metadata \
 # doesn't use/install2/fs on purpose (at least so far)
 use/install2/full: \
 	use/install2/packages use/install2/vmguest use/install2/tools \
-	use/syslinux/localboot.cfg use/syslinux/ui/menu use/bootloader
+	use/syslinux/ui/menu use/bootloader
 	@$(call add,INSTALL2_PACKAGES,xorg-drv-synaptics)
 	@$(call add,INSTALL2_PACKAGES,xorg-drv-libinput)
 
@@ -125,11 +124,6 @@ use/install2/tools:
 use/install2/cleanup/vnc:
 	@$(call add,INSTALL2_CLEANUP_PACKAGES,x11vnc xorg-xvfb)
 
-# when VNC installation is less welcome than a few extra megs
-use/install2/cleanup/dri:
-	@$(call set,INSTALL2_CLEANUP_DRI,yes)
-	@$(call xport,INSTALL2_CLEANUP_DRI)
-
 # conflicts with luks feature
 use/install2/cleanup/crypto:
 	@$(call add,INSTALL2_CLEANUP_PACKAGES,gnupg)

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

@@ -2,9 +2,7 @@
 # drop extra drivers et al, purge kernel image(s)
 
 # xorg-dri-*
-if [ "$GLOBAL_INSTALL2_CLEANUP_DRI" = 'yes' ]; then
-	rm -r /usr/lib*/X11/modules/dri
-fi
+rm -r /usr/lib*/X11/modules/dri
 
 # no movies during installation so far
 rm -rf /usr/lib*/vdpau/ /usr/lib*/libXv*

features.in/kernel/config.mk

@@ -22,11 +22,6 @@ endif
 endif
 	@$(call xport,KFLAVOURS)
 
-use/kernel/latest: use/kernel; @:
-ifeq (,$(filter-out aarch64 armh i586 ppc64le x86_64,$(ARCH)))
-	@$(call set,KFLAVOURS,un-def)
-endif
-
 # r8168 is a kludge, never install it by default
 use/kernel/net:
 	@$(call add,THE_KMODULES,e1000e igb)
@@ -64,11 +59,11 @@ endif
 ifeq (,$(filter-out e2k% ppc64le,$(ARCH)))
 	@$(call add,VM_INITRDFEATURES,usb)
 endif
-ifneq (,$(filter-out e2k% riscv64,$(ARCH)))
+ifneq (,$(filter-out e2k%,$(ARCH)))
 	@$(call add,VM_INITRDFEATURES,qemu)
-endif
-	@$(call add,VM_INITRDMODULES,virtio-scsi virtio-blk virtio-rng virtio_net virtio-gpu)
+	@$(call add,VM_INITRDMODULES,virtio-scsi virtio-blk virtio-rng virtio_net)
 	@$(call add,VM_INITRDMODULES,virtio-mmio virtio_pci virtio_console virtio_input)
+endif
 ifeq (,$(filter-out ppc64le,$(ARCH)))
 	@$(call add,VM_INITRDMODULES,ipr ibmvscsi)
 endif

features.in/live/config.mk

@@ -24,10 +24,6 @@ use/live: use/stage2 sub/rootfs@live sub/stage2@live \
 use/live/.base: use/live use/syslinux/ui/menu
 	@$(call add,LIVE_LISTS,$(call tags,base live))
 
-use/live/no-cleanup: \
-	use/cleanup/live-no-cleanupdb \
-	use/cleanup/live-no-cleanup-docs; @:
-
 use/live/base: use/live/.base use/net use/deflogin/live
 	@$(call add,LIVE_LISTS,$(call tags,base network))
 
@@ -48,8 +44,7 @@ use/live/x11: use/live/base use/deflogin/desktop use/x11-autologin use/sound \
 # this target specifically pulls free xorg drivers in (and a few more bits);
 # a browser is requested too, the recommended one can be overridden downstream
 use/live/desktop: use/live/x11 use/x11/xorg use/x11/wacom \
-	use/l10n use/browser/firefox/live use/xdg-user-dirs/deep \
-	use/syslinux/localboot.cfg +vmguest; @:
+	use/l10n use/browser/firefox/live use/xdg-user-dirs/deep +vmguest; @:
 
 # preconfigure apt for both live and installed-from-live systems
 use/live/repo: use/live
@@ -61,18 +56,14 @@ use/live/repo/online:
 	@$(call add,LIVE_PACKAGES,livecd-online-repo)
 
 # alterator-based permanent installation
-use/live/install: use/metadata use/xdg-user-dirs use/syslinux/localboot.cfg \
+use/live/install: use/metadata use/xdg-user-dirs \
 	use/bootloader/live use/bootloader/grub
 	@$(call add,LIVE_PACKAGES,livecd-install)
 	@$(call add,LIVE_PACKAGES,livecd-installer-features)
 
 # text-based installation script
-ifeq (,$(filter-out i586 x86_64,$(ARCH)))
 use/live/textinstall: use/syslinux/lateboot.cfg
 	@$(call add,LIVE_PACKAGES,live-install)
-else
-use/live/textinstall: ; @:
-endif
 
 # a very simplistic one
 use/live/.x11: use/live use/x11 use/x11-autologin
@@ -95,13 +86,9 @@ use/live/ru: use/live use/l10n/default/ru_RU; @:
 use/live/sound: use/live
 	@$(call add,LIVE_LISTS,sound/base)
 
-ifeq (,$(filter-out i586 x86_64 aarch64,$(ARCH)))
 # prepare bootloader for software suspend (see also install2)
 use/live/suspend: use/live
 	@$(call add,LIVE_PACKAGES,installer-feature-desktop-suspend-stage2)
-else
-use/live/suspend: use/live; @:
-endif
 
 # deny network/local drive access for security reasons
 use/live/privacy: use/services use/memclean use/deflogin \

features.in/live/live/image-scripts.d/60-apt

@@ -7,4 +7,4 @@ PROTO="${GLOBAL_LIVE_REPO%/*}"	# http, ftp, rsync
 MIRROR="${GLOBAL_LIVE_REPO#*/}"	# alt, heanet, kiev, yandex, ...
 
 sed -i "s,^#\(rpm \[.*\] ${PROTO:-http}.*\),\1," \
-	"/etc/apt/sources.list.d/${MIRROR:-yandex}.list" ||:
+	"/etc/apt/sources.list.d/${MIRROR:-yandex}.list"

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

@@ -31,7 +31,7 @@ metadata-.base:
 		if [ -n "$(DOT_BASE)" ]; then \
 			echo -e "\n## DOT_BASE\n$(DOT_BASE)"; \
 		fi; \
-		} | sed -re 's/^[[:space:]]+//' | sed -re '/^[^[:space:]#]/ s/[[:space:]]+/\n/g' > .base
+	} | sed -re '/^[^[:space:]#]/ s/[[:space:]]+/\n/g' > .base
 
 # see also alterator-pkg (backend3/pkg-install);
 # we only tar up what's up to it (note that e.g.

features.in/mipsel-bfk3/config.mk

@@ -6,6 +6,5 @@ use/mipsel-bfk3: use/kernel use/tty/S0
 	@$(call add,NET_ETH,eth1:dhcp)
 	@$(call add,NET_ETH,eth2:dhcp)
 	@$(call add,THE_PACKAGES,fbset-modes-sm750-bfk3)
-	@$(call add,THE_PACKAGES,alt-config-be-t)
 
 use/mipsel-bfk3/x11: use/mipsel-bfk3 use/x11/radeon; @:

features.in/mipsel-bfk3/rootfs/files/etc/udev/rules.d/95-sm750-seat-master.rules

@@ -0,0 +1,6 @@
+
+# make sm750 a seat master
+
+ACTION=="add" KERNEL=="fb*" SUBSYSTEM=="graphics" \
+  SUBSYSTEMS=="pci" ATTRS{vendor}=="0x126f" ATTRS{device}=="0x0750" \
+  TAG+="seat" TAG+="master-of-seat"

features.in/mipsel-bfk3/rootfs/files/etc/udev/rules.d/98-sm750-set-mode.rules

@@ -0,0 +1,6 @@
+
+# Set mode for sm750 video card
+
+ACTION=="add" KERNEL=="fb*" SUBSYSTEM=="graphics" \
+  SUBSYSTEMS=="pci" ATTRS{vendor}=="0x126f" ATTRS{device}=="0x0750" \
+  RUN+="/usr/bin/fbset -db /etc/fb.modes.sm750 1680x1050-60"

features.in/mipsel-bfk3/rootfs/image-scripts.d/40-fstab

@@ -1,5 +1,5 @@
 #!/bin/sh -efu
 
-sed '/[[:space:]]\/[[:space:]]/d' /etc/fstab
+sed '/[[:space:]]\/[[:space:]]/d'
 
 printf "/dev/sda1\t/\t$GLOBAL_VM_FSTYPE\tdefault\t1 1\n" >> /etc/fstab

features.in/mipsel-mitx/config.mk

@@ -1,7 +1,6 @@
 use/mipsel-mitx: use/kernel use/tty/S0
 	@$(call add_feature)
-	@$(call set,KFLAVOURS,mitx-xpa)
-	@$(call add,THE_PACKAGES,alt-config-be-t)
+	@$(call set,KFLAVOURS,mitx-def)
 
 use/mipsel-mitx/x11: use/mipsel-mitx
 	@$(call add,THE_PACKAGES,xorg-conf-sm750-tavolga)

features.in/mipsel-mitx/rootfs/files/etc/udev/rules.d/95-sm750-seat-master.rules

@@ -0,0 +1,6 @@
+
+# make sm750 a seat master
+
+ACTION=="add" KERNEL=="fb*" SUBSYSTEM=="graphics" \
+  SUBSYSTEMS=="pci" ATTRS{vendor}=="0x126f" ATTRS{device}=="0x0750" \
+  TAG+="seat" TAG+="master-of-seat"

features.in/mipsel-mitx/rootfs/image-scripts.d/40-boot

@@ -13,12 +13,8 @@ case "$kversion" in
 		DTB_NAME=tplatforms_mitx2
 		KERNEL_LOAD_ADDR=0x80004000
 		;;
-	4.4*)
-		DTB_NAME=tplatforms_mitx
-		KERNEL_LOAD_ADDR=0x80100000
-		;;
 	*)
-	        # 4.9 and other experimential stuff
+		# 4.4, 4.9
 		DTB_NAME=baikal_mitx
 		KERNEL_LOAD_ADDR=0x80100000
 		;;

features.in/mipsel-mitx/rootfs/image-scripts.d/40-cpufreq-simple

@@ -1,9 +0,0 @@
-#!/bin/sh
-
-CONFIG=/etc/sysconfig/cpufreq-simple
-
-[ -f "$CONFIG" ] || exit 0
-
-. shell-config
-shell_config_set "$CONFIG" GOVERNOR_AC_ON performance
-shell_config_set "$CONFIG" GOVERNOR_AC_OFF performance

features.in/net-eth/rootfs/image-scripts.d/50-net-eth

@@ -6,15 +6,11 @@
 fatal() { echo "error: $*" >&2; exit 1; }
 
 # simple etcnet configurations are also picked up by NM
-if [ -n "$GLOBAL_NMCTL" ]; then
-	NMCTL="$GLOBAL_NMCTL"
+if type -t NetworkManager >&/dev/null ||
+   type -t connmand >&/dev/null; then
+	NMCTL=yes
 else
-	if type -t NetworkManager >&/dev/null ||
-	   type -t connmand >&/dev/null; then
-		NMCTL=yes
-	else
-		NMCTL=no
-	fi
+	NMCTL=no
 fi
 
 ETCNET_IFDIR="/etc/net/ifaces"

features.in/net/config.mk

@@ -1,9 +1,8 @@
 +nm: use/net/nm; @:
 
-use/net: use/services use/pkgpriorities
+use/net: use/services
 	@$(call add_feature)
 	@$(call add,THE_PACKAGES,$$(THE_NET_SUBSYS))
-	@$(call add,PINNED_PACKAGES,$$(THE_NET_SUBSYS))
 	@$(call set,THE_NET_SUBSYS,network-config-subsystem)
 
 use/net/etcnet: use/net

features.in/oem/config.mk

@@ -1,19 +1,5 @@
 use/oem: use/services use/branding
 	@$(call add_feature)
-	@$(call add,DEFAULT_SERVICES_ENABLE,messagebus alteratord)
+	@$(call add,DEFAULT_SERVICES_ENABLE,messagebus alteratord setup)
 	@$(call add,THE_PACKAGES,alterator-setup alterator-notes)
-	@$(call add,THE_PACKAGES,rootfs-installer-features)
 	@$(call add,THE_BRANDING,alterator notes)
-	@$(call try,OEM_TARGET,setup)
-	@$(call add,DEFAULT_SERVICES_ENABLE,$$(OEM_TARGET))
-	@$(call xport,OEM_TARGET)
-	@$(call xport,OEM_NO_CLEANUP)
-
-use/oem/vnc: use/oem use/x11-vnc use/net-eth/dhcp
-	@$(call add,THE_PACKAGES,alterator-setup-x11vnc)
-	@$(call set,OEM_TARGET,setup-vnc)
-	@$(call set,NMCTL,no)
-	@$(call xport,NMCTL)
-
-use/oem/no-cleanup: use/oem
-	@$(call set,OEM_NO_CLEANUP,yes)

features.in/oem/rootfs/image-scripts.d/99-oem-setup

@@ -2,16 +2,11 @@
 # this breaks the default configuration on intent
 # so that alterator-setup can run predictably
 
-TARGET=/lib/systemd/system/$GLOBAL_OEM_TARGET.target
+TARGET=/lib/systemd/system/setup.target
 
 [ ! -s "$TARGET" ] ||
 	ln -s "$TARGET" /etc/systemd/system/default.target
 
 echo "LANG=en_US.utf-8" >> /etc/sysconfig/i18n
 
-# Disable cleanup alterator-setup
-[ ! "$GLOBAL_OEM_NO_CLEANUP" = yes ] ||
-	sed -i 's/^REMOVE_SELF=.*/REMOVE_SELF=0/' /etc/alterator-setup/config
-	cat /etc/alterator-setup/config
-
 :

features.in/office/config.mk

@@ -1,8 +1,3 @@
-ifeq (,$(filter-out riscv64,$(ARCH)))
-# not available on riscv64 at the moment
-use/office use/office/LibreOffice/still use/office/LibreOffice/full: ; @:
-else
-
 use/office:
 	@$(call add_feature)
 	@$(call try,THE_OFFICE,abiword gnumeric)
@@ -13,33 +8,18 @@ use/office/LibreOffice: use/office
 	@$(call set,THE_OFFICE,LibreOffice$$(LO_FLAVOUR))
 
 # the complete lack of dependencies is intentional
-use/office/LibreOffice/still: ; @:
-ifneq (,$(filter-out e2k%,$(ARCH)))
+use/office/LibreOffice/still:
 	@$(call set,LO_FLAVOUR,-still)
-endif
 
 use/office/LibreOffice/lang: use/office/LibreOffice
 	@$(call add,THE_OFFICE,LibreOffice$$(LO_FLAVOUR)-langpack-kk)
 	@$(call add,THE_OFFICE,LibreOffice$$(LO_FLAVOUR)-langpack-ru)
 	@$(call add,THE_OFFICE,LibreOffice$$(LO_FLAVOUR)-langpack-uk)
 
-use/office/LibreOffice/lang/extra: use/office/LibreOffice/lang
-	@$(call add,THE_OFFICE,LibreOffice$$(LO_FLAVOUR)-langpack-es)
-	@$(call add,THE_OFFICE,LibreOffice$$(LO_FLAVOUR)-langpack-pt-BR)
-
 use/office/LibreOffice/gtk2 use/office/LibreOffice/gtk3 \
-	use/office/LibreOffice/qt5 use/office/LibreOffice/kde5 \
-	use/office/LibreOffice/extensions \
-	use/office/LibreOffice/integrated: \
+	use/office/LibreOffice/qt5 use/office/LibreOffice/kde5: \
 	use/office/LibreOffice/%: use/office/LibreOffice
 	@$(call add,THE_OFFICE,LibreOffice$$(LO_FLAVOUR)-$*)
 
-use/office/LibreOffice/full: use/office/LibreOffice/still \
-	use/office/LibreOffice/gtk3 \
-	use/office/LibreOffice/extensions \
-	use/office/LibreOffice/integrated; @:
-
 use/office/calligra: use/office
 	@$(call set,THE_OFFICE,calligra)
-
-endif	# !riscv64

features.in/pack/config.mk

@@ -3,13 +3,9 @@
 # distributions
 DISTRO_EXTS := .iso
 
-use/pack::
+use/pack:
 	@$(call add_feature)
 
-ifeq (,$(filter-out e2k%,$(ARCH)))
-use/pack:: use/e2k; @:
-endif
-
 # fallback type is isodata, might get set elsewhere to produce bootable iso
 use/pack/iso: use/pack
 	@$(call try,IMAGE_PACKTYPE,isodata)

features.in/power/config.mk

@@ -3,9 +3,7 @@
 # common
 use/power: sub/rootfs use/services
 	@$(call add_feature)
-ifeq (,$(filter-out e2k%,$(ARCH)))
 	@$(call add,COMMON_PACKAGES,installer-feature-powerbutton-stage3)
-endif
 
 # modern power management
 use/power/acpi: use/power
@@ -13,12 +11,10 @@ use/power/acpi: use/power
 	@$(call add,DEFAULT_SERVICES_ENABLE,acpid)
 
 use/power/acpi/button: use/power/acpi
+	@$(call add,COMMON_PACKAGES,acpid-events-power)
 ifeq (,$(filter-out e2k%,$(ARCH)))
 	@$(call add,COMMON_PACKAGES,acpid-events-e2k)
-	@$(call add,INSTALL2_PACKAGES,installer-feature-e2k-power-stage2)
-	@$(call add,DEFAULT_SERVICES_ENABLE,acpid sysfs)
-else
-	@$(call add,COMMON_PACKAGES,acpid-events-power)
+	@$(call add,DEFAULT_SERVICES_ENABLE,sysfs)
 endif
 
 use/power/acpi/powersave: use/power/acpi

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

@@ -1,6 +1,6 @@
 #!/bin/sh -efu
 
 # provide kernel interface for ACPI power button
-if [ `arch` != e2k -a -x /etc/init.d/acpid ]; then
+if [ -x /etc/init.d/acpid ]; then
 	grep -qsx button /etc/modules || echo button >> /etc/modules
 fi

features.in/rescue/config.mk

@@ -23,7 +23,7 @@ ifneq (,$(EFI_BOOTLOADER))
 endif
 	@$(call add,RESCUE_LISTS,\
 		$(call tags,(base || extra || server || backup || misc || fs) \
-			&& !x11 && (rescue || comm || network || security || archive)))
+			&& (rescue || comm || network || security || archive)))
 
 # rw slice, see also use/live/rw (don't use simultaneously)
 ifeq (,$(EFI_BOOTLOADER))

features.in/rescue/rescue/image-scripts.d/60-apt

@@ -1,5 +1,4 @@
 #!/bin/sh
 # enable online repository even more unconditionally
 
-sed -i "s,^#\(rpm .* http.*\),\1," "/etc/apt/sources.list.d/yandex.list" ||
-	echo "** warning: unable to enable online repos" >&2
+sed -i "s,^#\(rpm .* http.*\),\1," "/etc/apt/sources.list.d/yandex.list" ||	echo "** warning: unable to enable online repos" >&2

features.in/server/config.mk

@@ -2,7 +2,7 @@ use/server: sub/rootfs use/services
 	@$(call add_feature)
 
 use/server/base: use/server use/firmware/server \
-	use/net-ssh use/syslinux/timeout/600 use/grub/timeout/60
+	use/net-ssh use/syslinux/timeout/600 use/grub/timeout/600
 	@$(call set,BOOTVGA,)
 	@$(call add,THE_LISTS,server-base)
 	@$(call add,THE_KMODULES,e1000e igb)

features.in/slinux/config.mk

@@ -46,14 +46,8 @@ use/slinux/services: use/slinux/services-enabled use/slinux/services-disabled
 
 use/slinux/arm-base: use/x11/armsoc use/bootloader/uboot
 
-ifeq (,$(filter-out riscv64,$(ARCH)))
-use/slinux/vm-base: vm/systemd \
-	use/oem/vnc use/bootloader/uboot use/slinux/mixin-base
-	@$(call set,KFLAVOURS,un-def)
-else
 use/slinux/vm-base: vm/systemd \
 	use/oem use/slinux/mixin-base
-endif
 	@$(call add,THE_LISTS,slinux/games-base)
 	@$(call add,THE_LISTS,slinux/graphics-base)
 	@$(call add,THE_LISTS,slinux/multimedia-base)
@@ -66,9 +60,7 @@ endif
 	@$(call add,THE_PACKAGES,installer-feature-sudo-enable-by-default-stage3)
 
 use/slinux/mixin-base: use/slinux use/x11/xorg use/x11/lightdm/gtk +pulse \
-	+nm use/x11/gtk/nm +systemd +systemd-optimal +wireless \
-	use/l10n/default/ru_RU \
-	use/office/LibreOffice/full \
+	+nm use/x11/gtk/nm +systemd +systemd-optimal +wireless use/l10n/default/ru_RU \
 	use/docs/manual use/docs/indexhtml \
 	use/xdg-user-dirs/deep use/slinux/services
 	@$(call set,DOCS,simply-linux)
@@ -101,8 +93,8 @@ use/slinux/base: use/isohybrid use/luks \
 	use/branding/complete \
 	mixin/desktop-installer \
 	use/vmguest/kvm/x11 use/stage2/kms \
-	use/slinux/mixin-base \
-	use/cleanup/live-no-cleanupdb
+	use/slinux/mixin-base; @:
+	@$(call set,GLOBAL_LIVE_NO_CLEANUPDB,true)
 	@$(call set,KFLAVOURS,std-def)
 	@$(call add,LIVE_LISTS,slinux/live)
 	@$(call add,BASE_PACKAGES,installer-distro-simply-linux-stage3)

features.in/stage2/stage1/modules.d/50-stage2-fs

@@ -4,6 +4,5 @@ ext4.ko
 fat.ko
 mbcache.ko
 ntfs.ko
-fuse.ko
 reiserfs.ko
 vfat.ko

features.in/stage2/stage1/modules.d/50-stage2-usb

@@ -1,8 +1,8 @@
 kernel/drivers/usb/host
 kernel/drivers/usb/storage
 ehci-hcd.ko
-ehci-pci.ko
-ehci-platform.ko
+ehci-pci
+ehci-platform
 ohci-hcd.ko
 uas.ko
 uhci-hcd.ko
@@ -10,4 +10,4 @@ usb-storage.ko
 usbcore.ko
 xhci-hcd.ko
 xhci-pci.ko
-xhci-plat-hcd.ko
+xhci-plat-hcd

features.in/syslinux/cfg.in/10localboot.cfg

@@ -1,4 +1,4 @@
 label harddisk
   menu label ^Boot from hard drive as usual
-  localboot -2
+  localboot 0x80
 

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

@@ -1,7 +1,5 @@
-default linux
-
 label linux
   menu label ^Install @relname@
   kernel alt0/vmlinuz
   append initrd=alt0/full.cz changedisk fastboot automatic=method:cdrom ramdisk_size=@altinst_size@ showopts vga=@bootvga@ @bootargs@
- 
+

features.in/syslinux/generate.mk

@@ -1,7 +1,7 @@
 ifdef BUILDDIR
 
 # in deciseconds
-DEFAULT_TIMEOUT = 600
+DEFAULT_TIMEOUT = 90
 
 # prepare data for syslinux installation;
 # see also stage1/scripts.d/01-syslinux

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

@@ -34,16 +34,6 @@ fi
 grep -hv '^#' .in/[0-9][0-9]*.cfg > "$CFG"
 
 # there should be DEFAULT directive there (at least for alterator-netinst)
-if [ -n "$GLOBAL_SYSLINUX_DEFAULT" ]; then
-	if [ -n "$(grep -i "^label $GLOBAL_SYSLINUX_DEFAULT" "$CFG")" ]; then
-		DEFAULT="$GLOBAL_SYSLINUX_DEFAULT"
-		sed -i '/^default/d'
-		echo "default $DEFAULT" >> "$CFG"
-	else
-		echo "error: $GLOBAL_SYSLINUX_DEFAULT missing in $CFG" >&2
-		exit 1
-	fi
-fi
 if ! grep -i '^default' "$CFG"; then
 	DEFAULT="$(grep -i '^label ' "$CFG" | head -1 | cut -f2 -d' ')"
 	if [ -n "$DEFAULT" ]; then

features.in/uboot/config.mk

@@ -2,25 +2,12 @@ ifeq (,$(filter-out qcow2 qcow2c,$(IMAGE_TYPE)))
 ifeq (,$(filter-out aarch64 armh,$(ARCH)))
 UBOOT_TTY := use/tty/AMA0
 else
-UBOOT_TTY := use/tty/S0
+UBOOT_TTY := /use/tty/S0
 endif
 endif
 
-ifeq (,$(filter-out riscv64,$(ARCH)))
-UBOOT_TTY := use/tty/S0
-endif
-
-ifneq (,$(filter-out i586 x86_64,$(ARCH)))
 use/uboot: use/kernel/initrd-setup $(UBOOT_TTY)
 	@$(call add_feature)
 	@$(call add,THE_LISTS,singleboard-tools)
-ifeq (,$(filter-out aarch64 armh,$(ARCH)))
-	@$(call add,UBOOT_BOOTARGS,cma=192M)
-endif
-ifeq (,$(filter-out riscv64,$(ARCH)))
-	@$(call add,UBOOT_BOOTARGS,earlyprintk debug no_alt_virt_keyboard)
-endif
-	@$(call xport,UBOOT_BOOTARGS)
-else
-use/uboot: ; @:
-endif
+	@$(call try,TTY_DEV,tty1)
+	@$(call xport,TTY_DEV)

features.in/uboot/image-scripts.d/00-uboot-prepare

@@ -1,8 +1,10 @@
 #!/bin/sh
 
-TTY=
-echo $GLOBAL_BASE_BOOTARGS | grep console= ||
-  TTY='console=tty1'
+if [ -n "$GLOBAL_TTY_RATE" ] ;then
+	TTY="$GLOBAL_TTY_DEV","$GLOBAL_TTY_RATE"
+else
+	TTY="$GLOBAL_TTY_DEV"
+fi
 
 # installkernel relies on existing extlinux.conf
 # with filled in `default' label
@@ -11,11 +13,11 @@ cat > /boot/extlinux/extlinux.conf << EOF
 menu title ALTLinux Boot Options
 
 default linux
-timeout 70
+timeout 20
 
 label linux
 	kernel /boot/vmlinuz
 	initrd /boot/initrd.img
 	fdtdir /boot/dtb
-	append root=LABEL=ROOT ro $GLOBAL_BASE_BOOTARGS $GLOBAL_UBOOT_BOOTARGS $TTY
+	append root=LABEL=ROOT ro cma=192M console=$TTY
 EOF

features.in/vmguest/config.mk

@@ -33,8 +33,7 @@ use/vmguest/vmware:
 	@$(call add,THE_PACKAGES,open-vm-tools)
 
 use/vmguest/vmware/x11: use/vmguest/vmware
-	@$(call add,THE_PACKAGES,xorg-drv-vmware xorg-drv-vmmouse)
-	@$(call add,THE_PACKAGES,open-vm-tools-desktop)
+	@$(call add,THE_PACKAGES,xorg-drv-vmware xorg-drv-vmmouse open-vm-tools-desktop)
 
 else
 
@@ -43,22 +42,15 @@ use/vmguest/bare: use/vmguest/kvm; @:
 use/vmguest/base: use/vmguest/bare; @:
 use/vmguest/complete: use/vmguest/base use/vmguest/kvm/x11; @:
 
-use/vmguest/base: use/vmguest/kvm
 endif
 
 else
 
 # kvm-unsupported guest arch
-use/vmguest: ; @:
 use/vmguest/bare: ; @:
 use/vmguest/base: ; @:
 use/vmguest/complete: ; @:
 
-ifeq (,$(filter-out e2k%,$(ARCH)))
-# no kvm before e2kv6 either
-use/vmguest/kvm use/vmguest/kvm/x11: ; @:
-endif
-
 endif
 
 +vmguest: use/vmguest/complete; @:

features.in/wireless/config.mk

@@ -2,7 +2,7 @@
 
 use/wireless:
 	@$(call add_feature)
-	@$(call add,THE_KMODULES,bcmwl rt3070 rtl8192 rtl8723de rtl8821ce rtl8812au staging)
+	@$(call add,THE_KMODULES,bcmwl rt3070 rtl8192 rtl8723de rtl8821ce staging)
 	@$(call add,THE_LISTS,tools/wireless)
 
 use/wireless/full: use/wireless use/kernel/wireless; @:

features.in/x11-vnc/README

@@ -1,4 +0,0 @@
-This feature allows to use X11 through VNC server.  It adds x11vnc package and
-sets default password to alt.  Another thing is that this feature adds dummy
-video adapter configuration to the /etc/X11/xorg.conf.d/. x11vnc becomes
-default service.

features.in/x11-vnc/config.mk

@@ -1,4 +0,0 @@
-use/x11-vnc:
-	@$(call add,THE_PACKAGES,x11vnc x11vnc-service xorg-drv-dummy)
-	@$(call add,DEFAULT_SERVICES_ENABLE,x11vnc)
-	@$(call add_feature)

features.in/x11-vnc/rootfs/image-scripts.d/51-x11-vnc

@@ -1,35 +0,0 @@
-#!/bin/sh
-# setup X11 to use it with a VNC
-
-CFG=/root/.vnc/
-
-[ -d "$CFG" ] || mkdir -p "$CFG"
-
-x11vnc -storepasswd alt "$CFG"/passwd
-
-cat > /etc/X11/xorg.conf.d/51-dummy.conf << EOF
-Section "Device"
-    Identifier "Configured Video Device"
-    Driver "dummy"
-    VideoRam 16384
-EndSection
-
-Section "Monitor"
-    Identifier "Configured Monitor"
-    HorizSync 5.0 - 1000.0
-    VertRefresh 5.0 - 200.0
-EndSection
-
-Section "Screen"
-    Identifier "Default Screen"
-    Monitor "Configured Monitor"
-    Device "Configured Video Device"
-    DefaultDepth 24
-    SubSection "Display"
-        Viewport 0 0
-        Depth 24
-        Virtual 1024 768
-    EndSubSection
-EndSection
-
-EOF

features.in/x11/config.mk

@@ -12,13 +12,13 @@ use/x11:
 	@$(call add,THE_KMODULES,$$(NVIDIA_KMODULES) $$(RADEON_KMODULES))
 	@$(call add,THE_PACKAGES,$$(NVIDIA_PACKAGES) $$(RADEON_PACKAGES))
 
-use/x11/xorg:: use/x11 use/x11/armsoc; @:
-
 # x86: free drivers for various hardware (might lack acceleration)
 ifeq (,$(filter-out i586 x86_64 aarch64,$(ARCH)))
-use/x11/xorg:: use/x11/intel use/x11/nouveau use/x11/radeon use/x11/amdgpu \
+use/x11/xorg: use/x11/intel use/x11/nouveau use/x11/radeon use/x11/amdgpu \
 	use/x11/armsoc
 	@$(call add,THE_LISTS,$(call tags,desktop xorg))
+else
+use/x11/xorg: use/x11; @:
 endif
 
 ifeq (,$(filter-out i586 x86_64,$(ARCH)))
@@ -36,23 +36,6 @@ else
 use/x11/armsoc: use/x11; @:
 endif
 
-ifeq (,$(filter-out e2k%,$(ARCH)))
-# e2k: mostly radeon, 101 got mga2/vivante
-use/x11/xorg:: use/x11/radeon use/x11/amdgpu use/x11/nouveau
-
-ifeq (,$(filter-out e2kv4,$(ARCH)))
-use/x11/mga2: use/x11
-	@$(call add,THE_PACKAGES,xorg-drv-mga2)
-else
-use/x11/mga2: use/x11; @:
-endif
-
-use/x11/smi: use/x11
-	@$(call add,THE_PACKAGES,xorg-drv-smi)
-else
-use/x11/smi: use/x11; @:
-endif
-
 # for those cases when no 3D means no use at all
 # NB: blobs won't Just Work (TM) along with nouveau/radeon
 #     as free drivers get prioritized during autodetection
@@ -94,10 +77,9 @@ use/x11/wacom: use/x11
 	@$(call add,THE_PACKAGES,xorg-drv-wacom)
 
 ## display managers
-use/x11/dm: use/x11-autostart use/pkgpriorities
+use/x11/dm: use/x11-autostart
 	@$(call try,THE_DISPLAY_MANAGER,xdm)
 	@$(call add,THE_PACKAGES,$$(THE_DISPLAY_MANAGER))
-	@$(call add,PINNED_PACKAGES,$$(THE_DISPLAY_MANAGER))
 	@$(call add,DEFAULT_SERVICES_ENABLE,$$(THE_DM_SERVICE))
 
 use/x11/lightdm/gtk use/x11/lightdm/slick \

image.in/functions.mk

@@ -1,9 +1,3 @@
-ifneq (clean,$(MAKECMDGOALS))
-ifneq (distclean,$(MAKECMDGOALS))
-
-ifndef INCLUDED_FUNCTIONS_MK
-INCLUDED_FUNCTIONS_MK = 1
-
 # globals
 PKGDIR ?= $(GLOBAL_BUILDDIR)/pkg
 
@@ -49,7 +43,3 @@ kpackages = $(and $(1), \
 
 # arg: branding subpackages
 branding = $(and $(1),^branding-$(BRANDING)-($(call list2re,$(1)))$$)
-
-endif
-endif
-endif

lib/vm.mk

@@ -11,20 +11,14 @@ vm/.bare: profile/bare
 
 ifeq (,$(filter-out i586 x86_64,$(ARCH)))
 vm/.base-lilo: vm/.bare use/bootloader/lilo; @:
-else
-vm/.base-lilo: vm/.base-grub; @:
 endif
 
 ifeq (,$(filter-out i586 x86_64 ppc64le,$(ARCH)))
 vm/.base-grub: vm/.bare use/bootloader/grub; @:
-else
-vm/.base-grub: vm/.base-grub-efi; @:
 endif
 
-ifeq (,$(filter-out x86_64 aarch64,$(ARCH)))
+ifeq (,$(filter-out i586 x86_64 aarch64,$(ARCH)))
 vm/.base-grub-efi: vm/.bare use/efi/grub; @:
-else
-vm/.base-grub-efi: vm/.bare; @:
 endif
 
 endif