drop set specified KFLAVOURS (std-def or un-def) everything

conf.d/education.mk

@@ -181,17 +181,14 @@ ifeq (,$(filter-out e2k%,$(ARCH)))
 else
 	@$(call add,MAIN_GROUPS,education/06_kde5)
 endif	# e2k%
-ifeq (,$(filter-out i586 x86_64 aarch64,$(ARCH)))
-ifneq (,$(filter-out sisyphus,$(BRANCH)))
-	@$(call set,KFLAVOURS,std-def un-def)
-endif
+ifeq (,$(filter-out x86_64,$(ARCH)))
 	@$(call add,THE_KMODULES,virtualbox)
+endif
 	@$(call add,THE_KMODULES,lsadrv bbswitch)
 	@$(call add,THE_KMODULES,staging)
 	@$(call add,MAIN_KMODULES,bbswitch)
 	@$(call add,THE_PACKAGES,mc-full)
 	@$(call add,THE_PACKAGES,remmina remmina-plugins)
-endif
 ifeq (,$(filter-out i586 x86_64,$(ARCH)))
 	@$(call add,THE_PACKAGES,syslinux)
 	@$(call add,MAIN_PACKAGES,owamp-server)

conf.d/kworkstation.mk

@@ -211,18 +211,6 @@ distro/kworkstation-live: \
 	mixin/kworkstation-common-opts \
 	mixin/kworkstation-live-opts
 
-distro/kworkstation-install-undef: \
-	distro/kworkstation-install; @:
-ifneq (,$(filter-out sisyphus,$(BRANCH)))
-	@$(call set,KFLAVOURS,un-def)
-endif
-
-distro/kworkstation-live-undef: \
-	distro/kworkstation-live; @:
-ifneq (,$(filter-out sisyphus,$(BRANCH)))
-	@$(call set,KFLAVOURS,un-def)
-endif
-
 mixin/kworkstation-fsin-opts:
 	@$(call add,THE_PACKAGES,libwbclient task-auth-ad-sssd)
 	@$(call add,THE_PACKAGES,task-auth-freeipa task-auth-ldap-sssd)
@@ -237,8 +225,7 @@ mixin/kworkstation-fsin-opts:
 
 distro/kworkstation-install-fsin: \
 	distro/kworkstation-install \
-	mixin/kworkstation-fsin-opts
-	@$(call set,KFLAVOURS,std-def)
+	mixin/kworkstation-fsin-opts; @:
 
 endif
 

conf.d/live.mk

@@ -29,9 +29,6 @@ distro/grub-net-install: distro/.base +efi +vmguest \
 ifeq (,$(filter-out i586 x86_64,$(ARCH)))
 	@$(call set,BOOTLOADER,grubpcboot)
 endif
-ifneq (,$(filter-out sisyphus,$(BRANCH)))
-	@$(call set,KFLAVOURS,un-def std-def)
-endif
 	@$(call set,GRUB_DEFAULT,network)
 	@$(call set,LOCALES,en_US ru_RU pt_BR)
 endif

conf.d/mixin-alt-server.mk

@@ -40,9 +40,6 @@ ifeq (,$(filter-out i586 x86_64,$(ARCH)))
 endif
 	@$(call add,THE_BRANDING,alterator)
 ifeq (,$(filter-out i586 x86_64 aarch64,$(ARCH)))
-ifneq (,$(filter-out sisyphus,$(BRANCH)))
-	@$(call set,KFLAVOURS,std-def un-def)
-endif
 	@$(call add,LIVE_PACKAGES,installer-feature-cleanup-kernel-stage3)
 	@$(call add,LIVE_PACKAGES,ntfs-3g)
 	@$(call add,BASE_KMODULES,drm)

conf.d/mixin.mk

@@ -41,9 +41,6 @@ mixin/vm-archdep:: use/auto-resize; @:
 
 ifeq (,$(filter-out i586 x86_64 aarch64,$(ARCH)))
 mixin/vm-archdep:: +efi
