summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDenys Vlasenko <vda.linux@googlemail.com>2013-11-26 13:56:29 (GMT)
committer Denys Vlasenko <vda.linux@googlemail.com>2013-11-26 13:56:29 (GMT)
commit195c436f84dce8525670fa6bc6db7916a4702f57 (patch)
treed801a76464f7122e276c996d1cf047880fe02382
parent760fc6debcba8cb5ca8d8e2252fac3757c453e11 (diff)
downloadbusybox-195c436f84dce8525670fa6bc6db7916a4702f57.tar.gz
busybox-195c436f84dce8525670fa6bc6db7916a4702f57.tar.bz2
build system: use od -b instead of od -t x1
od -t is not available in non-CONFIG_DESKTOPed busybox od Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
-rwxr-xr-xapplets/usage_compressed12
-rwxr-xr-xscripts/mkconfigs4
2 files changed, 8 insertions, 8 deletions
diff --git a/applets/usage_compressed b/applets/usage_compressed
index af66bc5..fb6e1c2 100755
--- a/applets/usage_compressed
+++ b/applets/usage_compressed
@@ -10,20 +10,20 @@ test "$SED" || SED=sed
test "$DD" || DD=dd
# Some people were bitten by their system lacking a (proper) od
-od -v -t x1 </dev/null >/dev/null
+od -v -b </dev/null >/dev/null
if test $? != 0; then
- echo 'od tool is not installed or cannot accept "-v -t x1" options'
+ echo 'od tool is not installed or cannot accept "-v -b" options'
exit 1
fi
exec >"$target.$$"
echo '#define UNPACKED_USAGE "" \'
-"$loc/usage" | od -v -t x1 \
+"$loc/usage" | od -v -b \
| $SED -e 's/^[^ ]*//' \
-e 's/ //g' \
-e '/^$/d' \
- -e 's/\(..\)/\\x\1/g' \
+ -e 's/\(...\)/\\\1/g' \
-e 's/^/"/' \
-e 's/$/" \\/'
echo ''
@@ -39,11 +39,11 @@ echo '#define PACKED_USAGE \'
## -e '/^$/d' \
## -e 's/\(..\)\(..\)/0x\2,0x\1,/g'
## -e 's/$/ \\/'
-"$loc/usage" | bzip2 -1 | $DD bs=2 skip=1 2>/dev/null | od -v -t x1 \
+"$loc/usage" | bzip2 -1 | $DD bs=2 skip=1 2>/dev/null | od -v -b \
| $SED -e 's/^[^ ]*//' \
-e 's/ //g' \
-e '/^$/d' \
- -e 's/\(..\)/0x\1,/g' \
+ -e 's/\(...\)/0\1,/g' \
-e 's/$/ \\/'
echo ''
diff --git a/scripts/mkconfigs b/scripts/mkconfigs
index db94fcc..6a26fe1 100755
--- a/scripts/mkconfigs
+++ b/scripts/mkconfigs
@@ -65,11 +65,11 @@ static const char bbconfig_config_bz2[] ALIGN1 = {"
grep -e '^# CONFIG_' -e '^CONFIG_' "$config" \
| bzip2 -1 | dd bs=2 skip=1 2>/dev/null \
-| od -v -t x1 \
+| od -v -b \
| sed -e 's/^[^ ]*//' \
-e 's/ //g' \
-e '/^$/d' \
- -e 's/\(..\)/0x\1,/g'
+ -e 's/\(...\)/0\1,/g'
echo "};"
echo "#endif"