regular.mk: Not use grupcboot and multiple kernels for boot ISO for starterkit's

Alas, grub-pc in comparison with syslinux has a problems when loading iso images.

regular.mk: Not use grupcboot and multiple kernels for boot ISO for starterkit's
85679f1c · Anton Midyukov · 3386ccd9 · 85679f1c
Commit 85679f1c authored Jul 25, 2021 by Anton Midyukov
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 0 deletions

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

No files found.
--- a/conf.d/regular.mk
+++ b/conf.d/regular.mk
@@ -8,9 +8,11 @@ distro/.regular-bare: distro/.base use/kernel/net use/docs/license \
 	use/stage2/rtc use/stage2/sbc use/stage2/scsi use/stage2/usb \
 	$(STARTERKIT)
 	@$(call try,SAVE_PROFILE,yes)
+ifndef BRANCH
 ifeq (,$(filter-out i586 x86_64,$(ARCH)))
 	@$(call set,BOOTLOADER,grubpcboot)
 endif
+endif

 # base target (for most images)
 distro/.regular-base: distro/.regular-bare use/vmguest use/memtest +efi; @:
@@ -135,12 +137,14 @@ distro/regular-gnustep-systemd: distro/.regular-wm +systemd \
 	mixin/regular-wmaker mixin/regular-gnustep; @:

 distro/regular-xfce: distro/.regular-gtk mixin/regular-xfce; @:
+ifndef BRANCH
 ifeq (,$(filter-out i586 x86_64,$(ARCH)))
 	@$(call set,KFLAVOURS,std-def un-def)
 endif
 ifeq (,$(filter-out aarch64,$(ARCH)))
 	@$(call set,KFLAVOURS,mp un-def)
 endif
+endif

 distro/regular-xfce-sysv: distro/.regular-gtk-sysv mixin/regular-xfce-sysv; @: