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.

stage1: fix for non-propagator stage2
730e791f · Michael Shigorin · 5c4f116b · 730e791f
Commit 730e791f authored Sep 18, 2014 by Michael Shigorin
Hide whitespace changes
Inline Side-by-side

Showing with 5 additions and 3 deletions

Makefile sub.in/stage1/Makefile +5 -3

No files found.
--- a/sub.in/stage1/Makefile
+++ b/sub.in/stage1/Makefile
@@ -26,13 +26,15 @@ STAGE1_KFLAVOUR ?= $(lastword $(KFLAVOURS))

 # propagator needed iff stage1 kernel installed (not for e.g. syslinux.iso)
 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_MAR_MODULES = ./modules
 PROPAGATOR_INITFS = ./initfs
 BUILD_PROPAGATOR = build-propagator
-INFO_STAGE1_KFLAVOUR := $(STAGE1_KFLAVOUR)
-CHROOT_PACKAGES_REGEXP := $(call kpackages, \
-	$(STAGE1_KMODULES_REGEXP),$(STAGE1_KFLAVOUR))
+endif
 endif

 CHROOT_PACKAGES_REGEXP += $(STAGE1_PACKAGES_REGEXP)