server-v: add kubelet and kube-proxy to autostart

A space in the THE_PACKAGES list makes it impossible to install
the system.

.gear/mkimage-profiles.spec

@@ -1,5 +1,5 @@
 Name: mkimage-profiles
-Version: 1.4.3
+Version: 1.4.2
 Release: alt1
 
 Summary: ALT based distribution metaprofile
@@ -128,23 +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

.gear/tags/4aafcb681460f8deda07a60d983ae8e2d244d4d4

@@ -0,0 +1,6 @@
+object fdd2593977fd8895020972f318dea00d1a135c64
+type commit
+tag v1.4.2
+tagger Anton Midyukov <antohami@altlinux.org> 1598925387 +0700
+
+v1.4.2

.gear/tags/6ad7cb74bf1f73f9b7add9b6d154937799fe261a

@@ -0,0 +1,6 @@
+object 184850dbf74f8446868d48ab7c58a7b09c222153
+type commit
+tag v1.4.1
+tagger Anton Midyukov <antohami@altlinux.org> 1597683435 +0700
+
+v1.4.1

.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/list

@@ -1 +1,2 @@
-c4e7ad4a898add7e4fee4e3dd0c9e5141924974d v1.4.3
+6ad7cb74bf1f73f9b7add9b6d154937799fe261a v1.4.1
+4aafcb681460f8deda07a60d983ae8e2d244d4d4 v1.4.2

bin/tar2fs

@@ -360,13 +360,11 @@ popd
 [ -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)
+	EXTLINUX_CONF="$ROOTFS/boot/extlinux/extlinux.conf"
+	sed -i "s/LABEL=ROOT/$ROOTDEV/g" "$EXTLINUX_CONF"
 	parting set "$ROOTPART" boot on
 	;;
 lilo)

conf.d/alt-server.mk

@@ -63,8 +63,4 @@ 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/education.mk

@@ -32,8 +32,8 @@ 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
+	use/live/repo use/live/x11 use/live/rw
+	@$(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))

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/mixin-basealt.mk

@@ -17,8 +17,7 @@ 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)
@@ -35,8 +34,8 @@ 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 set,GLOBAL_LIVE_NO_CLEANUPDB,true)
 	@$(call add,CONTROL,xdg-user-dirs:enabled)
 	@$(call add,SERVICES_DISABLE,sshd)
 	@$(call add,SERVICES_DISABLE,auditd)
@@ -70,6 +69,7 @@ ifneq (,$(filter-out e2k%,$(ARCH)))
 endif
 	@$(call add,LIVE_PACKAGES,livecd-installer-features)
 	@$(call add,LIVE_PACKAGES,installer-feature-lightdm-stage3)
+	@$(call add,MAIN_LISTS,$(call tags,xorg vaapi))
 	@$(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)
 
@@ -50,11 +50,9 @@ mixin/regular-x11: use/luks use/volumes/regular \
 # 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_PACKAGES,pam-limits-desktop beesu polkit)
+	@$(call add,THE_PACKAGES,alterator-notes dvd+rw-tools)
 	@$(call add,THE_BRANDING,alterator graphics indexhtml)
-ifneq (,$(filter-out e2k%,$(ARCH)))
-	@$(call add,THE_BRANDING,notes)
-endif
 	@$(call add,THE_PACKAGES,$$(THE_IMAGEWRITER))
 	@$(call set,THE_IMAGEWRITER,altmediawriter)
 	@$(call add,THE_PACKAGES,upower bluez udev-rules-rfkill-uaccess)
@@ -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 \

conf.d/p9.mk

@@ -82,22 +82,22 @@ 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

@@ -8,7 +8,7 @@ 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
+mixin/vm-archdep: use/tty/S0
 	@$(call set,KFLAVOURS,un-def)
 else
 mixin/vm-archdep: ; @:
@@ -158,56 +158,56 @@ 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

@@ -73,15 +73,11 @@ distro/.regular-jeos-full: distro/.regular-jeos \
 	use/volumes/jeos use/ntp/chrony use/bootloader/grub +efi
 	@$(call add,BASE_PACKAGES,nfs-utils gdisk)
 	@$(call add,INSTALL2_PACKAGES,fdisk)
-ifeq (,$(filter-out e2k%,$(ARCH)))
-	@$(call add,CLEANUP_PACKAGES,acpid-events-power)
-else
 	@$(call add,MAIN_PACKAGES,firmware-linux)
 	@$(call add,CLEANUP_PACKAGES,libffi 'libltdl*')
 	@$(call add,CLEANUP_PACKAGES,bridge-utils)
