diff options
| author | Christian Hesse | 2013-11-13 11:46:02 +0100 |
|---|---|---|
| committer | Michael Brown | 2013-11-15 12:59:44 +0100 |
| commit | 3f9a482b88d75081efb660e937e9631bbbf54c49 (patch) | |
| tree | aab9e595353da9f261a436f2a421cf895b6aec50 /src/arch | |
| parent | [dhcpv6] Add basic support for stateful and stateless DHCPv6 (diff) | |
| download | ipxe-3f9a482b88d75081efb660e937e9631bbbf54c49.tar.gz ipxe-3f9a482b88d75081efb660e937e9631bbbf54c49.tar.xz ipxe-3f9a482b88d75081efb660e937e9631bbbf54c49.zip | |
[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>
Diffstat (limited to 'src/arch')
| -rw-r--r-- | src/arch/i386/Makefile | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/arch/i386/Makefile b/src/arch/i386/Makefile index 8314f26da..3ee40014e 100644 --- a/src/arch/i386/Makefile +++ b/src/arch/i386/Makefile @@ -74,8 +74,11 @@ CFLAGS += -Ui386 ISOLINUX_BIN_LIST := \ $(ISOLINUX_BIN) \ /usr/lib/syslinux/isolinux.bin \ + /usr/lib/syslinux/bios/isolinux.bin \ /usr/share/syslinux/isolinux.bin \ - /usr/local/share/syslinux/isolinux.bin + /usr/share/syslinux/bios/isolinux.bin \ + /usr/local/share/syslinux/isolinux.bin \ + /usr/local/share/syslinux/bios/isolinux.bin ISOLINUX_BIN = $(firstword $(wildcard $(ISOLINUX_BIN_LIST))) # i386-specific directories containing source files |