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

Commit bf660254 authored by Andi Kleen's avatar Andi Kleen Committed by Linus Torvalds
Browse files

[PATCH] i386/x86-64: Fix isoimage when syslinux is in /usr/share 



It's like this on SUSE systems.

Cc: hpa@zytor.com
Signed-off-by: default avatarAndi Kleen <ak@suse.de>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 2f82bde4

arch/i386/boot/Makefile

+7 −2
Original line number Original line Diff line number Diff line
@@ -109,8 +109,13 @@ fdimage288: $(BOOTIMAGE) $(obj)/mtools.conf 
isoimage: $(BOOTIMAGE)

isoimage: $(BOOTIMAGE)

	-rm -rf $(obj)/isoimage

	-rm -rf $(obj)/isoimage

	mkdir $(obj)/isoimage

	mkdir $(obj)/isoimage

	cp `echo /usr/lib*/syslinux/isolinux.bin | awk '{ print $1; }'` \

	for i in lib lib64 share end ; do \

		$(obj)/isoimage

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

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

			break ; \

		fi ; \

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

	done

	cp $(BOOTIMAGE) $(obj)/isoimage/linux

	cp $(BOOTIMAGE) $(obj)/isoimage/linux

	echo '$(image_cmdline)' > $(obj)/isoimage/isolinux.cfg

	echo '$(image_cmdline)' > $(obj)/isoimage/isolinux.cfg

	if [ -f '$(FDINITRD)' ] ; then \

	if [ -f '$(FDINITRD)' ] ; then \

arch/x86_64/boot/Makefile

+7 −2
Original line number Original line Diff line number Diff line
@@ -107,8 +107,13 @@ fdimage288: $(BOOTIMAGE) $(obj)/mtools.conf 
isoimage: $(BOOTIMAGE)

isoimage: $(BOOTIMAGE)

	-rm -rf $(obj)/isoimage

	-rm -rf $(obj)/isoimage

	mkdir $(obj)/isoimage

	mkdir $(obj)/isoimage

	cp `echo /usr/lib*/syslinux/isolinux.bin | awk '{ print $1; }'` \

	for i in lib lib64 share end ; do \

		$(obj)/isoimage

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

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

			break ; \

		fi ; \

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

	done

	cp $(BOOTIMAGE) $(obj)/isoimage/linux

	cp $(BOOTIMAGE) $(obj)/isoimage/linux

	echo '$(image_cmdline)' > $(obj)/isoimage/isolinux.cfg

	echo '$(image_cmdline)' > $(obj)/isoimage/isolinux.cfg

	if [ -f '$(FDINITRD)' ] ; then \

	if [ -f '$(FDINITRD)' ] ; then \