-	@$(call set,KFLAVOURS,std-def)
-endif
 	@$(call add,DEFAULT_SERVICES_DISABLE,fbsetfont)
+	@$(call set,KFLAVOURS,std-def)
 	@$(call add,BASE_KMODULES,drm)
 
 # NB:
@@ -114,7 +110,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 +123,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,8 +143,8 @@ 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)
 
@@ -162,7 +160,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 +210,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)
@@ -241,7 +240,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/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; @:

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/browser/config.mk

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

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/e2k/config.mk

@@ -1,5 +1,6 @@
-use/e2k: use/tty/S0 use/l10n/default/ru_RU
+use/e2k: use/tty/S0
 	@$(call add_feature)
+	@$(call add,THE_PACKAGES,pwmd)	# service disabled by default
 	@$(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)
@@ -12,9 +13,6 @@ use/e2k: use/tty/S0 use/l10n/default/ru_RU
 	@$(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)
 
@@ -24,7 +22,7 @@ use/e2k/x11: use/e2k use/x11
 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))
+	@$(call add,MAIN_GROUPS,$(addprefix x-e2k/,e101-modesetting e101-mga2))
 
 use/e2k/multiseat/801/base:
 	@$(call add,INSTALL2_PACKAGES,installer-feature-e2k-801-multiseat)

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 +1,7 @@
 #!/bin/sh
 # borrowed from installer-feature-local-clock
 
+. install2-init-functions
 . shell-config
 
 shell_config_set /etc/sysconfig/clock UTC true

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/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/install2/config.mk

@@ -125,11 +125,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)
@@ -67,7 +62,7 @@ endif
 ifneq (,$(filter-out e2k% riscv64,$(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)
 ifeq (,$(filter-out ppc64le,$(ARCH)))
 	@$(call add,VM_INITRDMODULES,ipr ibmvscsi)

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))
 
@@ -95,13 +91,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/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/oem/config.mk

