Skip to content

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

grub: ignore all targets if not available

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.
parent 5285c0a8
Hide whitespace changes
Inline Side-by-side
Showing with 6 additions and 6 deletions
features.in/grub/config.mk
View file @ 0225b254
...@@ -10,11 +10,6 @@ ifeq (,$(filter-out i586 x86_64,$(ARCH))) ...@@ -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 ...@@ -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
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