xen: fix reloc.S generation

Hi,

attached patch fixes generation of reloc.S and makes xen boot out-of-the box since c/s 19146.
The output of AT&T UNIX and GNU od(1) are different.

Please apply this to Xen 4.1, 4.0 and 3.4.

---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 cebd5d3f0ec4 xen/arch/x86/boot/build32.mk
@@ -9,8 +9,8 @@ CFLAGS := $(filter-out -flto,$(CFLAGS))
 
 # NB. awk invocation is a portable alternative to 'head -n -1'
 %.S: %.bin
-	(od -v -t x $< | awk 'NR > 1 {print s} {s=$$0}' | \
-	sed 's/ /,0x/g' | sed 's/^[0-9]*,/ .long /') >$@
+	(od -v -t x $< | tr -s ' ' | awk 'NR > 1 {print s} {s=$$0}' | \
+	sed 's/ /,0x/g' | sed 's/,0x$$//' | sed 's/^[0-9]*,/ .long /') >$@
 
 %.bin: %.lnk
 	$(OBJCOPY) -O binary $< $@

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

Christoph Egger writes ("[Xen-devel] [PATCH] xen: fix reloc.S generation"):

Which (if any) of these versions of od is correct ? The SuSv3 specification of od is quite comprehensive so it should be possible to contrive a rune which doesn't need subsequent seddery. Could you try to do so ?

Thanks,
Ian.

http://pubs.opengroup.org/onlinepubs/009695399/utilities/od.html

says

"and the output from each of the transformations shall be separated by one or more <blank>s."

So both AT&T UNIX and GNU od(1) behaviours are correct and we have to deal with that. => Please apply the patch to -unstable, 4.1-testing, 4.0-testing and 3.4-testing.

Thanks,
Christoph

---to satisfy European Law for business letters:
Advanced Micro Devices GmbH
Einsteinring 24, 85689 Dornach b. Muenchen
Geschaeftsfuehrer: Alberto Bozzo, Andrew Bowd
Sitz: Dornach, Gemeinde Aschheim, Landkreis Muenchen
Registergericht Muenchen, HRB Nr. 43632