* [PATCH] [55/82] i386/x86-64: Fix isoimage when syslinux is in /usr/share
@ 2006-06-24 0:21 Andi Kleen
2006-06-24 0:24 ` H. Peter Anvin
0 siblings, 1 reply; 2+ messages in thread
From: Andi Kleen @ 2006-06-24 0:21 UTC (permalink / raw)
To: torvalds; +Cc: discuss, akpm, linux-kernel, hpa
It's like this on SUSE systems.
Cc: hpa@zytor.com
Signed-off-by: Andi Kleen <ak@suse.de>
---
arch/i386/boot/Makefile | 9 +++++++--
arch/x86_64/boot/Makefile | 9 +++++++--
2 files changed, 14 insertions(+), 4 deletions(-)
Index: linux/arch/x86_64/boot/Makefile
===================================================================
--- linux.orig/arch/x86_64/boot/Makefile
+++ 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 \
Index: linux/arch/i386/boot/Makefile
===================================================================
--- linux.orig/arch/i386/boot/Makefile
+++ 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 \
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: [PATCH] [55/82] i386/x86-64: Fix isoimage when syslinux is in /usr/share
2006-06-24 0:21 [PATCH] [55/82] i386/x86-64: Fix isoimage when syslinux is in /usr/share Andi Kleen
@ 2006-06-24 0:24 ` H. Peter Anvin
0 siblings, 0 replies; 2+ messages in thread
From: H. Peter Anvin @ 2006-06-24 0:24 UTC (permalink / raw)
To: Andi Kleen; +Cc: torvalds, discuss, akpm, linux-kernel
Andi Kleen wrote:
> It's like this on SUSE systems.
>
> Cc: hpa@zytor.com
>
> Signed-off-by: Andi Kleen <ak@suse.de>
>
Ack.
-hpa
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2006-06-24 0:24 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2006-06-24 0:21 [PATCH] [55/82] i386/x86-64: Fix isoimage when syslinux is in /usr/share Andi Kleen
2006-06-24 0:24 ` H. Peter Anvin
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).