From 3f9a482b88d75081efb660e937e9631bbbf54c49 Mon Sep 17 00:00:00 2001
From: Christian Hesse
Date: Wed, 13 Nov 2013 11:46:02 +0100
Subject: [build] Update build system for Syslinux 6.x

Syslinux 6.x places its files into a bios subdirectory, and requires
that a ldlinux.c32 module be included within the ISO image.  Add the
relevant search paths for isolinux.bin, and include the file
ldlinux.c32 within the ISO image if it exists.

Signed-off-by: Michael Brown <mcb30@ipxe.org>
---
 src/util/geniso | 8 ++++++++
 1 file changed, 8 insertions(+)

(limited to 'src/util')

diff --git a/src/util/geniso b/src/util/geniso
index 48ea2f2a..4dc72192 100755
--- a/src/util/geniso
+++ b/src/util/geniso
@@ -38,6 +38,14 @@ shift
 dir=`mktemp -d bin/iso.dir.XXXXXX`
 cfg=$dir/isolinux.cfg
 cp -p $isolinux_bin $dir
+
+# syslinux 6.x needs a file called ldlinux.c32
+ldlinux_c32=$(dirname ${isolinux_bin})/ldlinux.c32
+if [ -s ${ldlinux_c32} ]
+then
+	cp -p ${ldlinux_c32} ${dir}
+fi
+
 cat > $cfg <<EOF
 # These default options can be changed in the geniso script
 SAY iPXE ISO boot image
-- 
cgit v1.2.3-55-g7522