cdrom: Fix building GRUB image for aarch64

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>

diff --git a/lfs/Config b/lfs/Config
index bb2939078b5843947b24a2410b2f0bb94685cf72..63ca2954158ec39eb3882fd45ee8a2c3dba6887a 100644 (file)
--- a/lfs/Config
+++ b/lfs/Config
@@ -83,28 +83,26 @@ CCACHE_COMPILERCHECK += $(shell gcc -dumpspecs 2>/dev/null | md5sum | cut -d ' '
 ifeq "$(BUILD_ARCH)" "x86_64"
        EFI = 1
        EFI_ARCH = x64
 ifeq "$(BUILD_ARCH)" "x86_64"
        EFI = 1
        EFI_ARCH = x64

+       GRUB_ARCH = $(BUILD_ARCH)

 endif
 
 ifeq "$(BUILD_ARCH)" "aarch64"
        EFI = 1
        EFI_ARCH = aa64
 endif
 
 ifeq "$(BUILD_ARCH)" "aarch64"
        EFI = 1
        EFI_ARCH = aa64

+       GRUB_ARCH = arm64

 endif
 
 # Basic modules
 GRUB_EFI_MODULES = \
        configfile \
 endif
 
 # Basic modules
 GRUB_EFI_MODULES = \
        configfile \

-       efi_gop \
-       efi_uga \

        gzio \
        linux \
        gzio \
        linux \

-       loadbios \

        loadenv \
        normal \
        regexp
 
 # Stuff for accessing file systems
 GRUB_EFI_MODULES += \
        loadenv \
        normal \
        regexp
 
 # Stuff for accessing file systems
 GRUB_EFI_MODULES += \

-       ahci \

        ext2 \
        fat \
        iso9660 \
        ext2 \
        fat \
        iso9660 \


@@ -115,15 +113,13 @@ GRUB_EFI_MODULES += \
 # Graphics & IO
 GRUB_EFI_MODULES += \
        all_video \
 # Graphics & IO
 GRUB_EFI_MODULES += \
        all_video \

-       at_keyboard \

        bitmap_scale \
        font \
        gfxmenu \
        gfxterm \
        jpeg \
        png \
        bitmap_scale \
        font \
        gfxmenu \
        gfxterm \
        jpeg \
        png \

-       tga \
-       usb_keyboard
+       tga

 
 # Commands
 GRUB_EFI_MODULES += \
 
 # Commands
 GRUB_EFI_MODULES += \


@@ -144,6 +140,15 @@ GRUB_EFI_MODULES += \
        test \
        true
 
        test \
        true
 

+# Platform dependent modules
+ifeq "$(BUILD_ARCH)" "x86_64"
+       GRUB_EFI_MODULES += \
+               loadbios \
+               ahci \
+               at_keyboard \
+               usb_keyboard
+endif
+

 ###############################################################################
 # Common Macro Definitions
 ###############################################################################
 ###############################################################################
 # Common Macro Definitions
 ###############################################################################

diff --git a/lfs/cdrom b/lfs/cdrom
index 05b4fe891acb2d57f1436fbe9a5780e3bc4f548f..81e005868492805ba23575b3241bd17340ab01a6 100644 (file)
--- a/lfs/cdrom
+++ b/lfs/cdrom
@@ -158,7 +158,7 @@ ifeq "$(EFI)" "1"
        # Build a GRUB EFI image
        mkdir -pv /install/cdrom/EFI/BOOT
        grub-mkimage \
        # Build a GRUB EFI image
        mkdir -pv /install/cdrom/EFI/BOOT
        grub-mkimage \

-               --format=$(BUILD_ARCH)-efi \
+               --format=$(GRUB_ARCH)-efi \

                --output=/install/cdrom/EFI/BOOT/boot$(EFI_ARCH).efi \
                --config=/tmp/grub-efi.cfg \
                --compression=xz \
                --output=/install/cdrom/EFI/BOOT/boot$(EFI_ARCH).efi \
                --config=/tmp/grub-efi.cfg \
                --compression=xz \