Rootfile update for parted

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

diff --git a/lfs/cdrom b/lfs/cdrom
index 731382abfd5f0bded92c8b82c1ce2f66a52c722d..7150153d70fd1486602d8477b8c6958f96100300 100644 (file)
--- a/lfs/cdrom
+++ b/lfs/cdrom
@@ -29,15 +29,15 @@ VER = ipfire
 THISAPP    = cdrom
 TARGET     = $(DIR_INFO)/$(THISAPP)
 
-ifeq "$(MACHINE_TYPE)" "arm"
+ifeq "$(BUILD_PLATFORM)" "arm"
        TAR_OPTIONS =
 else
        TAR_OPTIONS = --lzma
 endif
 
 ISO_ARGS = -J -r -v \
-       -A "$(NAME) $(VERSION)" \
-       -V "$(NAME)_$(VERSION)" \
+       -A "$(NAME) $(VERSION) $(BUILD_ARCH)" \
+       -V "$(NAME) $(VERSION) $(BUILD_ARCH)" \
        -no-emul-boot \
        -boot-load-size 4 \
        -boot-info-table \
@@ -46,8 +46,8 @@ ISO_ARGS = -J -r -v \
 
 # Only build a stub ISO for ARM
 ifeq "$(BUILD_PLATFORM)" "arm"
-       ISO_ARGS = -J -r -V "$(NAME)_$(VERSION)"
-end
+       ISO_ARGS = -J -r -V "$(NAME) $(VERSION) $(BUILD_ARCH)"
+endif
 
 ISOHYBRID_ARGS =
 
@@ -119,12 +119,45 @@ ifneq "$(BUILD_PLATFORM)" "arm"
        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"
+       # 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
 
-       # XXX Some bootloader needs to be put in this image
+       # 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
+
        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" \