[Xen-changelog] [xen-unstable] etherboot: Fix the build.

[Xen patchbot-unstable <patchbot-unstable@xxxxxxxxxxxxxxxxxxx>]

# HG changeset patch
# User Keir Fraser <keir.fraser@xxxxxxxxxx>
# Date 1201788119 0
# Node ID f3b418afc6beedb1b99579d74c08483879295643
# Parent  af5d189df05117d4be376f03fe41530fd217835c
etherboot: Fix the build.
Signed-off-by: Ian Jackson <ian.jackson@xxxxxxxxxxxxx>
---
 .hgignore                         |    5 +++--
 config/StdGNU.mk                  |    1 +
 config/SunOS.mk                   |    1 +
 tools/firmware/etherboot/Makefile |   25 ++++++++++++++++++++++++-
 4 files changed, 29 insertions(+), 3 deletions(-)

diff -r af5d189df051 -r f3b418afc6be .hgignore
--- a/.hgignore Thu Jan 31 13:01:08 2008 +0000
+++ b/.hgignore Thu Jan 31 14:01:59 2008 +0000
@@ -105,6 +105,9 @@
 ^tools/firmware/.*\.bin$
 ^tools/firmware/.*\.sym$
 ^tools/firmware/.*bios/.*bios.*\.txt$
+^tools/firmware/etherboot/etherboot-5
+^tools/firmware/etherboot/etherboot-build
+^tools/firmware/etherboot/.*\.zrom\.h$
 ^tools/firmware/extboot/extboot.img$
 ^tools/firmware/extboot/signrom$
 ^tools/firmware/hvmloader/acpi/acpigen$
@@ -258,5 +261,3 @@
 ^unmodified_drivers/linux-2.6/.*\.ko$
 ^unmodified_drivers/linux-2.6/.*\.mod\.c$
 ^LibVNCServer.*
-^tools/firmware/etherboot/etherboot-build
-^tools/firmware/etherboot/etherboot-5.*
diff -r af5d189df051 -r f3b418afc6be config/StdGNU.mk
--- a/config/StdGNU.mk  Thu Jan 31 13:01:08 2008 +0000
+++ b/config/StdGNU.mk  Thu Jan 31 14:01:59 2008 +0000
@@ -8,6 +8,7 @@ STRIP      = $(CROSS_COMPILE)strip
 STRIP      = $(CROSS_COMPILE)strip
 OBJCOPY    = $(CROSS_COMPILE)objcopy
 OBJDUMP    = $(CROSS_COMPILE)objdump
+SIZEUTIL   = $(CROSS_COMPILE)size
 
 MSGFMT     = msgfmt
 MSGMERGE   = msgmerge
diff -r af5d189df051 -r f3b418afc6be config/SunOS.mk
--- a/config/SunOS.mk   Thu Jan 31 13:01:08 2008 +0000
+++ b/config/SunOS.mk   Thu Jan 31 14:01:59 2008 +0000
@@ -8,6 +8,7 @@ STRIP      = $(CROSS_COMPILE)gstrip
 STRIP      = $(CROSS_COMPILE)gstrip
 OBJCOPY    = $(CROSS_COMPILE)gobjcopy
 OBJDUMP    = $(CROSS_COMPILE)gobjdump
+SIZEUTIL   = $(CROSS_COMPILE)gsize
 
 MSGFMT     = gmsgfmt
 
diff -r af5d189df051 -r f3b418afc6be tools/firmware/etherboot/Makefile
--- a/tools/firmware/etherboot/Makefile Thu Jan 31 13:01:08 2008 +0000
+++ b/tools/firmware/etherboot/Makefile Thu Jan 31 14:01:59 2008 +0000
@@ -1,5 +1,9 @@
 
 EB_VERSION=5.4.2
+
+override XEN_TARGET_ARCH = x86_32
+XEN_ROOT = ../../..
+include $(XEN_ROOT)/tools/Rules.mk
 
 D=etherboot-$(EB_VERSION)
 T=etherboot-$(EB_VERSION).tar.gz
@@ -18,7 +22,26 @@ eb-%.zrom.h: $E/src/Config
        rm -rf $D $E
        tar zxf $T
        cat Config >>$D/src/Config
-       ./find-gcc-3 >>$D/src/Config
+       @
+       # override many of the settings in Config
+       echo ARCH=i386 >>$D/src/Config
+       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 "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 "LDFLAGS+=$(LDFLAGS_DIRECT)" >>$D/src/Config
+       @
+       set -e; cd $D/src/arch/i386; \
+               sed -e '/ifneq.*GCC_MINORVERSION/,/endif/ s/^/#/' \
+                       Config >Config.new; \
+               mv Config.new Config
        mv $D $E
 
 clean:

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