svn commit: trunk/busybox/applets

[vda at busybox.net]

Author: vda
Date: 2008-02-09 01:26:43 -0800 (Sat, 09 Feb 2008)
New Revision: 20968

Log:
build system: make it do without od -t



Modified:
   trunk/busybox/applets/usage_compressed


Changeset:
Modified: trunk/busybox/applets/usage_compressed
===================================================================
--- trunk/busybox/applets/usage_compressed	2008-02-09 06:29:32 UTC (rev 20967)
+++ trunk/busybox/applets/usage_compressed	2008-02-09 09:26:43 UTC (rev 20968)
@@ -12,8 +12,16 @@
 
 exec >"$target"
 
-echo 'static const char packed_usage[] ALIGN1 = '
-"$loc/usage" | bzip2 -1 | od -v -t x1 \
-| $SED -e 's/^[^ ]*//' -e 's/  *\(..\)/\\x\1/g' -e 's/^\(.*\)$/"\1"/'
-echo ';'
+echo 'static const char packed_usage[] ALIGN1 = {'
+
+# Extra effort to avoid using "od -t x1": -t is not available
+# in non-CONFIG_DESKTOPed busybox od
+
+"$loc/usage" | bzip2 -1 | od -v -x \
+| $SED -e 's/^[^ ]*//' \
+| $SED -e 's/ //g' \
+| grep -v '^$' \
+| $SED -e 's/\(..\)\(..\)/0x\2,0x\1,/g'
+
+echo '};'
 echo '#define SIZEOF_usage_messages' `expr 0 + $sz`