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.

grub: ignore all targets if not available
0225b254 · Michael Shigorin · 5285c0a8 · 0225b254
Commit 0225b254 authored Aug 22, 2020 by Michael Shigorin
Hide whitespace changes
Inline Side-by-side

Showing with 6 additions and 6 deletions

config.mk features.in/grub/config.mk +6 -6

No files found.
--- a/features.in/grub/config.mk
+++ b/features.in/grub/config.mk
@@ -10,11 +10,6 @@ ifeq (,$(filter-out i586 x86_64,$(ARCH)))
 endif
 	@$(call set,RELNAME,ALT ($(IMAGE_NAME)))
 	@$(call set,IMAGE_PACKTYPE,boot)
-else
-
-use/grub: ; @:
-
-endif

 # UI is overwritten
 use/grub/ui/%: use/grub
@@ -26,6 +21,11 @@ use/grub/ui/%: use/grub
 use/grub/%.cfg: use/grub
 	@$(call add,GRUB_CFG,$*)

-
 use/grub/timeout/%: use/grub
 	@$(call set,GRUB_TIMEOUT,$*)
+else
+
+use/grub: ; @:
+use/grub/ui/% use/grub/%.cfg use/grub/timeout/%: ; @:
+
+endif