From b92f022478c0029c2f447f84ba474e391bb0642c Mon Sep 17 00:00:00 2001 From: Michael Shigorin Date: Wed, 24 Jan 2018 14:31:52 +0300 Subject: [PATCH] bootloader, live: arrange alterator module ...explicitly; this has been triggered by the change to livecd-install as of 0.9.10-alt2 (doesn't R: alterator-grub anymore to allow non-grub platforms as well). This should be a no-op _together_ with the mentioned change by now as grub is selected explicitly; will take more attention for e.g. e2k as the problem just shifted here from livecd-install. Reported-by: Leonid Krivoshein --- features.in/bootloader/config.mk | 5 +++++ features.in/live/config.mk | 3 ++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/features.in/bootloader/config.mk b/features.in/bootloader/config.mk index 771dbb56..6d56f6a8 100644 --- a/features.in/bootloader/config.mk +++ b/features.in/bootloader/config.mk @@ -4,9 +4,14 @@ # the last different one wins # - remember .base if adding yet another *_PACKAGES +# NB: "mysterious" conflicts if BASE_BOOTLOADER is empty + use/bootloader: @$(call add_feature) @$(call add,BASE_PACKAGES,alterator-$$(BASE_BOOTLOADER)) use/bootloader/grub use/bootloader/lilo: use/bootloader/%: use/bootloader @$(call set,BASE_BOOTLOADER,$*) + +use/bootloader/live: use/bootloader + @$(call add,LIVE_PACKAGES,alterator-$$(BASE_BOOTLOADER)) diff --git a/features.in/live/config.mk b/features.in/live/config.mk index 17a33c03..3a0e6602 100644 --- a/features.in/live/config.mk +++ b/features.in/live/config.mk @@ -58,7 +58,8 @@ use/live/repo/online: @$(call add,LIVE_PACKAGES,livecd-online-repo) # alterator-based permanent installation -use/live/install: use/metadata use/xdg-user-dirs use/syslinux/localboot.cfg +use/live/install: use/metadata use/xdg-user-dirs use/syslinux/localboot.cfg \ + use/bootloader/live use/bootloader/grub @$(call add,LIVE_PACKAGES,livecd-install) @$(call add,LIVE_PACKAGES,livecd-installer-features)