523b27afa9
In commit2a27294e9a("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, commit20a4583ebf("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 by2a27294e9ano 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>
113 lines
3.6 KiB
Makefile
113 lines
3.6 KiB
Makefile
################################################################################
|
|
#
|
|
# grub2
|
|
#
|
|
################################################################################
|
|
|
|
GRUB2_VERSION = 2.02
|
|
GRUB2_SITE = http://ftp.gnu.org/gnu/grub
|
|
GRUB2_SOURCE = grub-$(GRUB2_VERSION).tar.xz
|
|
GRUB2_LICENSE = GPL-3.0+
|
|
GRUB2_LICENSE_FILES = COPYING
|
|
GRUB2_DEPENDENCIES = host-bison host-flex
|
|
|
|
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))
|
|
|
|
ifeq ($(BR2_TARGET_GRUB2_I386_PC),y)
|
|
GRUB2_IMAGE = $(BINARIES_DIR)/grub.img
|
|
GRUB2_CFG = $(TARGET_DIR)/boot/grub/grub.cfg
|
|
GRUB2_PREFIX = ($(GRUB2_BOOT_PARTITION))/boot/grub
|
|
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
|
|
endif
|
|
|
|
# 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
|
|
# machine), and uses TARGET_CC, TARGET_CFLAGS, TARGET_CPPFLAGS,
|
|
# 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
|
|
# use the cross compile variant to ensure grub2 builds
|
|
|
|
GRUB2_CONF_ENV = \
|
|
$(HOST_CONFIGURE_OPTS) \
|
|
CPP="$(HOSTCC) -E" \
|
|
TARGET_CC="$(TARGET_CC)" \
|
|
TARGET_CFLAGS="$(TARGET_CFLAGS)" \
|
|
TARGET_CPPFLAGS="$(TARGET_CPPFLAGS) -fno-stack-protector" \
|
|
TARGET_LDFLAGS="$(TARGET_LDFLAGS)" \
|
|
NM="$(TARGET_NM)" \
|
|
OBJCOPY="$(TARGET_OBJCOPY)" \
|
|
STRIP="$(TARGET_CROSS)strip"
|
|
|
|
GRUB2_CONF_OPTS = \
|
|
--target=$(GRUB2_TARGET) \
|
|
--with-platform=$(GRUB2_PLATFORM) \
|
|
--prefix=/ \
|
|
--exec-prefix=/ \
|
|
--disable-grub-mkfont \
|
|
--enable-efiemu=no \
|
|
ac_cv_lib_lzma_lzma_code=no \
|
|
--enable-device-mapper=no \
|
|
--enable-libzfs=no \
|
|
--disable-werror
|
|
|
|
# We don't want all the native tools and Grub2 modules to be installed
|
|
# in the target. So we in fact install everything into the host
|
|
# directory, and the image generation process (below) will use the
|
|
# grub-mkimage tool and Grub2 modules from the host directory.
|
|
|
|
GRUB2_INSTALL_TARGET_OPTS = DESTDIR=$(HOST_DIR) install
|
|
|
|
ifeq ($(BR2_TARGET_GRUB2_I386_PC),y)
|
|
define GRUB2_IMAGE_INSTALL_ELTORITO
|
|
cat $(HOST_DIR)/lib/grub/$(GRUB2_TUPLE)/cdboot.img $(GRUB2_IMAGE) > \
|
|
$(BINARIES_DIR)/grub-eltorito.img
|
|
endef
|
|
endif
|
|
|
|
define GRUB2_IMAGE_INSTALLATION
|
|
mkdir -p $(dir $(GRUB2_IMAGE))
|
|
$(HOST_DIR)/bin/grub-mkimage \
|
|
-d $(HOST_DIR)/lib/grub/$(GRUB2_TUPLE) \
|
|
-O $(GRUB2_TUPLE) \
|
|
-o $(GRUB2_IMAGE) \
|
|
-p "$(GRUB2_PREFIX)" \
|
|
$(if $(GRUB2_BUILTIN_CONFIG),-c $(GRUB2_BUILTIN_CONFIG)) \
|
|
$(GRUB2_BUILTIN_MODULES)
|
|
mkdir -p $(dir $(GRUB2_CFG))
|
|
$(INSTALL) -D -m 0644 boot/grub2/grub.cfg $(GRUB2_CFG)
|
|
$(GRUB2_IMAGE_INSTALL_ELTORITO)
|
|
endef
|
|
GRUB2_POST_INSTALL_TARGET_HOOKS += GRUB2_IMAGE_INSTALLATION
|
|
|
|
ifeq ($(GRUB2_PLATFORM),efi)
|
|
define GRUB2_EFI_STARTUP_NSH
|
|
echo $(notdir $(GRUB2_IMAGE)) > \
|
|
$(BINARIES_DIR)/efi-part/startup.nsh
|
|
endef
|
|
GRUB2_POST_INSTALL_TARGET_HOOKS += GRUB2_EFI_STARTUP_NSH
|
|
endif
|
|
|
|
$(eval $(autotools-package))
|