cdrom: Install iPXE only on x86

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

diff --git a/lfs/cdrom b/lfs/cdrom
index 08cbcb772d416263762d8219bdf6fc36bee75523..b00e4a54e0799a07a668eb1e77962e22e079ed85 100644 (file)
--- a/lfs/cdrom
+++ b/lfs/cdrom
@@ -45,7 +45,7 @@ ISO_ARGS = -J -r -v \
        -c boot/isolinux/boot.catalog
 
 # Only build a stub ISO for ARM
-ifeq "$(BUILD_PLATFORM)" "arm"
+ifeq "$(BUILD_ARCH)" "armv5tel"
        ISO_ARGS = -J -r -V "$(NAME) $(VERSION) $(BUILD_ARCH)"
 endif
 
@@ -59,6 +59,14 @@ ifeq "$(EFI)" "1"
        ISOHYBRID_ARGS += --uefi
 endif
 
+HAS_MEMTEST = 0
+HAS_IPXE = 0
+
+ifeq "$(BUILD_PLATFORM)" "x86"
+       HAS_MEMTEST = 1
+       HAS_IPXE = 1
+endif
+
 ###############################################################################
 # Top-level Rules
 ###############################################################################
@@ -112,48 +120,57 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        # 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"
+ifneq "$(BUILD_ARCH)" "armv5tel"
        cp /boot/vmlinuz-$(KVER)-ipfire             /install/cdrom/boot/isolinux/vmlinuz
        dracut --force -a "installer" --strip --xz /install/cdrom/boot/isolinux/instroot $(KVER)-ipfire
        cp $(DIR_SRC)/config/syslinux/boot.png      /install/cdrom/boot/isolinux/boot.png
+       cp /usr/share/syslinux/isolinux.bin         /install/cdrom/boot/isolinux/isolinux.bin
+
+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
-       cp /usr/share/syslinux/isolinux.bin         /install/cdrom/boot/isolinux/isolinux.bin
+endif
 
 ifeq "$(EFI)" "1"
-       # 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
-
        # 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=/tmp/boot$(EFI_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 /tmp/boot$(EFI_ARCH).efi /install/efiboot.img/EFI/BOOT/boot$(EFI_ARCH).efi
+       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/boot$(EFI_ARCH).efi /tmp/grub-efi.cfg
-
-       # 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
+       rm -rf /install/efiboot.img /tmp/grub-efi.cfg
 endif
 
        cp /usr/share/hwdata/pci.ids                /install/cdrom/boot/isolinux/pci.ids