diff options
| author | H. Peter Anvin <hpa@zytor.com> | 2016-04-05 17:01:33 -0700 |
|---|---|---|
| committer | Sasha Levin <sasha.levin@oracle.com> | 2016-06-19 23:47:45 -0400 |
| commit | 2c34097fbfbcfdafca183139cc3524c4e29e27eb (patch) | |
| tree | b8fa00360443a1666fc3083a8a7b27d24720038f /arch/x86/boot/Makefile | |
| parent | 68924d2d32edadfbf9c2819ff3635248a192a90a (diff) | |
x86, build: copy ldlinux.c32 to image.iso
[ Upstream commit 9c77679cadb118c0aa99e6f88533d91765a131ba ]
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>
Signed-off-by: Sasha Levin <sasha.levin@oracle.com>
Diffstat (limited to 'arch/x86/boot/Makefile')
| -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 3db07f30636f..32342a6034df 100644 --- a/arch/x86/boot/Makefile +++ b/arch/x86/boot/Makefile @@ -160,6 +160,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 ; \ |