Hello,

If isolinux package is not installed, the build does not fail
and produces a not working ipxe.iso.

Before commit a8f037a275886ed533bb0c005bc5464757f76ca7,
"[build] Merge util/geniso and util/genliso",
there was a check if ISOLINUX_BIN is filled.

Currently an error message is shown while build continues:
    $ LANG=C make -j2 bin/ipxe.iso
    ...
      [GENISO] bin/ipxe.iso
    cp: missing destination file operand after 'bin/iso.dir.dIFpuR'
    Try 'cp --help' for more information.
    genisoimage: Uh oh, I cant find the boot image 'isolinux.bin' !


Kind regards,
Bernhard
From f01d79b4b8f996bc7a2c6169956e5fa4126c0853 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bernhard=20=C3=9Cbelacker?= <bernha...@mailbox.org>
Date: Mon, 19 Sep 2016 16:48:16 +0200
Subject: [geniso] Fail if ISOLINUX_BIN is empty.

If isolinux package is not installed, the build does not fail
and produces a not working ipxe.iso.

Before commit a8f037a275886ed533bb0c005bc5464757f76ca7,
"[build] Merge util/geniso and util/genliso",
there was a check if ISOLINUX_BIN is filled.

Currently an error message is shown while build continues:
    $ LANG=C make -j2 bin/ipxe.iso
    ...
      [GENISO] bin/ipxe.iso
    cp: missing destination file operand after 'bin/iso.dir.dIFpuR'
    Try 'cp --help' for more information.
    genisoimage: Uh oh, I cant find the boot image 'isolinux.bin' !
---
 src/util/geniso | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/src/util/geniso b/src/util/geniso
index ff090d4..a749e4c 100755
--- a/src/util/geniso
+++ b/src/util/geniso
@@ -37,6 +37,12 @@ if [ -z "${OUT}" ]; then
 	exit 1
 fi
 
+# ISOLINUX_BIN should not be empty
+if [ -z "$ISOLINUX_BIN" ]; then
+	echo "$0: ISOLINUX_BIN is empty but should contain path to isolinux.bin. Please install package isolinux." >&2
+	exit 1
+fi
+
 # There should either be mkisofs or the compatible genisoimage program
 for command in genisoimage mkisofs; do
 	if ${command} --version >/dev/null 2>/dev/null; then
-- 
2.1.4

_______________________________________________
ipxe-devel mailing list
ipxe-devel@lists.ipxe.org
https://lists.ipxe.org/mailman/listinfo.cgi/ipxe-devel

Reply via email to