jeans/motioneyeos
jeans/motioneyeos
1
0
Fork 0
mirror of https://github.com/motioneye-project/motioneyeos.git synced 2025-07-24 19:56:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

boot/grub2: separate target and host builds

Browse Source 
grub2 requires the host grub2-mkimage tool to build some of its target
images. The current way of building this tool in the grub2 package is
to perform a simultaneous host-tools/target-bootloader build during
the grub2 build step.

This method makes the recipe complex to understand, and proved to be a
complication during the work to enable grub2 support for architectures
other than x86.

This patch tries to do a better separation between the build of grub2
host tools and target boot loader image, as a partial step to enable
grub2 to build for other architectures.

Signed-off-by: Erico Nunes <nunes.erico@gmail.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
This commit is contained in:
Erico Nunes 2018-09-27 00:37:15 +02:00 committed by Thomas Petazzoni
parent a18c828bed
commit ac0719e086
1 changed files with 25 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
boot/grub2/grub2.mk
View File

@ -9,7 +9,10 @@ GRUB2_SITE = http://ftp.gnu.org/gnu/grub
GRUB2_SOURCE = grub-$(GRUB2_VERSION).tar.xz GRUB2_SOURCE = grub-$(GRUB2_VERSION).tar.xz
GRUB2_LICENSE = GPL-3.0+ GRUB2_LICENSE = GPL-3.0+
GRUB2_LICENSE_FILES = COPYING GRUB2_LICENSE_FILES = COPYING
GRUB2_DEPENDENCIES = host-bison host-flex GRUB2_DEPENDENCIES = host-bison host-flex host-grub2
HOST_GRUB2_DEPENDENCIES = host-bison host-flex
GRUB2_INSTALL_IMAGES = YES
GRUB2_INSTALL_TARGET = NO
GRUB2_BUILTIN_MODULES = $(call qstrip,$(BR2_TARGET_GRUB2_BUILTIN_MODULES)) GRUB2_BUILTIN_MODULES = $(call qstrip,$(BR2_TARGET_GRUB2_BUILTIN_MODULES))
GRUB2_BUILTIN_CONFIG = $(call qstrip,$(BR2_TARGET_GRUB2_BUILTIN_CONFIG)) GRUB2_BUILTIN_CONFIG = $(call qstrip,$(BR2_TARGET_GRUB2_BUILTIN_CONFIG))
@ -39,26 +42,24 @@ GRUB2_PLATFORM = efi
endif endif
# Grub2 is kind of special: it considers CC, LD and so on to be the # Grub2 is kind of special: it considers CC, LD and so on to be the
# tools to build the native tools (i.e to be executed on the build # tools to build the host programs and uses TARGET_CC, TARGET_CFLAGS,
# machine), and uses TARGET_CC, TARGET_CFLAGS, TARGET_CPPFLAGS, # TARGET_CPPFLAGS, TARGET_LDFLAGS to build the bootloader itself.
# TARGET_LDFLAGS to build the bootloader itself. However, to add to
# the confusion, it also uses NM, OBJCOPY and STRIP to build the
# bootloader itself; none of these are used to build the native
# tools.
# #
# NOTE: TARGET_STRIP is overridden by !BR2_STRIP_strip, so always # NOTE: TARGET_STRIP is overridden by !BR2_STRIP_strip, so always
# use the cross compile variant to ensure grub2 builds # use the cross compile variant to ensure grub2 builds
HOST_GRUB2_CONF_ENV = \
CPP="$(HOSTCC) -E"
GRUB2_CONF_ENV = \ GRUB2_CONF_ENV = \
$(HOST_CONFIGURE_OPTS) \ CPP="$(TARGET_CC) -E" \
CPP="$(HOSTCC) -E" \
TARGET_CC="$(TARGET_CC)" \ TARGET_CC="$(TARGET_CC)" \
TARGET_CFLAGS="$(TARGET_CFLAGS)" \ TARGET_CFLAGS="$(TARGET_CFLAGS)" \
TARGET_CPPFLAGS="$(TARGET_CPPFLAGS) -fno-stack-protector" \ TARGET_CPPFLAGS="$(TARGET_CPPFLAGS) -fno-stack-protector" \
TARGET_LDFLAGS="$(TARGET_LDFLAGS)" \ TARGET_LDFLAGS="$(TARGET_LDFLAGS)" \
NM="$(TARGET_NM)" \ TARGET_NM="$(TARGET_NM)" \
OBJCOPY="$(TARGET_OBJCOPY)" \ TARGET_OBJCOPY="$(TARGET_OBJCOPY)" \
STRIP="$(TARGET_CROSS)strip" TARGET_STRIP="$(TARGET_CROSS)strip"
GRUB2_CONF_OPTS = \ GRUB2_CONF_OPTS = \
--target=$(GRUB2_TARGET) \ --target=$(GRUB2_TARGET) \
@ -72,12 +73,13 @@ GRUB2_CONF_OPTS = \
--enable-libzfs=no \ --enable-libzfs=no \
--disable-werror --disable-werror
# We don't want all the native tools and Grub2 modules to be installed HOST_GRUB2_CONF_OPTS = \
# in the target. So we in fact install everything into the host --disable-grub-mkfont \
# directory, and the image generation process (below) will use the --enable-efiemu=no \
# grub-mkimage tool and Grub2 modules from the host directory. ac_cv_lib_lzma_lzma_code=no \
--enable-device-mapper=no \
GRUB2_INSTALL_TARGET_OPTS = DESTDIR=$(HOST_DIR) install --enable-libzfs=no \
--disable-werror
ifeq ($(BR2_TARGET_GRUB2_I386_PC),y) ifeq ($(BR2_TARGET_GRUB2_I386_PC),y)
define GRUB2_IMAGE_INSTALL_ELTORITO define GRUB2_IMAGE_INSTALL_ELTORITO
@ -86,10 +88,10 @@ define GRUB2_IMAGE_INSTALL_ELTORITO
endef endef
endif endif
define GRUB2_IMAGE_INSTALLATION define GRUB2_INSTALL_IMAGES_CMDS
mkdir -p $(dir $(GRUB2_IMAGE)) mkdir -p $(dir $(GRUB2_IMAGE))
$(HOST_DIR)/bin/grub-mkimage \ $(HOST_DIR)/usr/bin/grub-mkimage \
-d $(HOST_DIR)/lib/grub/$(GRUB2_TUPLE) \ -d $(@D)/grub-core/ \
-O $(GRUB2_TUPLE) \ -O $(GRUB2_TUPLE) \
-o $(GRUB2_IMAGE) \ -o $(GRUB2_IMAGE) \
-p "$(GRUB2_PREFIX)" \ -p "$(GRUB2_PREFIX)" \
@ -99,14 +101,14 @@ define GRUB2_IMAGE_INSTALLATION
$(INSTALL) -D -m 0644 boot/grub2/grub.cfg $(GRUB2_CFG) $(INSTALL) -D -m 0644 boot/grub2/grub.cfg $(GRUB2_CFG)
$(GRUB2_IMAGE_INSTALL_ELTORITO) $(GRUB2_IMAGE_INSTALL_ELTORITO)
endef endef
GRUB2_POST_INSTALL_TARGET_HOOKS += GRUB2_IMAGE_INSTALLATION
ifeq ($(GRUB2_PLATFORM),efi) ifeq ($(GRUB2_PLATFORM),efi)
define GRUB2_EFI_STARTUP_NSH define GRUB2_EFI_STARTUP_NSH
echo $(notdir $(GRUB2_IMAGE)) > \ echo $(notdir $(GRUB2_IMAGE)) > \
$(BINARIES_DIR)/efi-part/startup.nsh $(BINARIES_DIR)/efi-part/startup.nsh
endef endef
GRUB2_POST_INSTALL_TARGET_HOOKS += GRUB2_EFI_STARTUP_NSH GRUB2_POST_INSTALL_IMAGES_HOOKS += GRUB2_EFI_STARTUP_NSH
endif endif
$(eval $(autotools-package)) $(eval $(autotools-package))
$(eval $(host-autotools-package))