Skip to content

M
mkimage-profiles
Commit 730e791f authored by Michael Shigorin's avatar Michael Shigorin
Browse files
Options

stage1: fix for non-propagator stage2

It's been a given that any stage2 is propagator-based but that's not neccessarily so; the "run X as PID 1" sort of contest has sparkled interest in some others.
parent 5c4f116b
Hide whitespace changes
Inline Side-by-side
Showing with 5 additions and 3 deletions
sub.in/stage1/Makefile
View file @ 730e791f
...@@ -26,13 +26,15 @@ STAGE1_KFLAVOUR ?= $(lastword $(KFLAVOURS)) ...@@ -26,13 +26,15 @@ STAGE1_KFLAVOUR ?= $(lastword $(KFLAVOURS))
# 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)" ""
INFO_STAGE1_KFLAVOUR := $(STAGE1_KFLAVOUR)
CHROOT_PACKAGES_REGEXP := $(call kpackages, \
$(STAGE1_KMODULES_REGEXP),$(STAGE1_KFLAVOUR))
ifneq "$(findstring stage2,$(SUBPROFILES))" ""
PROPAGATOR_VERSION = ALT Linux PROPAGATOR_VERSION = ALT Linux
PROPAGATOR_MAR_MODULES = ./modules PROPAGATOR_MAR_MODULES = ./modules
PROPAGATOR_INITFS = ./initfs PROPAGATOR_INITFS = ./initfs
BUILD_PROPAGATOR = build-propagator BUILD_PROPAGATOR = build-propagator
INFO_STAGE1_KFLAVOUR := $(STAGE1_KFLAVOUR) endif
CHROOT_PACKAGES_REGEXP := $(call kpackages, \
$(STAGE1_KMODULES_REGEXP),$(STAGE1_KFLAVOUR))
endif endif
CHROOT_PACKAGES_REGEXP += $(STAGE1_PACKAGES_REGEXP) CHROOT_PACKAGES_REGEXP += $(STAGE1_PACKAGES_REGEXP)
......
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