cdrom: Install ISOLINUX only on some architectures

[ipfire-2.x.git] / lfs / cdrom

diff --git a/lfs/cdrom b/lfs/cdrom
index 3b6d0d390d230f2e4a3a76eb358097436dd12a7d..05b4fe891acb2d57f1436fbe9a5780e3bc4f548f 100644 (file)
--- a/lfs/cdrom
+++ b/lfs/cdrom
@@ -35,20 +35,25 @@ else
        TAR_OPTIONS = --lzma
 endif
 
-ISO_ARGS = -J -r -v \
-       -A "$(NAME) $(VERSION)" \
-       -V "$(NAME)_$(VERSION)" \
-       -no-emul-boot \
-       -boot-load-size 4 \
-       -boot-info-table \
-       -b boot/isolinux/isolinux.bin \
-       -c boot/isolinux/boot.catalog
-
-# Only build a stub ISO for ARM
-ifeq "$(BUILD_PLATFORM)" "arm"
-       ISO_ARGS = -J -r -V "$(NAME)_$(VERSION)"
+HAS_MEMTEST = 0
+HAS_IPXE = 0
+HAS_ISOLINUX = 0
+HAS_KERNEL = 1
+
+ifeq "$(BUILD_PLATFORM)" "x86"
+       HAS_MEMTEST = 1
+       HAS_IPXE = 1
+       HAS_ISOLINUX = 1
 endif
 
+ifeq "$(BUILD_ARCH)" "armv5tel"
+       HAS_KERNEL = 0
+endif
+
+ISO_ARGS = -J -r -v \
+       -A "$(NAME) $(VERSION) $(BUILD_ARCH)" \
+       -V "$(NAME) $(VERSION) $(BUILD_ARCH)"
+
 ISOHYBRID_ARGS =
 
 ifeq "$(EFI)" "1"
@@ -59,6 +64,15 @@ ifeq "$(EFI)" "1"
        ISOHYBRID_ARGS += --uefi
 endif
 
+ifeq "$(HAS_ISOLINUX)" "1"
+       ISO_ARGS += \
+               -no-emul-boot \
+               -boot-load-size 4 \
+               -boot-info-table \
+               -b boot/isolinux/isolinux.bin \
+               -c boot/isolinux/boot.catalog
+endif
+
 ###############################################################################
 # Top-level Rules
 ###############################################################################
@@ -109,28 +123,71 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        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
+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
-ifeq "$(EFI)" "1"
-       dd if=/dev/zero of=/install/cdrom/boot/isolinux/efiboot.img bs=1k count=1440
-       mkdosfs -F 12 -n "IPFIRE_EFI" /install/cdrom/boot/isolinux/efiboot.img
-
-       # XXX Some bootloader needs to be put in this image
-endif
        cp /usr/share/hwdata/pci.ids                /install/cdrom/boot/isolinux/pci.ids
        cp -vf /usr/share/syslinux/*.c32            /install/cdrom/boot/isolinux/
        sed -e "s/VERSION/$(VERSION) - Core $(CORE)/g" \
                $(DIR_SRC)/config/syslinux/syslinux.cfg \
                > /install/cdrom/boot/isolinux/isolinux.cfg
 endif
+
+ifeq "$(HAS_MEMTEST)" "1"
+       # Install memtest
+       cp /usr/lib/memtest86+/memtest.bin          /install/cdrom/boot/isolinux/memtest
+endif
+
+ifeq "$(HAS_IPXE)" "1"
+       cp /usr/share/ipfire-netboot/ipxe.lkrn      /install/cdrom/boot/isolinux/netboot
+endif
+
+ifeq "$(EFI)" "1"
+       # Generate embedded GRUB configuration
+       sed -e "s/NAME/$(NAME)/g" -e "s/VERSION/$(VERSION)/g" -e "s/ARCH/$(BUILD_ARCH)/g" \
+               $(DIR_SRC)/config/cdrom/grub-efi.cfg > /tmp/grub-efi.cfg
+
+       # Build a GRUB EFI image
+       mkdir -pv /install/cdrom/EFI/BOOT
+       grub-mkimage \
+               --format=$(BUILD_ARCH)-efi \
+               --output=/install/cdrom/EFI/BOOT/boot$(EFI_ARCH).efi \
+               --config=/tmp/grub-efi.cfg \
+               --compression=xz \
+               --prefix=/EFI/BOOT \
+               $(GRUB_EFI_MODULES)
+
+       # Install GRUB configuration
+       mkdir -pv /install/cdrom/EFI/BOOT
+       sed -e "s/NAME/$(NAME)/g" -e "s/VERSION/$(VERSION)/g" -e "s/ARCH/$(BUILD_ARCH)/g" \
+               < $(DIR_SRC)/config/cdrom/grub.cfg > /install/cdrom/EFI/BOOT/grub.cfg
+
+       # Create the EFI Eltorito image
+       dd if=/dev/zero of=/install/cdrom/boot/isolinux/efiboot.img bs=1k count=1440
+       mkdosfs -F 12 -n "IPFIRE_EFI" /install/cdrom/boot/isolinux/efiboot.img
+
+       # Mount the EFI image
+       mkdir -pv /install/efiboot.img
+       mount -o loop /install/cdrom/boot/isolinux/efiboot.img /install/efiboot.img
+
+       # Copy the bootloader into the image
+       mkdir -pv /install/efiboot.img/EFI/BOOT
+       cp -a /install/cdrom/EFI/BOOT/boot$(EFI_ARCH).efi \
+               /install/efiboot.img/EFI/BOOT/boot$(EFI_ARCH).efi
+
+       # Cleanup
+       umount /install/efiboot.img
+       rm -rf /install/efiboot.img /tmp/grub-efi.cfg
+endif
+
        cd /install/cdrom && find -type f ! -name md5sum.txt | grep -v "./boot" | \
                                                xargs md5sum > md5sum.txt