|
@@ -57,53 +57,65 @@ GRUB2_INSTALL_TARGET = NO
|
|
|
endif
|
|
|
GRUB2_CPE_ID_VENDOR = gnu
|
|
|
|
|
|
-GRUB2_BUILTIN_MODULES = $(call qstrip,$(BR2_TARGET_GRUB2_BUILTIN_MODULES))
|
|
|
-GRUB2_BUILTIN_CONFIG = $(call qstrip,$(BR2_TARGET_GRUB2_BUILTIN_CONFIG))
|
|
|
+GRUB2_BUILTIN_MODULES_PC = $(call qstrip,$(BR2_TARGET_GRUB2_BUILTIN_MODULES_PC))
|
|
|
+GRUB2_BUILTIN_MODULES_EFI = $(call qstrip,$(BR2_TARGET_GRUB2_BUILTIN_MODULES_EFI))
|
|
|
+GRUB2_BUILTIN_CONFIG_PC = $(call qstrip,$(BR2_TARGET_GRUB2_BUILTIN_CONFIG_PC))
|
|
|
+GRUB2_BUILTIN_CONFIG_EFI = $(call qstrip,$(BR2_TARGET_GRUB2_BUILTIN_CONFIG_EFI))
|
|
|
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_IMAGE_i386-pc = $(BINARIES_DIR)/grub.img
|
|
|
+GRUB2_CFG_i386-pc = $(TARGET_DIR)/boot/grub/grub.cfg
|
|
|
+GRUB2_PREFIX_i386-pc = ($(GRUB2_BOOT_PARTITION))/boot/grub
|
|
|
+GRUB2_TARGET_i386-pc = i386
|
|
|
+GRUB2_PLATFORM_i386-pc = pc
|
|
|
+GRUB2_BUILTIN_CONFIG_i386-pc = $(GRUB2_BUILTIN_CONFIG_PC)
|
|
|
+GRUB2_BUILTIN_MODULES_i386-pc = $(GRUB2_BUILTIN_MODULES_PC)
|
|
|
+GRUB2_TUPLES-$(BR2_TARGET_GRUB2_I386_PC) += i386-pc
|
|
|
+
|
|
|
+GRUB2_IMAGE_i386-efi = $(BINARIES_DIR)/efi-part/EFI/BOOT/bootia32.efi
|
|
|
+GRUB2_CFG_i386-efi = $(BINARIES_DIR)/efi-part/EFI/BOOT/grub.cfg
|
|
|
+GRUB2_PREFIX_i386-efi = /EFI/BOOT
|
|
|
+GRUB2_TARGET_i386-efi = i386
|
|
|
+GRUB2_PLATFORM_i386-efi = efi
|
|
|
+GRUB2_BUILTIN_CONFIG_i386-efi = $(GRUB2_BUILTIN_CONFIG_EFI)
|
|
|
+GRUB2_BUILTIN_MODULES_i386-efi = $(GRUB2_BUILTIN_MODULES_EFI)
|
|
|
+GRUB2_TUPLES-$(BR2_TARGET_GRUB2_I386_EFI) += i386-efi
|
|
|
+
|
|
|
+GRUB2_IMAGE_x86_64-efi = $(BINARIES_DIR)/efi-part/EFI/BOOT/bootx64.efi
|
|
|
+GRUB2_CFG_x86_64-efi = $(BINARIES_DIR)/efi-part/EFI/BOOT/grub.cfg
|
|
|
+GRUB2_PREFIX_x86_64-efi = /EFI/BOOT
|
|
|
+GRUB2_TARGET_x86_64-efi = x86_64
|
|
|
+GRUB2_PLATFORM_x86_64-efi = efi
|
|
|
+GRUB2_BUILTIN_CONFIG_x86_64-efi = $(GRUB2_BUILTIN_CONFIG_EFI)
|
|
|
+GRUB2_BUILTIN_MODULES_x86_64-efi = $(GRUB2_BUILTIN_MODULES_EFI)
|
|
|
+GRUB2_TUPLES-$(BR2_TARGET_GRUB2_X86_64_EFI) += x86_64-efi
|
|
|
+
|
|
|
+GRUB2_IMAGE_arm-uboot = $(BINARIES_DIR)/boot-part/grub/grub.img
|
|
|
+GRUB2_CFG_arm-uboot = $(BINARIES_DIR)/boot-part/grub/grub.cfg
|
|
|
+GRUB2_PREFIX_arm-uboot = ($(GRUB2_BOOT_PARTITION))/boot/grub
|
|
|
+GRUB2_TARGET_arm-uboot = arm
|
|
|
+GRUB2_PLATFORM_arm-uboot = uboot
|
|
|
+GRUB2_BUILTIN_CONFIG_arm-uboot = $(GRUB2_BUILTIN_CONFIG_PC)
|
|
|
+GRUB2_BUILTIN_MODULES_arm-uboot = $(GRUB2_BUILTIN_MODULES_PC)
|
|
|
+GRUB2_TUPLES-$(BR2_TARGET_GRUB2_ARM_UBOOT) += arm-uboot
|
|
|
+
|
|
|
+GRUB2_IMAGE_arm-efi = $(BINARIES_DIR)/efi-part/EFI/BOOT/bootarm.efi
|
|
|
+GRUB2_CFG_arm-efi = $(BINARIES_DIR)/efi-part/EFI/BOOT/grub.cfg
|
|
|
+GRUB2_PREFIX_arm-efi = /EFI/BOOT
|
|
|
+GRUB2_TARGET_arm-efi = arm
|
|
|
+GRUB2_PLATFORM_arm-efi = efi
|
|
|
+GRUB2_BUILTIN_CONFIG_arm-efi = $(GRUB2_BUILTIN_CONFIG_EFI)
|
|
|
+GRUB2_BUILTIN_MODULES_arm-efi = $(GRUB2_BUILTIN_MODULES_EFI)
|
|
|
+GRUB2_TUPLES-$(BR2_TARGET_GRUB2_ARM_EFI) += arm-efi
|
|
|
+
|
|
|
+GRUB2_IMAGE_arm64-efi = $(BINARIES_DIR)/efi-part/EFI/BOOT/bootaa64.efi
|
|
|
+GRUB2_CFG_arm64-efi = $(BINARIES_DIR)/efi-part/EFI/BOOT/grub.cfg
|
|
|
+GRUB2_PREFIX_arm64-efi = /EFI/BOOT
|
|
|
+GRUB2_TARGET_arm64-efi = aarch64
|
|
|
+GRUB2_PLATFORM_arm64-efi = efi
|
|
|
+GRUB2_BUILTIN_CONFIG_arm64-efi = $(GRUB2_BUILTIN_CONFIG_EFI)
|
|
|
+GRUB2_BUILTIN_MODULES_arm64-efi = $(GRUB2_BUILTIN_MODULES_EFI)
|
|
|
+GRUB2_TUPLES-$(BR2_TARGET_GRUB2_ARM64_EFI) += arm64-efi
|
|
|
|
|
|
# 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,
|
|
@@ -127,18 +139,6 @@ GRUB2_CONF_ENV = \
|
|
|
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 \
|
|
@@ -147,26 +147,53 @@ HOST_GRUB2_CONF_OPTS = \
|
|
|
--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
|
|
|
+define GRUB2_CONFIGURE_CMDS
|
|
|
+ $(foreach tuple, $(GRUB2_TUPLES-y), \
|
|
|
+ mkdir -p $(@D)/build-$(tuple) ; \
|
|
|
+ cd $(@D)/build-$(tuple) ; \
|
|
|
+ $(TARGET_CONFIGURE_OPTS) \
|
|
|
+ $(TARGET_CONFIGURE_ARGS) \
|
|
|
+ $(GRUB2_CONF_ENV) \
|
|
|
+ ../configure \
|
|
|
+ --target=$(GRUB2_TARGET_$(tuple)) \
|
|
|
+ --with-platform=$(GRUB2_PLATFORM_$(tuple)) \
|
|
|
+ --host=$(GNU_TARGET_NAME) \
|
|
|
+ --build=$(GNU_HOST_NAME) \
|
|
|
+ --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
|
|
|
+ )
|
|
|
+endef
|
|
|
+
|
|
|
+define GRUB2_BUILD_CMDS
|
|
|
+ $(foreach tuple, $(GRUB2_TUPLES-y), \
|
|
|
+ $(TARGET_MAKE_ENV) $(MAKE) -C $(@D)/build-$(tuple)
|
|
|
+ )
|
|
|
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)
|
|
|
+ $(foreach tuple, $(GRUB2_TUPLES-y), \
|
|
|
+ mkdir -p $(dir $(GRUB2_IMAGE_$(tuple))) ; \
|
|
|
+ $(HOST_DIR)/usr/bin/grub-mkimage \
|
|
|
+ -d $(@D)/build-$(tuple)/grub-core/ \
|
|
|
+ -O $(tuple) \
|
|
|
+ -o $(GRUB2_IMAGE_$(tuple)) \
|
|
|
+ -p "$(GRUB2_PREFIX_$(tuple))" \
|
|
|
+ $(if $(GRUB2_BUILTIN_CONFIG_$(tuple)), \
|
|
|
+ -c $(GRUB2_BUILTIN_CONFIG_$(tuple))) \
|
|
|
+ $(GRUB2_BUILTIN_MODULES_$(tuple)) ; \
|
|
|
+ $(INSTALL) -D -m 0644 boot/grub2/grub.cfg $(GRUB2_CFG_$(tuple)) ; \
|
|
|
+ $(if $(findstring $(GRUB2_PLATFORM_$(tuple)), pc), \
|
|
|
+ cat $(HOST_DIR)/lib/grub/$(tuple)/cdboot.img $(GRUB2_IMAGE_$(tuple)) > \
|
|
|
+ $(BINARIES_DIR)/grub-eltorito.img ; \
|
|
|
+ ) \
|
|
|
+ )
|
|
|
endef
|
|
|
|
|
|
-$(eval $(autotools-package))
|
|
|
+$(eval $(generic-package))
|
|
|
$(eval $(host-autotools-package))
|