From ca941041366602d4da0bf2c04bb0d3c25ed4fa21 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E5=9B=BD?= Date: Sat, 25 Jul 2020 04:48:36 +0000 Subject: [PATCH] grub2: make grub2 tools built in a separate variant MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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: 李国 --- package/boot/grub2/Makefile | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) 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)