]> pilppa.com Git - linux-2.6-omap-h63xx.git/commitdiff
[PATCH] i386/x86-64: Fix isoimage when syslinux is in /usr/share
authorAndi Kleen <ak@suse.de>
Mon, 26 Jun 2006 11:58:41 +0000 (13:58 +0200)
committerLinus Torvalds <torvalds@g5.osdl.org>
Mon, 26 Jun 2006 17:48:19 +0000 (10:48 -0700)
It's like this on SUSE systems.

Cc: hpa@zytor.com
Signed-off-by: Andi Kleen <ak@suse.de>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
arch/i386/boot/Makefile
arch/x86_64/boot/Makefile

index 33e55476381be9a5954ab616c541955d933fb841..e9794662606458225b592cd39c36fc4056b52fc3 100644 (file)
@@ -109,8 +109,13 @@ fdimage288: $(BOOTIMAGE) $(obj)/mtools.conf
 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 \
index 43ee6c50c2778ed4c55cf9ecb4afa0046802b3f8..deb063e7762debea68e06ba1ebdc4278e3523138 100644 (file)
@@ -107,8 +107,13 @@ fdimage288: $(BOOTIMAGE) $(obj)/mtools.conf
 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 \