-ifeq (,$(filter-out p10 p11 c10%,$(BRANCH)))
-	@$(call set,KFLAVOURS,un-def)
-endif
 endif
 
 ifeq (,$(filter-out armh aarch64,$(ARCH)))

conf.d/mobile.mk

@@ -60,9 +60,6 @@ ifeq (sisyphus,$(BRANCH))
 endif
 
 vm/alt-mobile-phosh-def: vm/.phosh mixin/uboot-extlinux-efi use/tty/S0; @:
-ifneq (,$(filter-out sisyphus,$(BRANCH)))
-	@$(call set,KFLAVOURS,un-def)
-endif
 
 ifeq (aarch64,$(ARCH))
 mixin/mobile-pine: mixin/uboot-extlinux use/tty/S2

conf.d/regular.mk

@@ -102,7 +102,7 @@ distro/.regular-jeos: distro/.regular-jeos-base \
 
 distro/.regular-jeos-full: distro/.regular-jeos \
 	use/volumes/regular use/ntp/chrony use/bootloader/grub \
-	use/grub/localboot_bios.cfg use/kernel/latest +efi
+	use/grub/localboot_bios.cfg +efi
 	@$(call add,BASE_PACKAGES,nfs-utils gdisk)
 	@$(call add,INSTALL2_PACKAGES,fdisk)
 	@$(call add,INSTALL2_PACKAGES,btrfs-progs)
@@ -141,11 +141,11 @@ distro/.regular-install-x11-systemd: distro/.regular-install-x11 \
 	@$(call add,DEFAULT_SERVICES_ENABLE,bluetoothd)
 
 distro/regular-icewm: distro/.regular-desktop use/x11/lightdm/gtk \
-	mixin/regular-icewm use/kernel/latest
+	mixin/regular-icewm
 	@$(call add,THE_PACKAGES,icewm-startup-polkit-gnome)
 
 distro/regular-icewm-sysv: distro/.regular-desktop-sysv mixin/regular-icewm \
-	use/live/autologin use/kernel/latest
+	use/live/autologin
 	@$(call add,LIVE_PACKAGES,wdm)
 
 # wdm can't do autologin so add standalone one for livecd
@@ -161,17 +161,12 @@ distro/regular-gnustep: distro/.regular-desktop use/x11/lightdm/gtk \
 	@$(call add,THE_PACKAGES,wmaker-autostart-polkit-gnome)
 
 distro/regular-xfce: distro/.regular-gtk mixin/regular-xfce; @:
-ifneq (,$(filter-out sisyphus,$(BRANCH)))
-ifeq (,$(filter-out i586 x86_64 aarch64,$(ARCH)))
-	@$(call set,KFLAVOURS,std-def un-def)
-endif
-endif
 
 distro/regular-xfce-install: distro/.regular-install-x11-systemd \
 	mixin/regular-xfce; @:
 
 distro/regular-gnome-install: distro/.regular-install-x11-systemd mixin/regular-gnome \
-	use/kernel/latest +plymouth; @:
+	+plymouth; @:
 
 distro/regular-lxde: distro/.regular-desktop use/x11/lightdm/gtk \
 	mixin/regular-lxde; @:
@@ -184,13 +179,8 @@ distro/regular-cinnamon: distro/.regular-gtk mixin/regular-cinnamon; @:
 
 # not .regular-gtk due to gdm vs lightdm
 distro/regular-gnome: distro/.regular-desktop mixin/regular-gnome \
-	use/kernel/latest +plymouth use/browser/epiphany \
+	+plymouth use/browser/epiphany \
 	use/live-install/vnc/listen; @:
-ifneq (,$(filter-out sisyphus,$(BRANCH)))
-ifeq (,$(filter-out x86_64 aarch64,$(ARCH)))
-	@$(call set,KFLAVOURS,std-def un-def)
-endif
-endif
 
 distro/regular-lxqt: distro/.regular-gtk mixin/regular-lxqt +plymouth; @:
 
