# HG changeset patch
# User Keir Fraser <keir@xxxxxxxxxxxxx>
# Date 1190794241 -3600
# Node ID ea60bafe2702c3aba9778a49b9d41333220c5724
# Parent ce3916c3e47dac2908decf0f6afbb05d42af3de9
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@xxxxxxx>
---
tools/firmware/hvmloader/mkhex | 2 +-
tools/firmware/rombios/32bit/Makefile | 2 +-
tools/firmware/rombios/32bit/mkhex | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff -r ce3916c3e47d -r ea60bafe2702 tools/firmware/hvmloader/mkhex
--- a/tools/firmware/hvmloader/mkhex Tue Sep 25 22:28:17 2007 +0100
+++ b/tools/firmware/hvmloader/mkhex Wed Sep 26 09:10:41 2007 +0100
@@ -21,6 +21,6 @@
#
echo "unsigned $1[] = {"
-od -v -t x $2 | sed 's/^[0-9]* /0x/' | sed 's/ /, 0x/g' | sed 's/$/,/'
+od -v -t x $2 | sed 's/^[0-9]* */0x/' | sed 's/ */, 0x/g' | sed 's/$/,/' |
sed 's/0x,//' | sed 's/^[0-9]*,//'
echo "};"
diff -r ce3916c3e47d -r ea60bafe2702 tools/firmware/rombios/32bit/Makefile
--- a/tools/firmware/rombios/32bit/Makefile Tue Sep 25 22:28:17 2007 +0100
+++ b/tools/firmware/rombios/32bit/Makefile Wed Sep 26 09:10:41 2007 +0100
@@ -39,4 +39,4 @@ clean:
nm -u 32bitbios_all.o; \
exit 11; \
} || :
- bash mkhex highbios_array 32bitbios_all.o > $@
+ sh mkhex highbios_array 32bitbios_all.o > $@
diff -r ce3916c3e47d -r ea60bafe2702 tools/firmware/rombios/32bit/mkhex
--- a/tools/firmware/rombios/32bit/mkhex Tue Sep 25 22:28:17 2007 +0100
+++ b/tools/firmware/rombios/32bit/mkhex Wed Sep 26 09:10:41 2007 +0100
@@ -21,6 +21,6 @@
#
echo "unsigned $1[] = {"
-od -v -t x $2 | sed 's/^[0-9]* /0x/' | sed 's/ /, 0x/g' | sed 's/$/,/'
+od -v -t x $2 | sed 's/^[0-9]* */0x/' | sed 's/ */, 0x/g' | sed 's/$/,/' |
sed 's/0x,//' | sed 's/^[0-9]*,//'
echo "};"
_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog
|
Home