regular.mk, regular-vm.mk: set KFLAVOUR=un-def for BRANCH=p10 on x86_64, aarch64

Kernel 6.1 supports much more hardware, but for i586 the situation is the opposite, new kernel = loss of support for the old on. xfce-sysv focuses on supporting older hardware.

regular.mk, regular-vm.mk: set KFLAVOUR=un-def for BRANCH=p10 on x86_64, aarch64
a6070f8c · Anton Midyukov · fa0537b1 · a6070f8c · a6070f8c
Commit a6070f8c authored Aug 31, 2023 by Anton Midyukov
Hide whitespace changes
Inline Side-by-side

Showing with 11 additions and 1 deletion

regular-vm.mk conf.d/regular-vm.mk +4 -0

regular.mk conf.d/regular.mk +7 -1

No files found.
--- a/conf.d/regular-vm.mk
+++ b/conf.d/regular-vm.mk
@@ -15,8 +15,12 @@ mixin/vm-archdep:: use/auto-resize; @:

 ifeq (,$(filter-out i586 x86_64 aarch64,$(ARCH)))
 mixin/vm-archdep:: +efi
+ifeq (,$(filter-out p10,$(BRANCH)))
+	@$(call set,KFLAVOURS,un-def)
+else
 	@$(call set,KFLAVOURS,std-def un-def)
 endif
+endif

 ifeq (,$(filter-out armh,$(ARCH)))
 mixin/vm-archdep::

--- a/conf.d/regular.mk
+++ b/conf.d/regular.mk
@@ -15,6 +15,11 @@ distro/.regular-bare: distro/.base use/kernel/net use/docs/license \
 # base target (for most images)
 distro/.regular-base: distro/.regular-bare use/vmguest use/memtest \
 	use/efi/shell use/efi/dtb +efi; @:
+ifeq (,$(filter-out p10,$(BRANCH)))
+ifeq (,$(filter-out x86_64 aarch64,$(ARCH)))
+	@$(call set,KFLAVOURS,un-def)
+endif
+endif

 # graphical target (not enforcing xorg drivers or blobs)
 distro/.regular-x11: distro/.regular-base mixin/regular-x11 \
@@ -167,7 +172,8 @@ endif
 distro/regular-xfce-install: distro/.regular-install-x11-systemd \
 	mixin/regular-xfce; @:

-distro/regular-xfce-sysv: distro/.regular-gtk-sysv mixin/regular-xfce-sysv; @:
+distro/regular-xfce-sysv: distro/.regular-gtk-sysv mixin/regular-xfce-sysv
+	@$(call set,KFLAVOURS,std-def)
 ifeq (,$(filter-out i586 x86_64,$(ARCH)))
 	@$(call set,BOOTLOADER,isolinux)
 endif