cdrom: Add grub.cfg that allows to install IPFire

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

diff --git a/lfs/cdrom b/lfs/cdrom
index d21f69c7de61e09531916ee286907c1e990bf956..08cbcb772d416263762d8219bdf6fc36bee75523 100644 (file)
--- a/lfs/cdrom
+++ b/lfs/cdrom
@@ -36,8 +36,8 @@ else
 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,7 +46,7 @@ ISO_ARGS = -J -r -v \
 
 # Only build a stub ISO for ARM
 ifeq "$(BUILD_PLATFORM)" "arm"
-       ISO_ARGS = -J -r -V "$(NAME)_$(VERSION)"
+       ISO_ARGS = -J -r -V "$(NAME) $(VERSION) $(BUILD_ARCH)"
 endif
 
 ISOHYBRID_ARGS =
@@ -125,11 +125,15 @@ 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
 
+       # 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
        grub-mkimage \
                --format=$(BUILD_ARCH)-efi \
                --output=/tmp/boot$(EFI_ARCH).efi \
-               --config=$(DIR_SRC)/config/cdrom/grub-efi.cfg \
+               --config=/tmp/grub-efi.cfg \
                --compression=xz \
                --prefix=/EFI/BOOT \
                $(GRUB_EFI_MODULES)
@@ -144,7 +148,12 @@ ifeq "$(EFI)" "1"
 
        # Cleanup
        umount /install/efiboot.img
-       rm -rf /install/efiboot.img /tmp/boot$(EFI_ARCH).efi
+       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
 endif
 
        cp /usr/share/hwdata/pci.ids                /install/cdrom/boot/isolinux/pci.ids