diff options
| author | H. Peter Anvin <hpa@zytor.com> | 2016-04-05 17:01:33 -0700 |
|---|---|---|
| committer | H. Peter Anvin <hpa@linux.intel.com> | 2016-06-07 15:54:18 -0700 |
| commit | 9c77679cadb118c0aa99e6f88533d91765a131ba (patch) | |
| tree | 9c200066f8903975e7474f37ea8d9f63281c540f | |
| parent | 08dd8cd06ed95625b9e2fac43c78fcb45b7eaf94 (diff) | |
| download | op-kernel-dev-9c77679cadb118c0aa99e6f88533d91765a131ba.zip op-kernel-dev-9c77679cadb118c0aa99e6f88533d91765a131ba.tar.gz | |
x86, build: copy ldlinux.c32 to image.iso
For newer versions of Syslinux, we need ldlinux.c32 in addition to
isolinux.bin to reside on the boot disk, so if the latter is found,
copy it, too, to the isoimage tree.
Signed-off-by: H. Peter Anvin <hpa@zytor.com>
Cc: Linux Stable Tree <stable@vger.kernel.org>
| -rw-r--r-- | arch/x86/boot/Makefile | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/x86/boot/Makefile b/arch/x86/boot/Makefile index 700a9c6..be8e688 100644 --- a/arch/x86/boot/Makefile +++ b/arch/x86/boot/Makefile @@ -162,6 +162,9 @@ isoimage: $(obj)/bzImage for i in lib lib64 share end ; do \ if [ -f /usr/$$i/syslinux/isolinux.bin ] ; then \ cp /usr/$$i/syslinux/isolinux.bin $(obj)/isoimage ; \ + if [ -f /usr/$$i/syslinux/ldlinux.c32 ]; then \ + cp /usr/$$i/syslinux/ldlinux.c32 $(obj)/isoimage ; \ + fi ; \ break ; \ fi ; \ if [ $$i = end ] ; then exit 1 ; fi ; \ |
