diff --git a/features.in/bootloader/config.mk b/features.in/bootloader/config.mk index df9d7787..296cb376 100644 --- a/features.in/bootloader/config.mk +++ b/features.in/bootloader/config.mk @@ -3,7 +3,7 @@ # - remember .base if adding yet another *_PACKAGES use/bootloader: use/install2 sub/main - @$(call add,BASE_PACKAGES,alterator-$$(GLOBAL_BASE_BOOTLOADER)) + @$(call add,BASE_PACKAGES,alterator-$$(BASE_BOOTLOADER)) use/bootloader/grub use/bootloader/lilo: use/bootloader/%: use/bootloader - @$(call set,GLOBAL_BASE_BOOTLOADER,$*) + @$(call set,BASE_BOOTLOADER,$*) diff --git a/features.in/install2/install2/stage2cfg.mk b/features.in/install2/install2/stage2cfg.mk index 82b31b23..c2802956 100644 --- a/features.in/install2/install2/stage2cfg.mk +++ b/features.in/install2/install2/stage2cfg.mk @@ -8,6 +8,9 @@ MKI_PACK_RESULTS = squash:altinst # also removed in a cleanup hook but to spare a few cycles... HSH_EXCLUDE_DOCS = 1 +# pass downstream +GLOBAL_BASE_BOOTLOADER := $(BASE_BOOTLOADER) + debug: @echo "** install2: IMAGE_PACKAGES: $(IMAGE_PACKAGES)" @echo "** install2: IMAGE_PACKAGES_REGEXP: $(IMAGE_PACKAGES_REGEXP)" diff --git a/functions.mk b/functions.mk index 2f83e019..0a55ba90 100644 --- a/functions.mk +++ b/functions.mk @@ -15,6 +15,7 @@ endef # add() just appends an additive rule... add = $(and $(1),$(2),$(add_body)) define add_body +$(if $(filter GLOBAL_% INFO_%,$(1)),$(warning add,$(1) might be a problem)) \ { $(log_body); \ printf '%s += %s\n' '$(1)' '$(2)' >> "$(CONFIG)"; } endef