keremet/mkimage-profiles
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

stage1, stage2: allow multiple kernels

Browse Source
This commit is contained in:
Anton Midyukov 2019-10-13 23:30:25 +07:00
parent 639d1022bd
commit 02a5231ba5
2 changed files with 11 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
sub.in/stage1/Makefile
View File

@ -21,8 +21,13 @@ 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)" ""

6
sub.in/stage2/Makefile
View File

@ -29,7 +29,13 @@ 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)