initrd-propagator: Select the propagator as a separate feature

3259b2fa · Anton Midyukov · 2d0b7811 · 3259b2fa · 3259b2fa · 3259b2fa
Commit 3259b2fa authored Mar 22, 2021 by Anton Midyukov
7 changed files
--- a/features.in/initrd-propagator/README
+++ b/features.in/initrd-propagator/README
+Добавляется поддержка propagator. propagator обеспечивает первую стадию загрузчика.
+Ранее был неотъемлемой частью субпрофиля stage1. Был вынесен в фичу для обеспечения
+возожности собирать образы с использованием специально собранного initrd вместо него.
--- a/features.in/initrd-propagator/config.mk
+++ b/features.in/initrd-propagator/config.mk
+use/initrd-propagator:
+	@$(call add_feature)
+	@$(call add,STAGE1_PACKAGES,make-initrd-propagator propagator)
+	@$(call set,STAGE1_INITRD,PROPAGATOR)
--- a/features.in/stage2/stage1/scripts.d/01-initfs
+++ b/features.in/stage2/stage1/scripts.d/01-initfs
--- a/features.in/stage2/stage1/scripts.d/11-initrd-propagator
+++ b/features.in/stage2/stage1/scripts.d/11-initrd-propagator
--- a/features.in/stage2/stage1/scripts.d/81-make-initfs
+++ b/features.in/stage2/stage1/scripts.d/81-make-initfs
--- a/features.in/stage2/stage1/scripts.d/90-build-propagator
+++ b/features.in/stage2/stage1/scripts.d/90-build-propagator
--- a/features.in/stage2/config.mk
+++ b/features.in/stage2/config.mk
 # "1" is not a typo
-use/stage2: sub/stage1 use/uuid-iso
+use/stage2: sub/stage1 use/initrd-propagator use/uuid-iso
 	@$(call add_feature)
 	@$(call add,STAGE1_PACKAGES,make-initrd file iproute2)
-	@$(call add,STAGE1_PACKAGES,make-initrd-propagator propagator)
 	@$(call add,STAGE1_MODLISTS,$$(FEATURES))
 	@$(call xport,STAGE1_PACKAGES)
 	@$(call xport,STAGE1_KCONFIG)