RepoMirrors/openwrt
1
0
Fork 0
mirror of git://git.openwrt.org/openwrt/openwrt.git synced 2025-03-02 19:49:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

grub2: make grub2 tools built in a separate variant

Browse Source 
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>
This commit is contained in:
李国 2020-07-25 04:48:36 +00:00 committed by Paul Spooren
parent 5876d6a62f
commit ca94104136
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
package/boot/grub2/Makefile
View File

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