From e64557d8ea0d6cefd9f0c845a10838041672b984 Mon Sep 17 00:00:00 2001 From: Anton Midyukov Date: Tue, 31 Aug 2021 22:45:57 +0700 Subject: [PATCH] stage2: use/initrd-bootchain instead use/initrd-propagator for sisyphus --- features.in/stage2/config.mk | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/features.in/stage2/config.mk b/features.in/stage2/config.mk index f8ac7314..18ffdfe9 100644 --- a/features.in/stage2/config.mk +++ b/features.in/stage2/config.mk @@ -1,11 +1,19 @@ # "1" is not a typo -use/stage2: sub/stage1 use/initrd-propagator +use/stage2:: sub/stage1 @$(call add_feature) @$(call add,STAGE1_PACKAGES,make-initrd file iproute2) @$(call add,STAGE1_MODLISTS,$$(FEATURES)) @$(call xport,STAGE1_PACKAGES) @$(call xport,STAGE1_KCONFIG) +ifeq (,$(BRANCH)) +use/stage2:: use/initrd-bootchain; @: +else ifneq (,$(filter-out p10 p9 p8 p7 p6 p5,$(BRANCH))) +use/stage2:: use/initrd-bootchain; @: +else +use/stage2:: use/initrd-propagator; @: +endif + # building blocks for propagator's module cove use/stage2/ata use/stage2/drm use/stage2/fs use/stage2/hid use/stage2/md \ use/stage2/mmc use/stage2/net use/stage2/net-cifs use/stage2/net-nfs \