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

Revert "stage1, stage2: allow multiple kernels"

Browse Source 
This reverts commit 02a5231ba5.
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.
This commit is contained in:
Anton Midyukov 2020-08-17 22:59:57 +07:00
parent 52903dc80a
commit 01a1581b71
2 changed files with 0 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
sub.in/stage1/Makefile
View File

@ -21,13 +21,8 @@ include $(MKIMAGE_PREFIX)/targets.mk
# here we try and come up with the installer kernel/modules, if any; # here we try and come up with the installer kernel/modules, if any;
# only a single kernel might be needed (STAGE1_KFLAVOUR sets explicitly); # only a single kernel might be needed (STAGE1_KFLAVOUR sets explicitly);
# kernel image copied from instrumental chroot into .work/syslinux/alt0/ # 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)) STAGE1_KFLAVOUR ?= $(lastword $(KFLAVOURS))
endif
# propagator needed iff stage1 kernel installed (not for e.g. syslinux.iso) # propagator needed iff stage1 kernel installed (not for e.g. syslinux.iso)
ifneq "$(STAGE1_KFLAVOUR)" "" ifneq "$(STAGE1_KFLAVOUR)" ""

6
sub.in/stage2/Makefile
View File

@ -29,13 +29,7 @@ IMAGE_PACKAGES += $(SYSTEM_PACKAGES) $(STAGE2_PACKAGES)
# here we also try and come up with the stage1 kernel/modules, if any; # 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 # 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)) STAGE1_KFLAVOUR ?= $(lastword $(KFLAVOURS))
endif
ifeq (,$(STAGE1_KFLAVOUR)) ifeq (,$(STAGE1_KFLAVOUR))
$(error STAGE1_KFLAVOUR is utterly empty; cannot guess either) $(error STAGE1_KFLAVOUR is utterly empty; cannot guess either)