diff options
| author | H. Peter Anvin <hpa@zytor.com> | 2016-04-05 17:01:33 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2016-07-27 09:55:48 -0700 |
| commit | 478f1ebaf8bffff60b8987fd53bd62760a31989e (patch) | |
| tree | 6670a6b4483cd6d453d15ea8582992ae5efa0f79 /arch | |
| parent | ce19299f16d10baeb1f73ad38171d2773dd9ae71 (diff) | |
| download | linux-stable-478f1ebaf8bffff60b8987fd53bd62760a31989e.tar.gz linux-stable-478f1ebaf8bffff60b8987fd53bd62760a31989e.tar.bz2 linux-stable-478f1ebaf8bffff60b8987fd53bd62760a31989e.zip | |
x86, build: copy ldlinux.c32 to image.iso
commit 9c77679cadb118c0aa99e6f88533d91765a131ba upstream.
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>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'arch')
| -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 878df7e88cd4..3ef7e11b06fb 100644 --- a/arch/x86/boot/Makefile +++ b/arch/x86/boot/Makefile @@ -156,6 +156,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 ; \ |