7e64a050fb
Backport a patch from upstream to fix the build on certain versions of
gsc, notably:
Ubuntu 19.10 with gcc (Ubuntu 8.3.0-26ubuntu1~19.10) 8.3.0
Ubuntu 19.10 with gcc (Ubuntu 9.2.1-9ubuntu2) 9.2.1 20191008
The upstream patch is simply a change in the gentpl.py script, which is
used to generate parts of the automake machinery, so if we just backport
the upstream patch, we need to call the script to regenerate those files.
However, the modified script is a python script, so we would need to add
a dependency on host-python (2 or 3), which is not so nice.
Furthermore, calling the script is not enough: it needs a specific set
of optionss for each file it is to generate. That set of options is not
static; it is constructed in the convoluted autogen.sh. Calling
autogen.sh is usally not so good an idea in the Buildroot context, and
indeed this fails becasue it calls to autoreconf, but without our
carefuly crafted options and environment variables.
There was a little light in the tunnel, in that autogen.sh can be told
not to run autoreconf, by setting the environemnt variable
FROM_BOOTSTRAP to an non-=empty string, but this is fraught with various
other side-effects, as in that cause, autogen.sh expects to be valled by
an upper sciopt, bootstrap, which is not provided in the tarball
distribution...
So, between all those issues, autogen, bootstrap, and a host-python (2
or 3) dependency, we choose another route: path the script *and* the one
generated file affected by the change. Since that patched file is a .am
file, we also patch the corresponding .in file
However, we're faced with another issue: the other generated file is
now older than the script, so the automake machinery will now want to
re-run autoconf et al during the build step, which is still not a good
idea for us. So we touch the other generated file so it is mopre recent
than the script.
This is still not sufficient, because the patched file also has a
dependency on the generated file, so we need to touch as well.
Fixes:
- https://bugs.buildroot.org/show_bug.cgi?id=12946
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
[yann.morin.1998@free.fr:
- keep the hunk about patching gentpl.py
- make it a git-formatted patch
- add the touch
- drastically expand the commit log
]
Signed-off-by: Yann E. MORIN <yann.morin.1998@free.fr>
149 lines
4.4 KiB
Makefile
149 lines
4.4 KiB
Makefile
################################################################################
|
|
#
|
|
# grub2
|
|
#
|
|
################################################################################
|
|
|
|
GRUB2_VERSION = 2.04
|
|
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 host-grub2
|
|
HOST_GRUB2_DEPENDENCIES = host-bison host-flex
|
|
GRUB2_INSTALL_IMAGES = YES
|
|
|
|
# 0001-build-Fix-GRUB-i386-pc-build-with-Ubuntu-gcc.patch
|
|
define GRUB2_AVOID_AUTORECONF
|
|
$(Q)touch $(@D)/Makefile.util.am
|
|
$(Q)touch $(@D)/Makefile.in
|
|
endef
|
|
GRUB2_POST_PATCH_HOOKS += GRUB2_AVOID_AUTORECONF
|
|
HOST_GRUB2_POST_PATCH_HOOKS += GRUB2_AVOID_AUTORECONF
|
|
|
|
ifeq ($(BR2_TARGET_GRUB2_INSTALL_TOOLS),y)
|
|
GRUB2_INSTALL_TARGET = YES
|
|
else
|
|
GRUB2_INSTALL_TARGET = NO
|
|
endif
|
|
|
|
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
|
|
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
|
|
endif
|
|
|
|
# Grub2 is kind of special: it considers CC, LD and so on to be the
|
|
# tools to build the host programs and uses TARGET_CC, TARGET_CFLAGS,
|
|
# TARGET_CPPFLAGS, TARGET_LDFLAGS to build the bootloader itself.
|
|
#
|
|
# NOTE: TARGET_STRIP is overridden by !BR2_STRIP_strip, so always
|
|
# use the cross compile variant to ensure grub2 builds
|
|
|
|
HOST_GRUB2_CONF_ENV = \
|
|
CPP="$(HOSTCC) -E"
|
|
|
|
GRUB2_CONF_ENV = \
|
|
CPP="$(TARGET_CC) -E" \
|
|
TARGET_CC="$(TARGET_CC)" \
|
|
TARGET_CFLAGS="$(TARGET_CFLAGS)" \
|
|
TARGET_CPPFLAGS="$(TARGET_CPPFLAGS) -fno-stack-protector" \
|
|
TARGET_LDFLAGS="$(TARGET_LDFLAGS)" \
|
|
TARGET_NM="$(TARGET_NM)" \
|
|
TARGET_OBJCOPY="$(TARGET_OBJCOPY)" \
|
|
TARGET_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
|
|
|
|
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
|
|
|
|
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_INSTALL_IMAGES_CMDS
|
|
mkdir -p $(dir $(GRUB2_IMAGE))
|
|
$(HOST_DIR)/usr/bin/grub-mkimage \
|
|
-d $(@D)/grub-core/ \
|
|
-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
|
|
|
|
ifeq ($(GRUB2_PLATFORM),efi)
|
|
define GRUB2_EFI_STARTUP_NSH
|
|
echo $(notdir $(GRUB2_IMAGE)) > \
|
|
$(BINARIES_DIR)/efi-part/startup.nsh
|
|
endef
|
|
GRUB2_POST_INSTALL_IMAGES_HOOKS += GRUB2_EFI_STARTUP_NSH
|
|
endif
|
|
|
|
$(eval $(autotools-package))
|
|
$(eval $(host-autotools-package))
|