@@ -202,14 +192,14 @@ distro/regular-kde: distro/.regular-desktop +nm \
 distro/regular-rescue: distro/.regular-base mixin/regular-rescue use/rescue/rw \
 	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 add,RESCUE_PACKAGES,gpm livecd-net-eth)
 #	@$(call add,RESCUE_LISTS,$(call tags,base bench))
 	@$(call add,RESCUE_LISTS,$(call tags,network security))
 
 distro/regular-rescue-live: distro/.regular-base +systemd \
 	use/live/rescue/extra use/live/rescue/rw \
-	use/stage2/kms use/hdt use/kernel/latest use/firmware/full \
+	use/stage2/kms use/hdt use/firmware/full \
 	use/net/etcnet use/net/dhcp use/live/repo +wireless \
 	use/syslinux/sdab.cfg use/grub/sdab_bios.cfg
 	@$(call add,LIVE_PACKAGES,livecd-net-eth)
@@ -262,11 +252,6 @@ distro/.regular-builder: distro/.regular-base mixin/regular-builder \
 distro/regular-builder: distro/.regular-builder +systemd +nm \
 	use/dev/builder/live/systemd
 	@$(call add,THE_PACKAGES,NetworkManager-tui)
-ifneq (,$(filter-out sisyphus,$(BRANCH)))
-ifeq (,$(filter-out x86_64 aarch64,$(ARCH)))
-	@$(call set,KFLAVOURS,un-def)
-endif
-endif
 
 # old regular-builder
 distro/regular-builder-sysv: distro/.regular-builder +sysvinit \

features.in/kernel/config.mk

@@ -23,13 +23,6 @@ endif
 endif
 	@$(call xport,KFLAVOURS)
 
-use/kernel/latest: use/kernel; @:
-ifeq (,$(filter-out aarch64 armh i586 ppc64le x86_64,$(ARCH)))
-ifneq (,$(filter-out sisyphus,$(BRANCH)))
-	@$(call set,KFLAVOURS,un-def)
-endif
-endif
-
 # r8168 is a kludge, never install it by default
 use/kernel/net:
 	@$(call add,THE_KMODULES,r8125)

features.in/server/config.mk

@@ -16,9 +16,6 @@ use/server/mini: use/server/base use/services/lvm2-disable
 
 use/server/virt: use/server use/kernel
 	@$(call add,BASE_PACKAGES,openssh)
-ifneq (,$(filter-out sisyphus,$(BRANCH)))
-	@$(call set,KFLAVOURS,un-def)
-endif
 
 # NB: examine zabbix-preinstall package, initialization is NOT automatic!
 use/server/zabbix: use/server use/services use/control

features.in/slinux/config.mk

@@ -63,9 +63,6 @@ endif
 ifeq (,$(filter-out riscv64,$(ARCH)))
 use/slinux/vm-base:: use/oem/vnc
 	@$(call add,THE_PACKAGES,xfce-reduced-resource)
-ifneq (,$(filter-out sisyphus,$(BRANCH)))
-	@$(call set,KFLAVOURS,un-def)
-endif
 endif
 
 use/slinux/mixin-base: use/slinux \
@@ -90,11 +87,6 @@ use/slinux/mixin-base: use/slinux \
 ifeq (,$(filter-out e2k%,$(ARCH)))
 	@$(call add,THE_LISTS,$(call tags,xscreensaver && (base || desktop)))
 endif
-ifneq (,$(filter-out sisyphus,$(BRANCH)))
-ifeq (,$(filter-out aarch64 i586 x86_64,$(ARCH)))
-	@$(call set,KFLAVOURS,std-def)
-endif
-endif
 
 use/slinux/live: use/live/x11 use/live/rw \
 	use/live/repo \
@@ -124,11 +116,6 @@ endif
 	@$(call add,STAGE2_PACKAGES,btrfs-progs)
 
 use/slinux/full: use/slinux/base
-ifeq (,$(filter-out x86_64,$(ARCH)))
-ifneq (,$(filter-out sisyphus,$(BRANCH)))
-	@$(call set,KFLAVOURS,un-def std-def)
-endif
-endif
 	@$(call add,MAIN_LISTS,slinux/not-install-full)
 	@$(call add,THE_LISTS,slinux/misc-full)
 ifeq (,$(filter-out i586 x86_64,$(ARCH)))