diff options
| author | H. Peter Anvin <hpa@zytor.com> | 2011-03-17 11:58:35 -0700 |
|---|---|---|
| committer | H. Peter Anvin <hpa@zytor.com> | 2011-03-17 11:58:35 -0700 |
| commit | 289fca6d882562658aff309b4e8a09051e35ea25 (patch) | |
| tree | 74998fe80da6620699f52b9f8cfce4e08a2ba54a | |
| parent | f7829be535ee09b48502ec60b8e997e5aa946b61 (diff) | |
| parent | 77244e1c81bd899fac414a6b6dfc7fcb309fdd6c (diff) | |
| download | syslinux-289fca6d882562658aff309b4e8a09051e35ea25.tar.gz | |
Merge remote-tracking branch 'genec/gpxelinux-kpxe-for-hpa'
| -rw-r--r-- | Makefile | 4 | ||||
| -rw-r--r-- | gpxe/Makefile | 9 | ||||
| -rw-r--r-- | gpxe/pxelinuxk.gpxe | 5 |
3 files changed, 15 insertions, 3 deletions
@@ -65,8 +65,8 @@ INSTALL_BIN = mtools/syslinux # Things to install in /sbin INSTALL_SBIN = extlinux/extlinux # Things to install in /usr/lib/syslinux -INSTALL_AUX = core/pxelinux.0 gpxe/gpxelinux.0 core/isolinux.bin \ - core/isolinux-debug.bin \ +INSTALL_AUX = core/pxelinux.0 gpxe/gpxelinux.0 gpxe/gpxelinuxk.0 \ + core/isolinux.bin core/isolinux-debug.bin \ dos/syslinux.com \ mbr/*.bin $(MODULES) INSTALL_AUX_OPT = win32/syslinux.exe win64/syslinux64.exe diff --git a/gpxe/Makefile b/gpxe/Makefile index b079d532..7d100887 100644 --- a/gpxe/Makefile +++ b/gpxe/Makefile @@ -17,7 +17,7 @@ # Very simple, really... # -TARGETS = gpxelinux.0 +TARGETS = gpxelinux.0 gpxelinuxk.0 all: $(TARGETS) @@ -39,3 +39,10 @@ src/bin/undionly.kkpxe: pxelinux.gpxe ../core/pxelinux.0 gpxelinux.0: src/bin/undionly.kkpxe cp -f $< $@ + +src/bin/undionly.kpxe: pxelinuxk.gpxe ../core/pxelinux.0 + $(MAKE) -C src bin/undionly.kpxe NO_WERROR=1 \ + EMBEDDED_IMAGE=../pxelinuxk.gpxe,../../core/pxelinux.0 + +gpxelinuxk.0: src/bin/undionly.kpxe + cp -f $< $@ diff --git a/gpxe/pxelinuxk.gpxe b/gpxe/pxelinuxk.gpxe new file mode 100644 index 00000000..2f1e59a0 --- /dev/null +++ b/gpxe/pxelinuxk.gpxe @@ -0,0 +1,5 @@ +#!gpxe +set use-cached 0 +dhcp net0 +imgload pxelinux.0 +boot pxelinux.0 |