From: 李国 <uxgood.org@gmail.com>
Date: Sat, 25 Jul 2020 04:48:36 +0000 (+0000)
Subject: grub2: make grub2 tools built in a separate variant
X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=ca941041366602d4da0bf2c04bb0d3c25ed4fa21;p=openwrt%2Fstaging%2Flinusw.git

grub2: make grub2 tools built in a separate variant

grub2 boot-related code and tools-related code may require different
compilation parameters. We split them into different variants for
compilation, so that we can accurately pass the required parameters and
avoid causing problems.

Signed-off-by: 李国 <uxgood.org@gmail.com>
---

diff --git a/package/boot/grub2/Makefile b/package/boot/grub2/Makefile
index 709253a935..0610d96e90 100644
--- a/package/boot/grub2/Makefile
+++ b/package/boot/grub2/Makefile
@@ -44,7 +44,7 @@ define Package/grub2-editenv
   TITLE:=Grub2 Environment editor
   URL:=http://www.gnu.org/software/grub/
   DEPENDS:=@TARGET_x86
-  VARIANT:=pc
+  VARIANT:=none
 endef
 
 define Package/grub2-editenv/description
@@ -58,7 +58,7 @@ define Package/grub2-bios-setup
   TITLE:=Grub2 BIOS boot setup tool
   URL:=http://www.gnu.org/software/grub/
   DEPENDS:=@TARGET_x86
-  VARIANT:=pc
+  VARIANT:=none
 endef
 
 define Package/grub2-bios-setup/description
@@ -98,6 +98,10 @@ HOST_MAKE_FLAGS += \
 
 TARGET_CFLAGS := $(filter-out -O2 -O3 -fno-plt,$(TARGET_CFLAGS))
 
+ifneq ($(BUILD_VARIANT),none)
+  MAKE_PATH := grub-core
+endif
+
 define Host/Configure
 	$(SED) 's,(RANLIB),(TARGET_RANLIB),' $(HOST_BUILD_DIR)/grub-core/Makefile.in
 	$(Host/Configure/Default)