Revert "stage1, stage2: allow multiple kernels"

This reverts commit 02a5231b. Upstream mkimage has not yet take patches to support packaging multiple kernels to ISO image. In order to avoid problems, have to revert this commit.

Revert "stage1, stage2: allow multiple kernels"
01a1581b · Anton Midyukov · 52903dc8 · 01a1581b · 01a1581b
Commit 01a1581b authored Aug 17, 2020 by Anton Midyukov
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 11 deletions

Makefile sub.in/stage1/Makefile +0 -5

Makefile sub.in/stage2/Makefile +0 -6

No files found.
--- a/sub.in/stage1/Makefile
+++ b/sub.in/stage1/Makefile
@@ -21,13 +21,8 @@ include $(MKIMAGE_PREFIX)/targets.mk
 # here we try and come up with the installer kernel/modules, if any;
 # only a single kernel might be needed (STAGE1_KFLAVOUR sets explicitly);
 # kernel image copied from instrumental chroot into .work/syslinux/alt0/
-# Update: for grub allowed choose kernels

-ifeq (,$(filter-out x86_64 aarch64 ppc64le,$(ARCH)))
-STAGE1_KFLAVOUR ?= $(KFLAVOURS)
-else
 STAGE1_KFLAVOUR ?= $(lastword $(KFLAVOURS))
-endif

 # propagator needed iff stage1 kernel installed (not for e.g. syslinux.iso)
 ifneq "$(STAGE1_KFLAVOUR)" ""

--- a/sub.in/stage2/Makefile
+++ b/sub.in/stage2/Makefile
@@ -29,13 +29,7 @@ IMAGE_PACKAGES += $(SYSTEM_PACKAGES) $(STAGE2_PACKAGES)

 # here we also try and come up with the stage1 kernel/modules, if any;
 # no kernel flavour specified will result in no modules for stage1 vmlinuz
-# Update: for grub allowed choose kernels
-
-ifeq (,$(filter-out x86_64 aarch64 ppc64le,$(ARCH)))
-STAGE1_KFLAVOUR ?= $(KFLAVOURS)
-else
 STAGE1_KFLAVOUR ?= $(lastword $(KFLAVOURS))
-endif

 ifeq (,$(STAGE1_KFLAVOUR))
 $(error STAGE1_KFLAVOUR is utterly empty; cannot guess either)