Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2c34097f authored by H. Peter Anvin's avatar H. Peter Anvin Committed by Sasha Levin
Browse files

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: default avatarH. Peter Anvin <hpa@zytor.com>
Cc: Linux Stable Tree <stable@vger.kernel.org>
Signed-off-by: default avatarSasha Levin <sasha.levin@oracle.com>
parent 68924d2d

arch/x86/boot/Makefile

+3 −0
Original line number Original line Diff line number Diff line
@@ -160,6 +160,9 @@ isoimage: $(obj)/bzImage 
	for i in lib lib64 share end ; do \

	for i in lib lib64 share end ; do \

		if [ -f /usr/$$i/syslinux/isolinux.bin ] ; then \

		if [ -f /usr/$$i/syslinux/isolinux.bin ] ; then \

			cp /usr/$$i/syslinux/isolinux.bin $(obj)/isoimage ; \

			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 ; \

			break ; \

		fi ; \

		fi ; \

		if [ $$i = end ] ; then exit 1 ; fi ; \

		if [ $$i = end ] ; then exit 1 ; fi ; \