From 01a1581b719ccfb493338abb6f2c17df2537a046 Mon Sep 17 00:00:00 2001 From: Anton Midyukov Date: Mon, 17 Aug 2020 22:59:57 +0700 Subject: [PATCH] Revert "stage1, stage2: allow multiple kernels" This reverts commit 02a5231ba57eb241ae6efffae8ce73a8f8d27fbe. 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. --- sub.in/stage1/Makefile | 5 ----- sub.in/stage2/Makefile | 6 ------ 2 files changed, 11 deletions(-) diff --git a/sub.in/stage1/Makefile b/sub.in/stage1/Makefile index 79fe3c9a..112c9533 100644 --- 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)" "" diff --git a/sub.in/stage2/Makefile b/sub.in/stage2/Makefile index 7d51b002..f124dfc6 100644 --- 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)