slang: revert parallelized build
[ipfire-2.x.git] / lfs / cdrom
index 81e0058..56d1fa8 100644 (file)
--- a/lfs/cdrom
+++ b/lfs/cdrom
@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007-2013  IPFire Team  <info@ipfire.org>                     #
+# Copyright (C) 2007-2018  IPFire Team  <info@ipfire.org>                     #
 #                                                                             #
 # This program is free software: you can redistribute it and/or modify        #
 # it under the terms of the GNU General Public License as published by        #
@@ -56,14 +56,6 @@ ISO_ARGS = -J -r -v \
 
 ISOHYBRID_ARGS =
 
-ifeq "$(EFI)" "1"
-       ISO_ARGS += \
-               -eltorito-alt-boot \
-               -e boot/isolinux/efiboot.img
-
-       ISOHYBRID_ARGS += --uefi
-endif
-
 ifeq "$(HAS_ISOLINUX)" "1"
        ISO_ARGS += \
                -no-emul-boot \
@@ -73,6 +65,67 @@ ifeq "$(HAS_ISOLINUX)" "1"
                -c boot/isolinux/boot.catalog
 endif
 
+ifeq "$(EFI)" "1"
+       ISO_ARGS += \
+               -eltorito-alt-boot \
+               -e boot/isolinux/efiboot.img \
+               -no-emul-boot
+
+       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
 ###############################################################################
@@ -127,7 +180,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 
 ifeq "$(HAS_KERNEL)" "1"
        cp /boot/vmlinuz-$(KVER)-ipfire             /install/cdrom/boot/isolinux/vmlinuz
-       dracut --force -a "installer" --strip --xz /install/cdrom/boot/isolinux/instroot $(KVER)-ipfire
+       dracut --force --early-microcode -a "installer" --strip --xz /install/cdrom/boot/isolinux/instroot $(KVER)-ipfire
 endif
 
 ifeq "$(HAS_ISOLINUX)" "1"
@@ -163,7 +216,7 @@ ifeq "$(EFI)" "1"
                --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
@@ -195,4 +248,6 @@ endif
        cd /install/cdrom && mkisofs $(ISO_ARGS) \
                -o /install/images/$(SNAME)-$(VERSION).$(BUILD_ARCH)-full-core$(CORE).iso .
 
+ifeq "$(HAS_ISOLINUX)" "1"
        isohybrid $(ISOHYBRID_ARGS) /install/images/$(SNAME)-$(VERSION).$(BUILD_ARCH)-full-core$(CORE).iso
+endif