Skip to content

M
mkimage-profiles
Commit a490e39d authored by Michael Shigorin's avatar Michael Shigorin
Browse files
Options

bootloader, mixin.mk: use/bootloader/os-prober

This really belongs to bootloader feature rather than to mixin/desktop-installer alone; moving out.
parent d6a8aae3
Show whitespace changes
Inline Side-by-side
Showing with 6 additions and 4 deletions
conf.d/mixin.mk
View file @ a490e39d
...@@ -2,13 +2,10 @@ ...@@ -2,13 +2,10 @@
### desktop.mk ### desktop.mk
mixin/desktop-installer: +net-eth +vmguest \ mixin/desktop-installer: +net-eth +vmguest \
use/x11-autostart use/fonts/install2 use/sound use/bootloader/os-prober use/x11-autostart use/fonts/install2 use/sound
@$(call add,BASE_LISTS, \ @$(call add,BASE_LISTS, \
$(call tags,(base || desktop) && (l10n || network))) $(call tags,(base || desktop) && (l10n || network)))
@$(call add,INSTALL2_PACKAGES,ntfs-3g) @$(call add,INSTALL2_PACKAGES,ntfs-3g)
ifeq (,$(filter-out i586 x86_64 aarch64,$(ARCH)))
@$(call add,BASE_PACKAGES,os-prober)
endif
### e2k.mk ### e2k.mk
mixin/e2k-base: use/tty/S0 use/net-eth/dhcp; @: mixin/e2k-base: use/tty/S0 use/net-eth/dhcp; @:
......
features.in/bootloader/config.mk
View file @ a490e39d
...@@ -17,3 +17,8 @@ use/bootloader/grub use/bootloader/lilo: use/bootloader/%: use/bootloader ...@@ -17,3 +17,8 @@ use/bootloader/grub use/bootloader/lilo: use/bootloader/%: use/bootloader
use/bootloader/live: use/bootloader use/bootloader/live: use/bootloader
@$(call add,LIVE_PACKAGES,alterator-$$(BASE_BOOTLOADER)) @$(call add,LIVE_PACKAGES,alterator-$$(BASE_BOOTLOADER))
use/bootloader/os-prober: use/bootloader
ifeq (,$(filter-out i586 x86_64 aarch64,$(ARCH)))
@$(call add,BASE_PACKAGES,os-prober)
endif
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment