aboutsummaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
authorKeir Fraser <keir@xensource.com>2007-09-26 09:10:41 +0100
committerKeir Fraser <keir@xensource.com>2007-09-26 09:10:41 +0100
commitf3f2e4ef696abbdd43b291389c4f6d3eee688768 (patch)
treebbb4fbbe6ca4bf2d851d8012505c07787cebb689 /tools
parentd0356250df0c226c5cceaf4144e6578cd7c4d808 (diff)
downloadxen-f3f2e4ef696abbdd43b291389c4f6d3eee688768.tar.gz
xen-f3f2e4ef696abbdd43b291389c4f6d3eee688768.tar.bz2
xen-f3f2e4ef696abbdd43b291389c4f6d3eee688768.zip
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>
Diffstat (limited to 'tools')
-rwxr-xr-xtools/firmware/hvmloader/mkhex2
-rw-r--r--tools/firmware/rombios/32bit/Makefile2
-rw-r--r--tools/firmware/rombios/32bit/mkhex2
3 files changed, 3 insertions, 3 deletions
diff --git a/tools/firmware/hvmloader/mkhex b/tools/firmware/hvmloader/mkhex
index 7389d70483..4517e36c53 100755
--- a/tools/firmware/hvmloader/mkhex
+++ b/tools/firmware/hvmloader/mkhex
@@ -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 --git a/tools/firmware/rombios/32bit/Makefile b/tools/firmware/rombios/32bit/Makefile
index 1cd7100ae9..0a17154a43 100644
--- a/tools/firmware/rombios/32bit/Makefile
+++ b/tools/firmware/rombios/32bit/Makefile
@@ -39,4 +39,4 @@ $(TARGET): subdirs 32bitbios.o util.o
nm -u 32bitbios_all.o; \
exit 11; \
} || :
- bash mkhex highbios_array 32bitbios_all.o > $@
+ sh mkhex highbios_array 32bitbios_all.o > $@
diff --git a/tools/firmware/rombios/32bit/mkhex b/tools/firmware/rombios/32bit/mkhex
index 7389d70483..4517e36c53 100644
--- a/tools/firmware/rombios/32bit/mkhex
+++ b/tools/firmware/rombios/32bit/mkhex
@@ -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 "};"