@@ -7,13 +7,9 @@ use/oem: use/services use/branding
 	@$(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

@@ -9,9 +9,4 @@ TARGET=/lib/systemd/system/$GLOBAL_OEM_TARGET.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/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/slinux/config.mk

@@ -101,8 +101,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/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; @:

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

main.mk

@@ -63,7 +63,7 @@ DISTROS := $(call addsuffices,$(DISTRO_EXTS),$(DISTRO_TARGETS))
 VES     := $(call addsuffices,$(VE_EXTS),$(VE_TARGETS))
 VES_TAR := $(call addsuffices,.tar,$(VE_TARGETS))
 VMS     := $(call addsuffices,$(VM_EXTS),$(VM_TARGETS)) \
- $(call addsuffices,$(VM_TAVOLGA_EXTS), $(filter vm/%-tavolga, $(VM_TARGETS)))
+ $(call addsuffices,$(VM_TAVOLGA_EXTS), $(filter vm/tavolga-%, $(VM_TARGETS)))
 VMS_IMG := $(call addsuffices,.img,$(VM_TARGETS))
 IMAGES  := $(DISTROS) $(VES) $(VMS)
 

pkg.in/groups/kworkstation/clients-ad.directory

@@ -1,11 +0,0 @@
-[Desktop Entry]
-Type=Directory
-X-Alterator-PackageList=kworkstation/clients-ad
-X-Alterator-Required=no
-X-Alterator-Parent=kworkstation/z01-add-clients
-Categories=KDE;GNOME;XFCE
-
-Name=Active Directory
-Name[ru_RU]=Активный каталог
-Comment=Active Directory client.
-Comment[ru_RU]=Клиент службы каталогов Active Directory.

pkg.in/groups/kworkstation/clients-backup.directory

@@ -1,11 +0,0 @@
-[Desktop Entry]
-Type=Directory
-X-Alterator-PackageList=kworkstation/clients-backup
-X-Alterator-Required=no
-X-Alterator-Parent=kworkstation/z01-add-clients
-Categories=KDE;GNOME;XFCE
-
-Name=Backup
-Name[ru_RU]=Резервное копирование
-Comment=Data backup services clients.
-Comment[ru_RU]=Клиенты резервного копирования данных.

pkg.in/groups/kworkstation/clients-cloud.directory

@@ -1,11 +0,0 @@
-[Desktop Entry]
-Type=Directory
-X-Alterator-PackageList=kworkstation/clients-cloud
-X-Alterator-Required=no
-X-Alterator-Parent=kworkstation/z01-add-clients
-Categories=KDE;GNOME;XFCE
-
-Name=Clouds
-Name[ru_RU]=Облака
-Comment=Cloud data services clients.
-Comment[ru_RU]=Клиенты облачных сервисов хранения данных.

pkg.in/groups/kworkstation/clients-ipa.directory

@@ -1,11 +0,0 @@
-[Desktop Entry]
-Type=Directory
-X-Alterator-PackageList=kworkstation/clients-ipa
-X-Alterator-Required=no
-X-Alterator-Parent=kworkstation/z01-add-clients
-Categories=KDE;GNOME;XFCE
-
-Name=ALT domain (IPA)
-Name[ru_RU]=Домен Альт (IPA)
-Comment=FreeIPA client for ALT domain.
-Comment[ru_RU]=FreeIPA-клиент домена Альт.

pkg.in/groups/kworkstation/clients-monitor.directory

@@ -1,11 +0,0 @@
-[Desktop Entry]
-Type=Directory
-X-Alterator-PackageList=kworkstation/clients-monitor
-X-Alterator-Required=no
-X-Alterator-Parent=kworkstation/z01-add-clients
-Categories=KDE;GNOME;XFCE
-
-Name=Мonitoring
-Name[ru_RU]=Наблюдение
-Comment=Monitoring systems clients.
-Comment[ru_RU]=Клиенты систем мониторинга.

pkg.in/groups/kworkstation/edu.directory

@@ -1,10 +0,0 @@
-[Desktop Entry]
-Type=Directory
-Name=Edutainment
-Comment=Edutainment applications.
-X-Alterator-PackageList=kworkstation/edu
-X-Alterator-Required=no
-Categories=KDE;
-
-Name[ru_RU]=Образование
-Comment[ru_RU]=Образовательные приложения.

pkg.in/groups/kworkstation/emulators.directory

@@ -1,11 +0,0 @@
-[Desktop Entry]
-Type=Directory
-Name=Emulators
-Comment=Support the use of applications designed for other operating systems and computer architectures. For example, 32-bit programs in a 64-bit environment.
-X-Alterator-PackageList=kworkstation/emulators
-X-Alterator-Required=yes
-X-Alterator-Conflicts=wine-local
-Categories=KDE;GNOME;
-
-Name[ru_RU]=Эмуляторы
-Comment[ru_RU]=Поддержка использования приложений, предназначенных для других операционных систем и компьютерных архитектур. Например, 32-битные программы в 64-битной среде.

pkg.in/groups/kworkstation/games.directory

@@ -1,10 +0,0 @@
-[Desktop Entry]
-Type=Directory
-Name=Games
-Comment=Games сollection.
-X-Alterator-PackageList=kworkstation/games
-X-Alterator-Required=no
-Categories=KDE;GNOME;
-
-Name[ru_RU]=Игры
-Comment[ru_RU]=Сборник игр.

pkg.in/groups/kworkstation/graphics-editing.directory

@@ -1,10 +0,0 @@
-[Desktop Entry]
-Type=Directory
-Name=Graphics editing
-Comment=Graphics editing applications.
-X-Alterator-PackageList=kworkstation/graphics-editing
-X-Alterator-Required=yes
-Categories=KDE;GNOME
-
-Name[ru_RU]=Обработка графики
-Comment[ru_RU]=Приложения для обработки графических изображений.

pkg.in/groups/kworkstation/kde5.directory

@@ -1,10 +0,0 @@
-[Desktop Entry]
-Type=Directory
-Name=K Desktop Environment (recommended)
-Comment=Main KDE components, without which it may be difficult to work with the system.
-X-Alterator-PackageList=kworkstation/kde5
-X-Alterator-Required=yes
-Categories=KDE;
-
-Name[ru_RU]=Графическое окружение KDE (рекомендуется)
-Comment[ru_RU]=Основные компоненты графического окружения KDE, без которых может быть затруднена работа с системой.

pkg.in/groups/kworkstation/printing.directory

@@ -1,10 +0,0 @@
-[Desktop Entry]
-Type=Directory
-Name=Printing
-Comment=Applications and drivers for printing devices support.
-X-Alterator-PackageList=kworkstation/printing
-X-Alterator-Required=yes
-Categories=KDE;
-
-Name[ru_RU]=Поддержка принтеров
-Comment[ru_RU]=Приложения и драйвера для поддержки работы с устройствами печати.

pkg.in/groups/kworkstation/publishing.directory

@@ -1,10 +0,0 @@
-[Desktop Entry]
-Type=Directory
-Name=Publishing
-Comment=Desktop publishing applications.
-X-Alterator-PackageList=kworkstation/publishing
-X-Alterator-Required=no
-Categories=KDE;GNOME;
-
-Name[ru_RU]=Издательская система
-Comment[ru_RU]=Приложения для визуальной вёрстки документов.

pkg.in/groups/kworkstation/remote-desktop.directory

@@ -1,10 +0,0 @@
-[Desktop Entry]
-Type=Directory
-Name=Remote Desktop
-Comment=Remote desktop support applications.
-X-Alterator-PackageList=kworkstation/remote-desktop
-X-Alterator-Required=no
-Categories=KDE;
-
-Name[ru_RU]=Сетевой рабочий стол
-Comment[ru_RU]=Приложения для поддержки работы с сетевым рабочим столом.

pkg.in/groups/kworkstation/scanning.directory

@@ -1,10 +0,0 @@
-[Desktop Entry]
-Type=Directory
-Name=Scanning
-Comment=Applications and drivers for images scanning devices support.
-X-Alterator-PackageList=kworkstation/scanning
-X-Alterator-Required=yes
-Categories=KDE;GNOME;XFCE;
-
-Name[ru_RU]=Поддержка сканеров
-Comment[ru_RU]=Приложения и драйвера для поддержки работы с устройствами сканирования изображений

pkg.in/groups/kworkstation/sound-editing.directory

@@ -1,10 +0,0 @@
-[Desktop Entry]
-Type=Directory
-Name=Sound editing
-Comment=Sound editing applications.
-X-Alterator-PackageList=kworkstation/sound-editing
-X-Alterator-Required=yes
-Categories=KDE;GNOME;XFCE;
-
-Name[ru_RU]=Обработка звука
-Comment[ru_RU]=Приложения для обработки звуковых материалов.

pkg.in/groups/kworkstation/video-editing.directory

@@ -1,10 +0,0 @@
-[Desktop Entry]
-Type=Directory
-Name=Video editing
-Comment=Video editing applications.
-X-Alterator-PackageList=kworkstation/video-editing
-X-Alterator-Required=yes
-Categories=KDE;
-
-Name[ru_RU]=Обработка видео
-Comment[ru_RU]=Приложения для обработки видеоматериалов.

pkg.in/groups/kworkstation/z01-add-clients.directory

@@ -1,10 +0,0 @@
-[Desktop Entry]
-Type=Directory
-X-Alterator-Required=no
-X-Alterator-PackageList=kworkstation/clients-base
-Categories=KDE;
-
-Name=Service clients
-Name[ru_RU]=Клиенты сервисов
-Comment=Additional services clients.
-Comment[ru_RU]=Дополнительные клиенты различных сервисов.

pkg.in/lists/centaurus/buildsystem

@@ -1,3 +1,2 @@
 build-environment@X86
-hasher
 mkimage

pkg.in/lists/education/base

@@ -214,12 +214,6 @@ menulibre
 mugshot
 xfce-polkit
 
-# New utilites
-disable-usb-autosuspend
-color-prompt-and-man
-shutter
-screenkey
-
 # Virtualization support
 xorg-drv-vmware@X86
 xorg-drv-vmmouse@X86
@@ -251,5 +245,3 @@ vlan-utils
 
 alterator-gpupdate
 adp
-
-rtc@E2K

pkg.in/lists/education/secondary_vocational

@@ -9,7 +9,6 @@ qt-creator-doc
 cmake
 ninja-build
 qt5-base-devel
-qt5-base-doc
 # Eclipse
 # Texmacs
 logisim

pkg.in/lists/education/university

@@ -5,7 +5,6 @@ qt-creator-doc
 cmake
 ninja-build
 qt5-base-devel
-qt5-base-doc
 # Eclipse
 gambas-full@X86
 swi-prolog

pkg.in/lists/engineering/2d-cad

@@ -1,5 +1,6 @@
 # 2D CAD (Computer Aided Design)
 librecad
 qcad
+qcad-partlibrary
 solvespace
 qelectrotech

pkg.in/lists/kworkstation/clients-ad

@@ -1,8 +0,0 @@
-libwbclient
-task-auth-ad-sssd
-kde5-autofs-shares
-krb5-ticket-watcher
-usbguard
-usbguard-dbus
-task-auth-ldap-sssd
-alterator-gpupdate

pkg.in/lists/kworkstation/clients-backup

@@ -1,3 +0,0 @@
-bacula9-client
-#alterator-bacula-client
-timeshift

pkg.in/lists/kworkstation/clients-cloud

@@ -1,2 +0,0 @@
-owncloud-client-kde5
-seafile-client

pkg.in/lists/kworkstation/clients-ipa

@@ -1,9 +0,0 @@
-task-auth-freeipa
-installer-feature-sudo-enable-by-default-stage3
-#installer-feature-sudo-enable-by-default-kde5su-stage3
-kde5-autofs-shares
-krb5-ticket-watcher
-usbguard
-usbguard-dbus
-task-auth-ldap-sssd
-alterator-gpupdate

pkg.in/lists/kworkstation/clients-monitor

@@ -1,2 +0,0 @@
-zabbix-agent
-alterator-zabbix-agent

pkg.in/lists/kworkstation/disk-install

@@ -1,29 +0,0 @@
-# R7 Office
-libGConf
-fonts-ttf-liberation
-# CryptoPRO
-cryptopro-preinstall-full
-cryptopro-preinstall
-gnupg-pkcs11-scd
-libpkcs11-helper
-gnupg2
-# 1C
-1c-preinstall
-# FSIN
-openssh-gostcrypto
-openssh-clients-gostcrypto openssh-askpass-common-gostcrypto
-openssh-server-gostcrypto openssh-server-control-gostcrypto
-openssh-common-gostcrypto
-#
-openvpn-gostcrypto openvpn-plugins-gostcrypto alterator-openvpn-server
-#
-freeipa-server freeipa-server-dns
-#
-alt-customize-branding
-task-samba-dc bind-utils tdb-utils installer-feature-sambaDC-stage3
-#
-alterator-kiosk
-#
-# MISC
-#kde5-maxi
-exim

pkg.in/lists/kworkstation/edu

@@ -1,7 +0,0 @@
-kde5-edu
-kumir
-#stellarium
-gcompris-qt
-tuxpaint
-tuxpaint-stamps
-tuxmath

pkg.in/lists/kworkstation/emulators

@@ -1,12 +0,0 @@
-libnss-mdns@IA32
-libnss-myhostname@IA32
-xorg-dri-*@IA32
-
-wine-mono
-wine-gecko
-winetricks
-wine-vanilla@IA32
-libwine-vanilla-gl@IA32
-libwine-vanilla-twain@IA32
-
-virtualbox@x86_64

pkg.in/lists/kworkstation/games

@@ -1,19 +0,0 @@
-#kde5-games
-kde5-kmines
-kde5-lskat
-kde5-kpat
-kde5-kmahjongg
-
-knights
-#frozen-bubble
-#freeciv
-kcheckers
-#lbreakout2
-#openpref
-#pingus
-#supertux2
-#tuxkart
-##xmoto
-
-libtxc_dxtn@IA32
-steam

pkg.in/lists/kworkstation/graphics-editing

@@ -1,18 +0,0 @@
-gimp
-gimp-help-ru
-#gimp-help-en
-gimp-plugin-gutenprint
-#gimp-plugin-separateplus
-gimp-script-ISONoiseReduction
-gimp-plugin-ufraw
-#darktable
-inkscape
-hugin
-
-kde5-digikam
-kde5-kipi-plugins
-
-# 3D
-blender
-#blender-i18n
-#blender-docs

pkg.in/lists/kworkstation/kde5

@@ -1,81 +0,0 @@
-
-pam0_kwallet5
-
-catdoc
-libnss-mdns
-fuse-cryfs
-
-pinentry-qt5
-quick-usb-formatter
-rosa-imagewriter
-#
-gparted
-#
-kde5-ksystemlog
-kde5-kcm-grub2
-synaptic-kde
-#plasma5-discover-maxi
-plasma5-discover
-plasma5-discover-flatpak
-plasma5-discover-fwupd
-apt-indicator
-openssl-gost-engine
-kde5-kreslimit
-kde5-file-actions-gost
-
-#altlinux-freedesktop-menu-nested-menu
-
-chromium-gost
-#chromium-ublock_origin
-ppapi-plugin-adobe-flash
-
-qmmp1
-qmmp-skins
-
-kde5-big
-
-samba
-# system-config-samba
-
-kde5-telepathy
-kde5-konversation
-choqok
-#ring-client-kde5
-kde5-connect
-
-isomaster
-kde5-k3b
-fbreader
-#kde5-basket
-kmymoney
-kmymoney-i18n
-#kde5-plasma-yawp
-
-qstardict
-stardict-mueller7
-stardict-slovnyk_en-ru
-stardict-slovnyk_ru-en
-#stardict-slovnyk_en-uk
-#stardict-slovnyk_uk-en
-stardict-wn
-
-hunspell-ru-lebedev
-#hunspell-uk
-
-#LibreOffice-still
-LibreOffice-still-mimetypes
-LibreOffice-still-integrated
-LibreOffice-still-kde5
-LibreOffice-still-langpack-ru
-#LibreOffice-still-langpack-tt
-#LibreOffice-still-langpack-uk
-#^docs-ooo_infra_.*
-
-kamoso
-
-kde5-ktorrent
-#eiskaltdcpp-qt
-kde5-kio-gdrive
-
-# 3dparty
-#skype-preinstall@IA32

pkg.in/lists/kworkstation/kde5-base

@@ -1,125 +0,0 @@
-
-firmware-alsa-sof
-
-gst-plugins-good1.0-qt5
-pavucontrol
-
-alt-kworkstation-addon
-alterator-standalone
-alterator-auth
-alterator-control
-#alterator-controlpp
-alterator-datetime
-state-change-notify-postfix
-alterator-fbi
-alterator-groups
-alterator-limits
-alterator-logs
-alterator-net-iptables
-alterator-net-openvpn
-alterator-net-routing
-alterator-net-shares
-alterator-notes
-alterator-quota
-alterator-secsetup
-alterator-services
-alterator-sysconfig
-alterator-updates
-alterator-x11
-alterator-xkb
-alterator-zram-swap
-
-wireless-tools
-rfkill
-wpa_supplicant
-ppp-pppoe
-
-apt-https
-apt-rsync
-apt-repo
-arj
-audit
-avahi-daemon
-bash-completion
-bc
-bind-utils
-bridge-utils
-cpufreq-simple
-cifs-utils
-curl
-ddcprobe
-dmidecode
-easy-rsa
-etcnet-full
-fdisk
-fuse-exfat
-gpm
-hdparm
-ipcalc
-jfsutils
-libproxy-kde
-libva-utils
-lsb-release
-lsblk
-lshw
-mc-full
-make-initrd-lvm
-make-initrd-ucode
-man-pages-ru
-mtr
-nano-editor
-net-tools
-netcat
-netlist
-nfs-clients
-pciutils
-pcmciautils
-pinfo
-pm-utils
-pulseaudio-bluez
-quota
-rpminstall
-rng-tools
-screen
-smartmontools
-strace
-sudo
-system-report
-systemd-analyze
-tcpdump
-udev-android
-udev-rule-generator-cdrom
-udev-rules-ioschedulers
-update-kernel
-usb-modeswitch
-usbutils
-#userpasswd
-vim-console
-wget
-xinput
-xfsprogs
-xorg-conf-synaptics
-xorg-conf-libinput-touchpad
-
-ocl-nvidia
-libva-driver-intel
-libva-intel-media-driver@x86_64
-#libva-driver-vdpau
-#libvdpau-va-gl
-
-chromium-gost
-
-openvpn-gostcrypto
-kde5-network-manager-etcnet
-openssh openssh-clients openssh-askpass-common openssh-server openssh-common openssh-server-control
-kde5-network-manager-nm
-kde5-video-player-smplayer
-kde5-audio-player-qmmp
-kde5-small
-plasma5-kscreen
-
-alt-app-starter
-
-# GTK2/GTK3 theme
-gtk3-theme-breeze
-gtk2-theme-breeze

pkg.in/lists/kworkstation/live-rescue

@@ -1,15 +0,0 @@
-
-kde5-plasma-applet-places-widget
-
-kamoso
-plasma5-kinfocenter
-plasma5-bluedevil
-kde5-khelpcenter
-kde5-filelight
-kde5-spectacle
-glxgears
-efivar
-sos
-system-report
-startup-rescue
-qt-fsarchiver

pkg.in/lists/kworkstation/printing

@@ -1,15 +0,0 @@
-kde5-printing
-
-cups
-cups-ppd
-samba-client-cups
-printer-drivers-base
-printer-drivers-X11
-hplip-hpijs
-hplip-PPDs
-printer-testpages
-
-bluez-cups
-
-system-config-printer-lib
-#system-config-printer

pkg.in/lists/kworkstation/publishing

@@ -1,2 +0,0 @@
-scribus
-#docs-scribus_intro

pkg.in/lists/kworkstation/remote-desktop

@@ -1,4 +0,0 @@
-kde5-krfb
-kde5-krdc
-
-rdesktop

pkg.in/lists/kworkstation/scanning

@@ -1,9 +0,0 @@
-kde5-scanning
-
-tesseract-langpack-en
-tesseract-langpack-ru
-#tesseract-langpack-uk
-gimagereader-qt5
-hplip-sane
-libsane-gphoto2
-sane-airscan

pkg.in/lists/kworkstation/sound-editing

@@ -1,5 +0,0 @@
-kde5-soundkonverter
-kde5-kid3
-flacon
-
-kde5-kwave

pkg.in/lists/kworkstation/video-editing

@@ -1,4 +0,0 @@
-kdenlive
-
-avidemux-qt
-simplescreenrecorder

pkg.in/lists/openssh

@@ -1,5 +1,3 @@
-openssh
 openssh-server
-openssh-server-control
 openssh-blacklist
 openssh-clients

pkg.in/lists/tagged/base+network

@@ -1,3 +1,2 @@
 etcnet
 dhcpcd
-dhcp-client

pkg.in/lists/tagged/base+tablet

@@ -19,7 +19,6 @@ tzdata
 
 etcnet
 dhcpcd
-dhcp-client
 
 openssh
 openssh-blacklist

pkg.in/lists/tagged/rescue+x11

@@ -1,13 +1,17 @@
 # mostly X11 counterparts/GUIs to some rescue+extra packages
+autopsy
 binwalk
 dissy@X86
 dsniff-X11@X86
 dvdisaster
 extract
+gksu
 gparted
+gsmartcontrol
 jhead
 hardinfo@X86
 ht
 libpst-tools
 qt-fsarchiver@X86
+recoll-full@X86
 recoverjpeg

pkg.in/lists/tagged/rescue+x11+extra

@@ -1,4 +0,0 @@
-# This package did not like zerg@
-autopsy
-gsmartcontrol
-recoll-full@X86

pkg.in/lists/tagged/security+extra

@@ -15,3 +15,6 @@ osec-mailreport
 
 # hardware reliability
 mcelog@X86
+
+# networking
+chaosreader

pkg.in/lists/tagged/xorg+vaapi

@@ -1,5 +1,4 @@
 # NB: these might hurt each other, for MAIN_LISTS
 libva-driver-intel@X86
 libva-intel-media-driver@X86
-libva-utils
 #xvba-video

pkg.in/lists/virt/extra.pkgs

@@ -4,6 +4,11 @@ kernel-modules-ipset-std-def
 kernel-modules-xtables-addons-std-def
 kernel-modules-kvdo-std-def
 kernel-modules-zfs-std-def
+kernel-headers-un-def
+kernel-headers-modules-un-def
+kernel-modules-xtables-addons-un-def
+kernel-modules-kvdo-un-def
+kernel-modules-zfs-un-def
 zfs-utils
 ocfs2-tools
 vdo

pkg.in/lists/virt/pve

@@ -1,7 +1,21 @@
 pve-manager
+pve-common
+pve-container
+pve-docs
+pve-firewall
+pve-guest-common
+pve-ha-manager
+pve-http-server
+pve-lxc
+pve-novnc
+pve-qemu-aux
+pve-qemu-common
+pve-qemu-img
+pve-qemu-server
+pve-qemu-system
+pve-spiceterm
+pve-storage
+pve-vncterm
+pve-xtermjs
 postfix
 control-sshd-permit-root-login
-kernel-modules-ipset-std-def
-kernel-modules-xtables-addons-std-def
-kernel-modules-zfs-std-def
-zfs-utils

pkg.in/lists/x-e2k/x-autologin

@@ -1,2 +1 @@
 installer-feature-lightdm-multiseat-autologin-stage3
-setup-multiseat-autologin