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

grub: ignore all targets if not available

Browse Source 
Otherwise it might e.g. add branding-*-bootloader
for no good reason, poisoning $destdir with an
existing and non-empty /etc/sysconfig/grub2
regardless of the actual grub availability
on the platform.
This commit is contained in:
Michael Shigorin 2020-08-22 14:24:29 +03:00
parent 5285c0a832
commit 0225b2549f
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
features.in/grub/config.mk
View File

@ -10,11 +10,6 @@ ifeq (,$(filter-out i586 x86_64,$(ARCH)))
endif endif
@$(call set,RELNAME,ALT ($(IMAGE_NAME))) @$(call set,RELNAME,ALT ($(IMAGE_NAME)))
@$(call set,IMAGE_PACKTYPE,boot) @$(call set,IMAGE_PACKTYPE,boot)
else
use/grub: ; @:
endif
# UI is overwritten # UI is overwritten
use/grub/ui/%: use/grub use/grub/ui/%: use/grub
@ -26,6 +21,11 @@ use/grub/ui/%: use/grub
use/grub/%.cfg: use/grub use/grub/%.cfg: use/grub
@$(call add,GRUB_CFG,$*) @$(call add,GRUB_CFG,$*)
use/grub/timeout/%: use/grub use/grub/timeout/%: use/grub
@$(call set,GRUB_TIMEOUT,$*) @$(call set,GRUB_TIMEOUT,$*)
else
use/grub: ; @:
use/grub/ui/% use/grub/%.cfg use/grub/timeout/%: ; @:
endif