cdrom: Move list of EFI modules to lfs/cdrom

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

diff --git a/lfs/Config b/lfs/Config
index 63ca2954158ec39eb3882fd45ee8a2c3dba6887a..516fb1cabb8ee276ea639a30050beef9feb8c79e 100644 (file)
--- a/lfs/Config
+++ b/lfs/Config
@@ -92,63 +92,6 @@ ifeq "$(BUILD_ARCH)" "aarch64"
        GRUB_ARCH = arm64
 endif
 
        GRUB_ARCH = arm64
 endif
 

-# Basic modules
-GRUB_EFI_MODULES = \
-       configfile \
-       gzio \
-       linux \
-       loadenv \
-       normal \
-       regexp
-
-# Stuff for accessing file systems
-GRUB_EFI_MODULES += \
-       ext2 \
-       fat \
-       iso9660 \
-       part_gpt \
-       part_msdos \
-       udf
-
-# Graphics & IO
-GRUB_EFI_MODULES += \
-       all_video \
-       bitmap_scale \
-       font \
-       gfxmenu \
-       gfxterm \
-       jpeg \
-       png \
-       tga
-
-# Commands
-GRUB_EFI_MODULES += \
-       boot \
-       cat \
-       chain \
-       echo \
-       halt \
-       help \
-       ls \
-       minicmd \
-       probe \
-       reboot \
-       search \
-       search_fs_file \
-       search_fs_uuid \
-       search_label \
-       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 37fb3329f5532ca60a622ad09de39565ea30a8a4..5faaa1704cbeacb8d049b2e6a71a7188fa50ee0f 100644 (file)
--- a/lfs/cdrom
+++ b/lfs/cdrom
@@ -74,6 +74,58 @@ ifeq "$(EFI)" "1"
        ISOHYBRID_ARGS += --uefi
 endif
 
        ISOHYBRID_ARGS += --uefi
 endif
 

+GRUB_EFI_MODULES = \
+       all_video \
+       at_keyboard \
+       boot \
+       bitmap_scale \
+       cat \
+       chain \
+       configfile \
+       disk \
+       echo \
+       efi_gop \
+       efi_uga \
+       ext2 \
+       extcmd \
+       fat \
+       file \
+       font \
+       fxterm_menu \
+       gfxterm \
+       gfxmenu \
+       gfxterm_background \
+       gzio \
+       halt \
+       help \
+       iso9660 \
+       jpeg \
+       loadbios \
+       loadenv \
+       loopback \
+       linux \
+       ls \
+       memdisk \
+       minicmd \
+       nativedisk \
+       normal \
+       ntfs \
+       part_gpt \
+       part_msdos \
+       png \
+       probe \
+       reboot \
+       regexp \
+       search \
+       search_fs_file \
+       search_fs_uuid \
+       search_label \
+       tar \
+       test \
+       tga \
+       true \
+       usb_keyboard
+

 ###############################################################################
 # Top-level Rules
 ###############################################################################
 ###############################################################################
 # Top-level Rules
 ###############################################################################


@@ -164,7 +216,7 @@ ifeq "$(EFI)" "1"
                --config=/tmp/grub-efi.cfg \
                --compression=xz \
                --prefix=/EFI/BOOT \
                --config=/tmp/grub-efi.cfg \
                --compression=xz \
                --prefix=/EFI/BOOT \

-               $(GRUB_EFI_MODULES)
+               $$(for mod in $(GRUB_EFI_MODULES); do [ -f "/usr/lib/grub/$(GRUB_ARCH)-efi/$${mod}.mod" ] && echo "$${mod}"; done)

 
        # Install GRUB configuration
        mkdir -pv /install/cdrom/EFI/BOOT
 
        # Install GRUB configuration
        mkdir -pv /install/cdrom/EFI/BOOT