Commit 50e0779f authored by Michael Shigorin's avatar Michael Shigorin

sub.in/install2/Makefile: enforce a kernel

A bit earlier the situation where there was a stage1 fallback for INSTALLER_KFLAVOUR as the last of KFLAVOURS, so we'd have an installer kernel or build would break; now the situration got somewhat twisted: there could be a vmlinuz in stage1 but no corresponding modules in install2 -- which can lead to different surprises but at least alterator-vm would complain about "Operation not permitted" on partition layout commit. The fallback is a copypaste from sub.in/stage1/Makefile though and should be redone properly somewhere. The question so far is, where exactly?
parent c4e0a249
...@@ -13,6 +13,14 @@ include $(MKIMAGE_PREFIX)/config.mk ...@@ -13,6 +13,14 @@ include $(MKIMAGE_PREFIX)/config.mk
# this might have been prepared by ../stage1/scripts.d/03-test-kernel # this might have been prepared by ../stage1/scripts.d/03-test-kernel
-include $(GLOBAL_BUILDDIR)/squashcfg.mk -include $(GLOBAL_BUILDDIR)/squashcfg.mk
# here we also try and come up with the installer kernel/modules, if any;
# no kernel flavour specified will result in no modules for stage1 vmlinuz
INSTALLER_KFLAVOUR ?= $(lastword $(KFLAVOURS))
ifeq "$(INSTALLER_KFLAVOUR)" ""
$(error INSTALLER_KFLAVOUR is utterly empty; cannot guess either)
endif
# need kernel modules only (which require corresponding kernel-image); # need kernel modules only (which require corresponding kernel-image);
# these go into work chroot; NB: no vmlinuz there # these go into work chroot; NB: no vmlinuz there
IMAGE_PACKAGES_REGEXP = $(call kpackages,$(INSTALLER_KMODULES),$(INSTALLER_KFLAVOUR)) IMAGE_PACKAGES_REGEXP = $(call kpackages,$(INSTALLER_KMODULES),$(INSTALLER_KFLAVOUR))
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment