Merge remote-tracking branch 'origin/efi' into next

diff --cc lfs/cdrom
index 08bd609c478652957486672d914c391e3e391a68,5faaa1704cbeacb8d049b2e6a71a7188fa50ee0f..c33919c386a8e369bf4112a261dce44cbd8a492c
--- 1/lfs/cdrom
--- 2/lfs/cdrom
+++ b/lfs/cdrom
@@@ -79,15 -176,16 +176,16 @@@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(
        cp $(DIR_SRC)/doc/COPYING                               /install/cdrom/
        cp $(DIR_SRC)/doc/{ChangeLog,packages-list.txt} /install/cdrom/doc
  
-       # Make the ISO
        mkdir -p /install/cdrom/boot/isolinux
-       dd if=/dev/zero  bs=1k count=2            > /install/cdrom/boot/isolinux/boot.catalog
- ifneq "$(BUILD_PLATFORM)" "arm"
+ 
+ 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"
+       dd if=/dev/zero  bs=1k count=2            > /install/cdrom/boot/isolinux/boot.catalog
        cp $(DIR_SRC)/config/syslinux/boot.png      /install/cdrom/boot/isolinux/boot.png
-       cp /usr/lib/memtest86+/memtest.bin          /install/cdrom/boot/isolinux/memtest
-       cp /usr/share/ipfire-netboot/ipxe.lkrn      /install/cdrom/boot/isolinux/netboot
        cp /usr/share/syslinux/isolinux.bin         /install/cdrom/boot/isolinux/isolinux.bin
        cp /usr/share/hwdata/pci.ids                /install/cdrom/boot/isolinux/pci.ids
        cp -vf /usr/share/syslinux/*.c32            /install/cdrom/boot/isolinux/

diff --cc make.sh
Simple merge

diff --cc src/scripts/backupiso
Simple merge