etherboot: Fix the build.

Signed-off-by: Ian Jackson <ian.jackson@eu.citrix.com>

diff --git a/.hgignore b/.hgignore
index 937af9647825100ca53a13b09a0ad2b4904d7ded..300fb0545c2835bd1475c8a13fa0448d787594e4 100644 (file)
--- a/.hgignore
+++ b/.hgignore
@@ -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 --git a/config/StdGNU.mk b/config/StdGNU.mk
index a26ce17c841a94745212c6c6b5f2d1e8f1d8aaa3..dfbc7ece4432591eeb44a4e443b2796991c07523 100644 (file)
--- a/config/StdGNU.mk
+++ b/config/StdGNU.mk
@@ -8,6 +8,7 @@ NM         = $(CROSS_COMPILE)nm
 STRIP      = $(CROSS_COMPILE)strip
 OBJCOPY    = $(CROSS_COMPILE)objcopy
 OBJDUMP    = $(CROSS_COMPILE)objdump
+SIZEUTIL   = $(CROSS_COMPILE)size
 
 MSGFMT     = msgfmt
 MSGMERGE   = msgmerge

diff --git a/config/SunOS.mk b/config/SunOS.mk
index d5eba747bf0e6418dec6d64338bcd7b8e6448864..e6035bf4caf76bd7b2e15b7b80005cb03c427ae2 100644 (file)
--- a/config/SunOS.mk
+++ b/config/SunOS.mk
@@ -8,6 +8,7 @@ NM         = $(CROSS_COMPILE)gnm
 STRIP      = $(CROSS_COMPILE)gstrip
 OBJCOPY    = $(CROSS_COMPILE)gobjcopy
 OBJDUMP    = $(CROSS_COMPILE)gobjdump
+SIZEUTIL   = $(CROSS_COMPILE)gsize
 
 MSGFMT     = gmsgfmt
 

diff --git a/tools/firmware/etherboot/Makefile b/tools/firmware/etherboot/Makefile
index 503d9a22b4a8b7a9332575f0a55f7c5c36557da7..67776afbd76e1b3dfd746835cd4bba098072bf10 100644 (file)
--- a/tools/firmware/etherboot/Makefile
+++ b/tools/firmware/etherboot/Makefile
@@ -1,6 +1,10 @@
 
 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
 E=etherboot-build
@@ -18,7 +22,26 @@ $E/src/Config:       $T 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: