cdrom: Simplify commands that author the ISO image

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>

diff --git a/lfs/cdrom b/lfs/cdrom
index 91d9c9b5a41d915366386e45f293bdac11e1a0a7..731382abfd5f0bded92c8b82c1ce2f66a52c722d 100644 (file)
--- a/lfs/cdrom
+++ b/lfs/cdrom
@@ -44,10 +44,19 @@ ISO_ARGS = -J -r -v \
        -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)"
+end
+
+ISOHYBRID_ARGS =
+
 ifeq "$(EFI)" "1"
        ISO_ARGS += \
                -eltorito-alt-boot \
                -e boot/isolinux/efiboot.img
+
+       ISOHYBRID_ARGS += --uefi
 endif
 
 ###############################################################################
@@ -126,16 +135,7 @@ endif
                                                xargs md5sum > md5sum.txt
 
        mkdir -p /install/images
-ifeq "$(BUILD_PLATFORM)" "arm"
-       cd /install/cdrom && mkisofs -J -r -V "$(NAME)_$(VERSION)" \
-               . > /install/images/$(SNAME)-$(VERSION).$(BUILD_ARCH)-full-core$(CORE).iso
-else
        cd /install/cdrom && mkisofs $(ISO_ARGS) \
                -o /install/images/$(SNAME)-$(VERSION).$(BUILD_ARCH)-full-core$(CORE).iso .
 
-ifeq "$(EFI)" "1"
-       isohybrid --uefi /install/images/$(SNAME)-$(VERSION).$(BUILD_ARCH)-full-core$(CORE).iso
-else
-       isohybrid /install/images/$(SNAME)-$(VERSION).$(BUILD_ARCH)-full-core$(CORE).iso
-endif
-endif
+       isohybrid $(ISOHYBRID_ARGS) /install/images/$(SNAME)-$(VERSION).$(BUILD_ARCH)-full-core$(CORE).iso