From 7b4323c66ee5e639c841cced6503544c520374e9 Mon Sep 17 00:00:00 2001 From: Michael Tremer Date: Tue, 29 May 2018 20:14:59 +0100 Subject: [PATCH] cdrom: Simplify commands that author the ISO image Signed-off-by: Michael Tremer --- lfs/cdrom | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/lfs/cdrom b/lfs/cdrom index 91d9c9b5a4..731382abfd 100644 --- 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 -- 2.39.2