Re: [Xen-devel] getting etherboot compiling

[John Levon <levon@xxxxxxxxxxxxxxxxx>]

On Fri, Feb 01, 2008 at 06:16:47PM +0000, John Levon wrote:

> With the patch below (at least some of the way), I just get:

And the patch

john

diff --git a/config/StdGNU.mk b/config/StdGNU.mk
--- a/config/StdGNU.mk
+++ b/config/StdGNU.mk
@@ -12,6 +12,7 @@ SIZEUTIL   = $(CROSS_COMPILE)size
 
 MSGFMT     = msgfmt
 MSGMERGE   = msgmerge
+TAR        = tar
 
 INSTALL      = install
 INSTALL_DIR  = $(INSTALL) -d -m0755 -p
diff --git a/config/SunOS.mk b/config/SunOS.mk
--- a/config/SunOS.mk
+++ b/config/SunOS.mk
@@ -11,6 +11,7 @@ SIZEUTIL   = $(CROSS_COMPILE)gsize
 SIZEUTIL   = $(CROSS_COMPILE)gsize
 
 MSGFMT     = gmsgfmt
+TAR        = gtar
 
 SHELL      = bash
 
diff --git a/tools/firmware/etherboot/Makefile 
b/tools/firmware/etherboot/Makefile
--- a/tools/firmware/etherboot/Makefile
+++ b/tools/firmware/etherboot/Makefile
@@ -21,14 +21,14 @@ eb-%.zrom.h: $E/src/Config
        mv -f $@.new $@
 
 eb-rom-list.h: make-eb-rom-list $E/src/bin/Roms
-       ./$^ $(NICS) >$@.new && mv -f $@.new $@
+       PATH=/usr/gnu/bin/:$(PATH) ./$^ $(NICS) >$@.new && mv -f $@.new $@
 
 eb-roms.h: eb-rom-list.h $(ROM_ZHS)
        cat $^ >$@.new && mv -f $@.new $@
 
 $E/src/Config: $T Config
        rm -rf $D $E
-       tar zxf $T
+       $(TAR) zxf $T
        cat Config >>$D/src/Config
        @
        # override many of the settings in Config
@@ -36,14 +36,14 @@ eb-roms.h: eb-rom-list.h $(ROM_ZHS)
        echo "HOST_CC=$(HOSTCC)" >>$D/src/Config
        echo "CPP=$(CPP)" >>$D/src/Config
        echo "CC=$(CC)" >>$D/src/Config
-       echo "AS=$(CC) -c -x assembler -" >>$D/src/Config
+       echo "AS=$(AS)" >>$D/src/Config
        echo "LD=$(LD)" >>$D/src/Config
        echo "SIZE=$(SIZE)" >>$D/src/Config
        echo "AR=$(AR)" >>$D/src/Config
        echo "RANLIB=$(RANLIB)" >>$D/src/Config
        echo "OBJCOPY=$(OBJCOPY)" >>$D/src/Config
        echo "CFLAGS+=$(CFLAGS)" >>$D/src/Config
-       echo "ASFLAGS+=$(CFLAGS)" >>$D/src/Config
+       echo "ASFLAGS+=$(ASFLAGS)" >>$D/src/Config
        echo "LDFLAGS+=$(LDFLAGS_DIRECT)" >>$D/src/Config
        @
        set -e; cd $D/src/arch/i386; \
@@ -53,7 +53,7 @@ eb-roms.h: eb-rom-list.h $(ROM_ZHS)
        mv $D $E
 
 $E/src/bin/Roms: $E/src/Config
-       $(MAKE) -C $E/src bin/Roms
+       PATH=/usr/gnu/bin/:$(PATH) $(MAKE) -C $E/src bin/Roms
 
 clean:
        rm -rf $D $E *.zrom.h eb-rom-list.h eb-roms.h *~
diff --git a/tools/firmware/etherboot/make-eb-rom-list 
b/tools/firmware/etherboot/make-eb-rom-list
--- a/tools/firmware/etherboot/make-eb-rom-list
+++ b/tools/firmware/etherboot/make-eb-rom-list
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 set -e
 roms=$1; shift
 echo "/* autogenerated - do not edit */"

_______________________________________________
Xen-devel mailing list
Xen-devel@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-devel