Skip to contentSkip to conversation

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

PATCH In review Andi Kleen 2 participants 2 messages Jun 24, 2006

lore
Share & tools
lore

Andi Kleen

author
#0 lore raw

PATCH 55/82 i386/x86-64: Fix isoimage when syslinux is in /usr/share

It's like this on SUSE systems.

Cc [email protected]
Signed-off-by Andi Kleen <[email protected]>
---
 arch/i386/boot/Makefile   |    9 +++++++--
 arch/x86_64/boot/Makefile |    9 +++++++--
 2 files changed, 14 insertions(+), 4 deletions(-)
arch/x86_64/boot/Makefile +7 -2
Index: linux/arch/x86_64/boot/Makefile
===================================================================
@@ -107,8 +107,13 @@ fdimage288: $(BOOTIMAGE) $(obj)/mtools.c
 isoimage: $(BOOTIMAGE)
 	-rm -rf $(obj)/isoimage
 	mkdir $(obj)/isoimage
-	cp `echo /usr/lib*/syslinux/isolinux.bin | awk '{ print $1; }'` \
-		$(obj)/isoimage
+	for i in lib lib64 share end ; do \
+		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
 	echo '$(image_cmdline)' > $(obj)/isoimage/isolinux.cfg
 	if [ -f '$(FDINITRD)' ] ; then \
arch/i386/boot/Makefile +7 -2
Index: linux/arch/i386/boot/Makefile
===================================================================
@@ -109,8 +109,13 @@ fdimage288: $(BOOTIMAGE) $(obj)/mtools.c
 isoimage: $(BOOTIMAGE)
 	-rm -rf $(obj)/isoimage
 	mkdir $(obj)/isoimage
-	cp `echo /usr/lib*/syslinux/isolinux.bin | awk '{ print $1; }'` \
-		$(obj)/isoimage
+	for i in lib lib64 share end ; do \
+		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
 	echo '$(image_cmdline)' > $(obj)/isoimage/isolinux.cfg
 	if [ -f '$(FDINITRD)' ] ; then \