NetCube-Systems-Austria/kumquat-buildroot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
1505ba6d1f
kumquat-buildroot/boot/grub2/grub2.mk

141 lines
4.2 KiB
Makefile
Raw Normal View History

grub2: add new package Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2014-02-19 20:10:18 +01:00
################################################################################
#
# grub2
#
################################################################################
boot/grub2: bump to verson 2.04 - Remove patch (already in version) - Add hash for license file Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
2019-09-18 19:04:47 +02:00
GRUB2_VERSION = 2.04
grub2: bump up version After many years since the last release and a long time with grub 2.02 in beta, there is finally a release and it brings many bug fixes and interesting features such as support for ARM. Patch boot/grub2/0001-remove-gets.patch doesn't seem to be required anymore as grub-core/gnulib/stdio.in.h has changed significantly since "053cfcd Import new gnulib." and has another treatment for gets. Patch boot/grub2/0002-grub-core-gettext-gettext.c-main_context-secondary_c.patch was a backport which is present after the bump and therefore is also no longer necessary. Since we're adding a Config.in comment, we also introduce a BR2_TARGET_GRUB2_ARCH_SUPPORTS hidden boolean, in order to avoid repeating the architecture dependencies. Signed-off-by: Erico Nunes <nunes.erico@gmail.com> Cc: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> [Thomas: add BR2_TARGET_GRUB2_ARCH_SUPPORTS, remove bogus dependencies on ARM and AArch64, since enabling Grub2 on those architectures is done in another commit.] Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2017-04-26 23:39:46 +02:00
GRUB2_SITE = http://ftp.gnu.org/gnu/grub
grub2: add new package Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2014-02-19 20:10:18 +01:00
GRUB2_SOURCE = grub-$(GRUB2_VERSION).tar.xz
boot, package: use SPDX short identifier for GPLv3/GPLv3+ We want to use SPDX identifier for license string as much as possible. SPDX short identifier for GPLv3/GPLv3+ is GPL-3.0/GPL-3.0+. This change is done using following command. find . -name "*.mk" | xargs sed -ri '/LICENSE( )?[\+:]?=/s/\<GPLv3\>/GPL-3.0/g' Signed-off-by: Rahul Bedarkar <rahulbedarkar89@gmail.com> Acked-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2017-03-30 15:43:33 +02:00
GRUB2_LICENSE = GPL-3.0+
grub2: add new package Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2014-02-19 20:10:18 +01:00
GRUB2_LICENSE_FILES = COPYING
boot/grub2: separate target and host builds 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>
2018-09-27 00:37:15 +02:00
GRUB2_DEPENDENCIES = host-bison host-flex host-grub2
HOST_GRUB2_DEPENDENCIES = host-bison host-flex
GRUB2_INSTALL_IMAGES = YES
boot/grub2: add option to install tools Add an option to install grub2 support tools to the target. In the context of Buildroot, some useful target tools provided are grub2-editenv, grub2-reboot, which provide means to manage the grub2, environment, boot order, and others. Signed-off-by: Erico Nunes <nunes.erico@gmail.com> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
2018-09-27 00:37:16 +02:00
ifeq ($(BR2_TARGET_GRUB2_INSTALL_TOOLS),y)
GRUB2_INSTALL_TARGET = YES
else
boot/grub2: separate target and host builds 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>
2018-09-27 00:37:15 +02:00
GRUB2_INSTALL_TARGET = NO
boot/grub2: add option to install tools Add an option to install grub2 support tools to the target. In the context of Buildroot, some useful target tools provided are grub2-editenv, grub2-reboot, which provide means to manage the grub2, environment, boot order, and others. Signed-off-by: Erico Nunes <nunes.erico@gmail.com> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
2018-09-27 00:37:16 +02:00
endif
grub2: add new package Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2014-02-19 20:10:18 +01:00
grub2: Specify boot partition Since boot partition was not specified, grub tools try to detect it automatically. This patch add an option to force it. Signed-off-by: Jérôme Pouiller <jezz@sysmic.org> Acked-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Tested-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2014-07-01 19:49:47 +02:00
GRUB2_BUILTIN_MODULES = $(call qstrip,$(BR2_TARGET_GRUB2_BUILTIN_MODULES))
GRUB2_BUILTIN_CONFIG = $(call qstrip,$(BR2_TARGET_GRUB2_BUILTIN_CONFIG))
GRUB2_BOOT_PARTITION = $(call qstrip,$(BR2_TARGET_GRUB2_BOOT_PARTITION))
grub2: add new package Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2014-02-19 20:10:18 +01:00
ifeq ($(BR2_TARGET_GRUB2_I386_PC),y)
GRUB2_IMAGE = $(BINARIES_DIR)/grub.img
GRUB2_CFG = $(TARGET_DIR)/boot/grub/grub.cfg
grub2: Specify boot partition Since boot partition was not specified, grub tools try to detect it automatically. This patch add an option to force it. Signed-off-by: Jérôme Pouiller <jezz@sysmic.org> Acked-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Tested-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2014-07-01 19:49:47 +02:00
GRUB2_PREFIX = ($(GRUB2_BOOT_PARTITION))/boot/grub
grub2: add new package Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2014-02-19 20:10:18 +01:00
GRUB2_TUPLE = i386-pc
GRUB2_TARGET = i386
GRUB2_PLATFORM = pc
else ifeq ($(BR2_TARGET_GRUB2_I386_EFI),y)
GRUB2_IMAGE = $(BINARIES_DIR)/efi-part/EFI/BOOT/bootia32.efi
GRUB2_CFG = $(BINARIES_DIR)/efi-part/EFI/BOOT/grub.cfg
GRUB2_PREFIX = /EFI/BOOT
GRUB2_TUPLE = i386-efi
GRUB2_TARGET = i386
GRUB2_PLATFORM = efi
else ifeq ($(BR2_TARGET_GRUB2_X86_64_EFI),y)
GRUB2_IMAGE = $(BINARIES_DIR)/efi-part/EFI/BOOT/bootx64.efi
GRUB2_CFG = $(BINARIES_DIR)/efi-part/EFI/BOOT/grub.cfg
GRUB2_PREFIX = /EFI/BOOT
GRUB2_TUPLE = x86_64-efi
GRUB2_TARGET = x86_64
GRUB2_PLATFORM = efi
boot/grub2: enable support for arm and aarch64 targets This commit enables the arm-uboot, arm-efi and aarch64-efi grub2 platforms in Buildroot. With the uboot platform, the grub2 image gets built as a u-boot image and is loaded from u-boot through a regular "bootm". The only requirement from the u-boot side in order to allow this is that u-boot is built with CONFIG_API enabled. CONFIG_API seems to not be enabled by default in most in-tree configurations, however, it seems to be available for quite some time now. So it might be possible to use this even on older u-boot versions. This is available only for arm (32-bit). With the efi platform, grub2 gets built as an EFI executable. This allows EFI firmware to find and load it similarly as it can be done for x86_64. Also, since u-boot v2016.05, u-boot is able to load and boot an EFI executable, so the uboot efi platform can also be used from u-boot in recent versions. This has been enabled (mostly) by default for ARM u-boot. efi platform is available for both arm and aarch64. Signed-off-by: Erico Nunes <nunes.erico@gmail.com> [Thomas: move the BR2_USE_MMU dependency in BR2_TARGET_GRUB2_ARCH_SUPPORTS] Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
2018-09-27 00:37:17 +02:00
else ifeq ($(BR2_TARGET_GRUB2_ARM_UBOOT),y)
GRUB2_IMAGE = $(BINARIES_DIR)/boot-part/grub/grub.img
GRUB2_CFG = $(BINARIES_DIR)/boot-part/grub/grub.cfg
GRUB2_PREFIX = ($(GRUB2_BOOT_PARTITION))/boot/grub
GRUB2_TUPLE = arm-uboot
GRUB2_TARGET = arm
GRUB2_PLATFORM = uboot
else ifeq ($(BR2_TARGET_GRUB2_ARM_EFI),y)
GRUB2_IMAGE = $(BINARIES_DIR)/efi-part/EFI/BOOT/bootarm.efi
GRUB2_CFG = $(BINARIES_DIR)/efi-part/EFI/BOOT/grub.cfg
GRUB2_PREFIX = /EFI/BOOT
GRUB2_TUPLE = arm-efi
GRUB2_TARGET = arm
GRUB2_PLATFORM = efi
else ifeq ($(BR2_TARGET_GRUB2_ARM64_EFI),y)
GRUB2_IMAGE = $(BINARIES_DIR)/efi-part/EFI/BOOT/bootaa64.efi
GRUB2_CFG = $(BINARIES_DIR)/efi-part/EFI/BOOT/grub.cfg
GRUB2_PREFIX = /EFI/BOOT
GRUB2_TUPLE = arm64-efi
GRUB2_TARGET = aarch64
GRUB2_PLATFORM = efi
grub2: add new package Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2014-02-19 20:10:18 +01:00
endif
# Grub2 is kind of special: it considers CC, LD and so on to be the
boot/grub2: separate target and host builds 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>
2018-09-27 00:37:15 +02:00
# tools to build the host programs and uses TARGET_CC, TARGET_CFLAGS,
# TARGET_CPPFLAGS, TARGET_LDFLAGS to build the bootloader itself.
grub2: fix build with BR2_STRIP_none grub2 assumes the strip command will generate output and the output should always be stripped - so, just use the $(TARGET_CROSS)strip to make sure that the build succeeds regardless of the buildroot strip configuration. Signed-off-by: Charles Hardin <ckhardin@exablox.com> Reviewed-by: "Yann E. MORIN" <yann.morin.1998@free.fr> Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2016-05-21 22:11:09 +02:00
#
core: change the strip command from a choice to a boolean Curently, we have a choice to select between stripping and not stripping. This is legacy code from back when we had a third option, sstrip (super-strip). Since we removed sstrip, stripping or not stripping is now just a boolean rather than a choice. Make it so. We make BR2_STRIP_strip default to 'y' to keep the current behaviour of defaulting to stripping. Move BR2_STIP_none to legacy, and instruct the user to review the new setting. Drop any reference to BR2_STRIP_none in comments. Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr> Cc: Arnout Vandecappelle <arnout@mind.be> Cc: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2017-07-01 14:51:21 +02:00
# NOTE: TARGET_STRIP is overridden by !BR2_STRIP_strip, so always
grub2: fix build with BR2_STRIP_none grub2 assumes the strip command will generate output and the output should always be stripped - so, just use the $(TARGET_CROSS)strip to make sure that the build succeeds regardless of the buildroot strip configuration. Signed-off-by: Charles Hardin <ckhardin@exablox.com> Reviewed-by: "Yann E. MORIN" <yann.morin.1998@free.fr> Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2016-05-21 22:11:09 +02:00
# use the cross compile variant to ensure grub2 builds
grub2: add new package Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2014-02-19 20:10:18 +01:00
boot/grub2: separate target and host builds 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>
2018-09-27 00:37:15 +02:00
HOST_GRUB2_CONF_ENV = \
CPP="$(HOSTCC) -E"
grub2: add new package Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2014-02-19 20:10:18 +01:00
GRUB2_CONF_ENV = \
boot/grub2: separate target and host builds 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>
2018-09-27 00:37:15 +02:00
CPP="$(TARGET_CC) -E" \
grub2: add new package Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2014-02-19 20:10:18 +01:00
TARGET_CC="$(TARGET_CC)" \
grub2: force -fno-stack-protector in CPPFLAGS In commit 2a27294e9ade6130a12ced9a1f152c51431a870e ("grub2: force -fno-stack-protector in CFLAGS"), a fix was made to the grub2 package to make it build properly even when SSP support is enabled. However, commit 20a4583ebf7fe97ea22a1ea11621dd44a8114ca5 ("security hardening: add RELFO, FORTIFY options") reworked how SSP options are passed, and they are now passed in CPPFLAGS instead of CFLAGS, making the fix introduced by 2a27294e9ade6130a12ced9a1f152c51431a870e no longer operating. This commit will force no-stack-protector in CPPFLAGS instead of CFLAGS. Fixes bug #10961. Signed-off-by: Tarek El-Sherbiny <tarek_el-sherbiny@waters.com> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
2018-04-19 10:36:59 +02:00
TARGET_CFLAGS="$(TARGET_CFLAGS)" \
TARGET_CPPFLAGS="$(TARGET_CPPFLAGS) -fno-stack-protector" \
grub2: pass target NM, OBJCOPY and STRIP Fixes https://bugs.busybox.net/show_bug.cgi?id=8256 grub2's build system interprets CC, CFLAGS and CPPFLAGS as for the host and uses TARGET_CC etc. for the target. However, NM, OBJCOPY and STRIP are used for the target. We currently pass the host-versions of these tools as part of $(HOST_CONFIGURE_OPTS). While we're at it, also pass TARGET_LDFLAGS. This problem had not been noticed up to now because usually we build on an x86 machine for the x86 architecture, so the binutils are compatible. However, this is not true on an i386 when building for x86_64. Cc: Christophe Bricout <christophebricout@yahoo.fr> Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2015-09-08 23:30:41 +02:00
TARGET_LDFLAGS="$(TARGET_LDFLAGS)" \
boot/grub2: separate target and host builds 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>
2018-09-27 00:37:15 +02:00
TARGET_NM="$(TARGET_NM)" \
TARGET_OBJCOPY="$(TARGET_OBJCOPY)" \
TARGET_STRIP="$(TARGET_CROSS)strip"
grub2: add new package Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2014-02-19 20:10:18 +01:00
packages: rename FOO_CONF_OPT into FOO_CONF_OPTS To be consistent with the recent change of FOO_MAKE_OPT into FOO_MAKE_OPTS, make the same change for FOO_CONF_OPT. Sed command used: find * -type f | xargs sed -i 's#_CONF_OPT\>#&S#g' Signed-off-by: Thomas De Schampheleire <thomas.de.schampheleire@gmail.com> Reviewed-by: "Yann E. MORIN" <yann.morin.1998@free.fr> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2014-09-27 21:32:44 +02:00
GRUB2_CONF_OPTS = \
grub2: add new package Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2014-02-19 20:10:18 +01:00
--target=$(GRUB2_TARGET) \
--with-platform=$(GRUB2_PLATFORM) \
grub2: install in $(HOST_DIR) instead of $(HOST_DIR)/usr grub2 builds for the target but installs with DESTDIR=$(HOST_DIR). Since we set prefix to /usr in TARGET_CONF_OPTS, this results in installing things in $(HOST_DIR)/usr. To make sure we don't install in $(HOST_DIR)/usr, override --prefix and --exec-prefix. Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2017-07-05 13:14:47 +02:00
--prefix=/ \
--exec-prefix=/ \
grub2: add new package Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2014-02-19 20:10:18 +01:00
--disable-grub-mkfont \
--enable-efiemu=no \
grub2: really disable liblzma There is no option --enable-liblzma=no in grub2's configure script, so the only way to disable liblzma support is to pass ac_cv_lib_lzma_lzma_code=no. Signed-off-by: Gilles Chanteperdrix <gilles.chanteperdrix@xenomai.org> Tested-by: "Yann E. MORIN" <yann.morin.1998@free.fr> Reviewed-by: "Yann E. MORIN" <yann.morin.1998@free.fr> [Thomas: expand commit log, as suggested by Yann E. Morin.] Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2016-06-14 17:11:18 +02:00
ac_cv_lib_lzma_lzma_code=no \
grub2: add new package Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2014-02-19 20:10:18 +01:00
--enable-device-mapper=no \
--enable-libzfs=no \
--disable-werror
boot/grub2: separate target and host builds 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>
2018-09-27 00:37:15 +02:00
HOST_GRUB2_CONF_OPTS = \
--disable-grub-mkfont \
--enable-efiemu=no \
ac_cv_lib_lzma_lzma_code=no \
--enable-device-mapper=no \
--enable-libzfs=no \
--disable-werror
grub2: add new package Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2014-02-19 20:10:18 +01:00
grub2: build El Torito image only for i386 PC platform Building Grub2 El Torito for i386 EFI errors complaining it cannot find cdboot.img cdboot.img: No such file or directory This commit builds El Torito for i386 PC only. [Thomas: fix installation ordering.] Signed-off-by: Ray Kinsella <ray.kinsella@intel.com> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2015-07-29 13:52:14 +02:00
ifeq ($(BR2_TARGET_GRUB2_I386_PC),y)
define GRUB2_IMAGE_INSTALL_ELTORITO
Globally replace $(HOST_DIR)/usr/lib with $(HOST_DIR)/lib Since things are no longer installed in $(HOST_DIR)/usr, the callers should also not refer to it. This is a mechanical change with git grep -l '$(HOST_DIR)/usr/lib' | xargs sed -i 's%$(HOST_DIR)/usr/lib%$(HOST_DIR)/lib%g' Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2017-07-05 13:14:21 +02:00
cat $(HOST_DIR)/lib/grub/$(GRUB2_TUPLE)/cdboot.img $(GRUB2_IMAGE) > \
grub2: build El Torito image only for i386 PC platform Building Grub2 El Torito for i386 EFI errors complaining it cannot find cdboot.img cdboot.img: No such file or directory This commit builds El Torito for i386 PC only. [Thomas: fix installation ordering.] Signed-off-by: Ray Kinsella <ray.kinsella@intel.com> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2015-07-29 13:52:14 +02:00
$(BINARIES_DIR)/grub-eltorito.img
endef
endif
boot/grub2: separate target and host builds 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>
2018-09-27 00:37:15 +02:00
define GRUB2_INSTALL_IMAGES_CMDS
grub2: add new package Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2014-02-19 20:10:18 +01:00
mkdir -p $(dir $(GRUB2_IMAGE))
boot/grub2: separate target and host builds 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>
2018-09-27 00:37:15 +02:00
$(HOST_DIR)/usr/bin/grub-mkimage \
-d $(@D)/grub-core/ \
grub2: add new package Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2014-02-19 20:10:18 +01:00
-O $(GRUB2_TUPLE) \
-o $(GRUB2_IMAGE) \
grub2: Specify boot partition Since boot partition was not specified, grub tools try to detect it automatically. This patch add an option to force it. Signed-off-by: Jérôme Pouiller <jezz@sysmic.org> Acked-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Tested-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2014-07-01 19:49:47 +02:00
-p "$(GRUB2_PREFIX)" \
grub2: add a configuration option to embed a config file Add an option for embedding a config file directly in grub. Signed-off-by: Dima Zavin <dmitriyz@google.com> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2014-04-04 10:32:17 +02:00
$(if $(GRUB2_BUILTIN_CONFIG),-c $(GRUB2_BUILTIN_CONFIG)) \
grub2: add new package Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2014-02-19 20:10:18 +01:00
$(GRUB2_BUILTIN_MODULES)
mkdir -p $(dir $(GRUB2_CFG))
$(INSTALL) -D -m 0644 boot/grub2/grub.cfg $(GRUB2_CFG)
grub2: build El Torito image only for i386 PC platform Building Grub2 El Torito for i386 EFI errors complaining it cannot find cdboot.img cdboot.img: No such file or directory This commit builds El Torito for i386 PC only. [Thomas: fix installation ordering.] Signed-off-by: Ray Kinsella <ray.kinsella@intel.com> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2015-07-29 13:52:14 +02:00
$(GRUB2_IMAGE_INSTALL_ELTORITO)
grub2: add new package Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2014-02-19 20:10:18 +01:00
endef
ifeq ($(GRUB2_PLATFORM),efi)
define GRUB2_EFI_STARTUP_NSH
echo $(notdir $(GRUB2_IMAGE)) > \
$(BINARIES_DIR)/efi-part/startup.nsh
endef
boot/grub2: separate target and host builds 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>
2018-09-27 00:37:15 +02:00
GRUB2_POST_INSTALL_IMAGES_HOOKS += GRUB2_EFI_STARTUP_NSH
grub2: add new package Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2014-02-19 20:10:18 +01:00
endif
$(eval $(autotools-package))
boot/grub2: separate target and host builds 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>
2018-09-27 00:37:15 +02:00
$(eval $(host-autotools-package))
Reference in New Issue Copy Permalink