ia64/xen-unstable

changeset 15983:ea60bafe2702

firmware: fix romimage generation for *bsd

- portability fix in Makefile: mkhex is not bash specific
- GNU od separates column with one blank, BSD od uses eight blanks.
Change sed to deal with this.
- Add a fourth sed to fix a build error on NetBSD

Signed-off-by: Christoph Egger <Christoph.Egger@amd.com>
author Keir Fraser <keir@xensource.com>
date Wed Sep 26 09:10:41 2007 +0100 (2007-09-26)
parents ce3916c3e47d
children 6ae1f8af06a7
files tools/firmware/hvmloader/mkhex tools/firmware/rombios/32bit/Makefile tools/firmware/rombios/32bit/mkhex
line diff
     1.1 --- a/tools/firmware/hvmloader/mkhex	Tue Sep 25 22:28:17 2007 +0100
     1.2 +++ b/tools/firmware/hvmloader/mkhex	Wed Sep 26 09:10:41 2007 +0100
     1.3 @@ -21,6 +21,6 @@
     1.4  #
     1.5  
     1.6  echo "unsigned $1[] = {"
     1.7 -od -v -t x $2 | sed 's/^[0-9]* /0x/' | sed 's/ /, 0x/g' | sed 's/$/,/'
     1.8 +od -v -t x $2 | sed 's/^[0-9]*  */0x/' | sed 's/  */, 0x/g' | sed 's/$/,/' | sed 's/0x,//' | sed 's/^[0-9]*,//'
     1.9  echo "};"
    1.10  
     2.1 --- a/tools/firmware/rombios/32bit/Makefile	Tue Sep 25 22:28:17 2007 +0100
     2.2 +++ b/tools/firmware/rombios/32bit/Makefile	Wed Sep 26 09:10:41 2007 +0100
     2.3 @@ -39,4 +39,4 @@ clean:
     2.4  	    nm -u 32bitbios_all.o;                           \
     2.5  	    exit 11;                                         \
     2.6  	  } || :
     2.7 -	bash mkhex highbios_array 32bitbios_all.o > $@
     2.8 +	sh mkhex highbios_array 32bitbios_all.o > $@
     3.1 --- a/tools/firmware/rombios/32bit/mkhex	Tue Sep 25 22:28:17 2007 +0100
     3.2 +++ b/tools/firmware/rombios/32bit/mkhex	Wed Sep 26 09:10:41 2007 +0100
     3.3 @@ -21,6 +21,6 @@
     3.4  #
     3.5  
     3.6  echo "unsigned $1[] = {"
     3.7 -od -v -t x $2 | sed 's/^[0-9]* /0x/' | sed 's/ /, 0x/g' | sed 's/$/,/'
     3.8 +od -v -t x $2 | sed 's/^[0-9]*  */0x/' | sed 's/  */, 0x/g' | sed 's/$/,/' | sed 's/0x,//' | sed 's/^[0-9]*,//'
     3.9  echo "};"
    3.10