keremet/mkimage-profiles
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

bootloader, live: arrange alterator module

Browse Source 
...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 <klark@altlinux.org>
This commit is contained in:
Michael Shigorin 2018-01-24 14:31:52 +03:00
parent b57762d1b9
commit b92f022478
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
features.in/bootloader/config.mk
View File

@ -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))

3
features.in/live/config.mk
View File

@ -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)