[PATCH] stage1, stage2: allow multiple kernels

[Anton Midyukov]

---
 sub.in/stage1/Makefile | 2 +-
 sub.in/stage2/Makefile | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/sub.in/stage1/Makefile b/sub.in/stage1/Makefile
index 112c95336..d06fd43e8 100644
--- a/sub.in/stage1/Makefile
+++ b/sub.in/stage1/Makefile
@@ -22,7 +22,7 @@ include $(MKIMAGE_PREFIX)/targets.mk
 # only a single kernel might be needed (STAGE1_KFLAVOUR sets explicitly);
 # kernel image copied from instrumental chroot into .work/syslinux/alt0/
 
-STAGE1_KFLAVOUR ?= $(lastword $(KFLAVOURS))
+STAGE1_KFLAVOUR ?= $(KFLAVOURS)
 
 # 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 f124dfc66..e07d434b5 100644
--- a/sub.in/stage2/Makefile
+++ b/sub.in/stage2/Makefile
@@ -29,7 +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
-STAGE1_KFLAVOUR ?= $(lastword $(KFLAVOURS))
+STAGE1_KFLAVOUR ?= $(KFLAVOURS)
 
 ifeq (,$(STAGE1_KFLAVOUR))
 $(error STAGE1_KFLAVOUR is utterly empty; cannot guess either)
-- 
2.21.0


--------------32E72CFB8E5A5D3B4E7E091D--