Skip to contentSkip to conversation

tools: gpxe build fix

PATCH In review Christoph Egger 4 participants 4 messages Jul 19, 2010 – Jul 21, 2010

lore
Share & tools
lore

Christoph Egger

author
#0 lore raw

PATCH 1/1 tools: gpxe build fix

Hi!

On NetBSD, uname -m prints 'amd64'.
Attached patch makes gpxe aware of that.

Signed-off-by Christoph Egger <[email protected]>
Signature · 6 lines
---to satisfy European Law for business letters:
Advanced Micro Devices GmbH
Einsteinring 24, 85609 Dornach b. Muenchen
Geschaeftsfuehrer: Alberto Bozzo, Andrew Bowd
Sitz: Dornach, Gemeinde Aschheim, Landkreis Muenchen
Registergericht Muenchen, HRB Nr. 43632
tools/firmware/etherboot/patches/Makefile.patch new file +12 -0
diff -r eec4447a500c tools/firmware/etherboot/patches/Makefile.patch
@@ -0,0 +1,12 @@
+--- a/src/Makefile.orig	2010-07-19 13:09:06.000000000 +0200
++++ b/src/Makefile	2010-07-19 13:04:11.000000000 +0200
+@@ -71,7 +71,8 @@ noargs : blib $(BIN)/NIC $(BIN)/gpxe.dsk
+ # If no architecture is specified in Config or on the command-line,
+ # use that of the build machine.
+ #
+-ARCH		?= $(shell uname -m | sed -e s,i[3456789]86,i386,)
++ARCH		?= $(shell uname -m | sed -e s,i[3456789]86,i386, \
++		-e s,amd64,x86_64,)
+ 
+ # handle x86_64 like i386, but set -m32 option for 32bit code only
+ ifeq ($(ARCH),x86_64)
tools/firmware/etherboot/patches/series +1 -0
diff -r eec4447a500c tools/firmware/etherboot/patches/series
@@ -1,1 +1,2 @@
+Makefile.patch
 boot_prompt_option.patch

_______________________________________________
Xen-devel mailing list
[email protected]
http://lists.xensource.com/xen-devel

#1 lore raw
Quoted 20 lines · Christoph Egger

Hi!

On NetBSD, uname -m prints 'amd64'.
Attached patch makes gpxe aware of that.

Signed-off-by Christoph Egger <[email protected]>
Signature · 8 lines
---to satisfy European Law for business letters:
Advanced Micro Devices GmbH
Einsteinring 24, 85609 Dornach b. Muenchen
Geschaeftsfuehrer: Alberto Bozzo, Andrew Bowd
Sitz: Dornach, Gemeinde Aschheim, Landkreis Muenchen
Registergericht Muenchen, HRB Nr. 43632

diff -r eec4447a500c tools/firmware/etherboot/patches/Makefile.patch

tools/firmware/etherboot/patches/Makefile.patch line 9

Quoted 9 lines
tools/firmware/etherboot/patches/Makefile.patch new file +9 -0
@@ -0,0 +1,12 @@
+--- a/src/Makefile.orig	2010-07-19 13:09:06.000000000 +0200
++++ b/src/Makefile	2010-07-19 13:04:11.000000000 +0200
+@@ -71,7 +71,8 @@ noargs : blib $(BIN)/NIC $(BIN)/gpxe.dsk
+ # If no architecture is specified in Config or on the command-line,
+ # use that of the build machine.
+ #
+-ARCH		?= $(shell uname -m | sed -e s,i[3456789]86,i386,)
++ARCH		?= $(shell uname -m | sed -e s,i[3456789]86,i386, \
++		-e s,amd64,x86_64,)

How about ... sed -e 's,\(i[3456789]86\|amd64\),i386,')

tools/firmware/etherboot/patches/series line 2

Quoted 9 lines
tools/firmware/etherboot/patches/Makefile.patch new file +3 -0
+ 
+ # handle x86_64 like i386, but set -m32 option for 32bit code only
+ ifeq ($(ARCH),x86_64)

diff -r eec4447a500c tools/firmware/etherboot/patches/series

tools/firmware/etherboot/patches/series +1 -0
@@ -1,1 +1,2 @@
+Makefile.patch
 boot_prompt_option.patch

Is this a separate change?

#2 lore raw
In reply to Christoph Egger

Christoph Egger writes ("[Xen-devel] [PATCH] tools: gpxe build fix"):

Quoted 2 lines

On NetBSD, uname -m prints 'amd64'.
Attached patch makes gpxe aware of that.

Are there any other systems on which uname -m prints amd64 on which this patch will break ?

I think calling a patch "Makefile.patch" is going to be annoying. And patches in a series should not be named just after the file they change as if only one patch touches each file.

How about "makefile-amd64.patch" ?

Also "gpxe build fix" is a hopeless commit message.

Ian.

#3 lore raw
Quoted 7 lines · Ian Jackson

Christoph Egger writes ("[Xen-devel] [PATCH] tools: gpxe build fix"):

Quoted 2 lines

On NetBSD, uname -m prints 'amd64'.
Attached patch makes gpxe aware of that.

Are there any other systems on which uname -m prints amd64 on which this patch will break ?

Quoted 7 lines

I think calling a patch "Makefile.patch" is going to be annoying. And patches in a series should not be named just after the file they change as if only one patch touches each file.

How about "makefile-amd64.patch" ?

Also "gpxe build fix" is a hopeless commit message.

I ended up upgrading us to far more recent gpxe, where this whole issue has simply disappeared.

-- Keir

Quoted 6 lines

Ian.

_______________________________________________
Xen-devel mailing list
[email protected]
http://lists.xensource.com/xen-devel