mixin.mk, regular.mk: do not set KFLAVOURS by default for sisyphus

conf.d/mixin.mk

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

conf.d/regular.mk

@@ -164,9 +164,11 @@ 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; @:
@@ -187,9 +189,11 @@ distro/regular-cinnamon: distro/.regular-gtk mixin/regular-cinnamon; @:
 distro/regular-gnome: distro/.regular-desktop mixin/regular-gnome \
 	use/kernel/latest +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; @:
 
@@ -261,9 +265,11 @@ 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 \