diff options
author | Denys Vlasenko <vda.linux@googlemail.com> | 2013-11-26 14:56:29 +0100 |
---|---|---|
committer | Denys Vlasenko <vda.linux@googlemail.com> | 2013-11-26 14:56:29 +0100 |
commit | 195c436f84dce8525670fa6bc6db7916a4702f57 (patch) | |
tree | d801a76464f7122e276c996d1cf047880fe02382 | |
parent | 760fc6debcba8cb5ca8d8e2252fac3757c453e11 (diff) | |
download | busybox-w32-195c436f84dce8525670fa6bc6db7916a4702f57.tar.gz busybox-w32-195c436f84dce8525670fa6bc6db7916a4702f57.tar.bz2 busybox-w32-195c436f84dce8525670fa6bc6db7916a4702f57.zip |
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-x | applets/usage_compressed | 12 | ||||
-rwxr-xr-x | scripts/mkconfigs | 4 |
2 files changed, 8 insertions, 8 deletions
diff --git a/applets/usage_compressed b/applets/usage_compressed index af66bc5dc..fb6e1c286 100755 --- a/applets/usage_compressed +++ b/applets/usage_compressed | |||
@@ -10,20 +10,20 @@ test "$SED" || SED=sed | |||
10 | test "$DD" || DD=dd | 10 | test "$DD" || DD=dd |
11 | 11 | ||
12 | # Some people were bitten by their system lacking a (proper) od | 12 | # Some people were bitten by their system lacking a (proper) od |
13 | od -v -t x1 </dev/null >/dev/null | 13 | od -v -b </dev/null >/dev/null |
14 | if test $? != 0; then | 14 | if test $? != 0; then |
15 | echo 'od tool is not installed or cannot accept "-v -t x1" options' | 15 | echo 'od tool is not installed or cannot accept "-v -b" options' |
16 | exit 1 | 16 | exit 1 |
17 | fi | 17 | fi |
18 | 18 | ||
19 | exec >"$target.$$" | 19 | exec >"$target.$$" |
20 | 20 | ||
21 | echo '#define UNPACKED_USAGE "" \' | 21 | echo '#define UNPACKED_USAGE "" \' |
22 | "$loc/usage" | od -v -t x1 \ | 22 | "$loc/usage" | od -v -b \ |
23 | | $SED -e 's/^[^ ]*//' \ | 23 | | $SED -e 's/^[^ ]*//' \ |
24 | -e 's/ //g' \ | 24 | -e 's/ //g' \ |
25 | -e '/^$/d' \ | 25 | -e '/^$/d' \ |
26 | -e 's/\(..\)/\\x\1/g' \ | 26 | -e 's/\(...\)/\\\1/g' \ |
27 | -e 's/^/"/' \ | 27 | -e 's/^/"/' \ |
28 | -e 's/$/" \\/' | 28 | -e 's/$/" \\/' |
29 | echo '' | 29 | echo '' |
@@ -39,11 +39,11 @@ echo '#define PACKED_USAGE \' | |||
39 | ## -e '/^$/d' \ | 39 | ## -e '/^$/d' \ |
40 | ## -e 's/\(..\)\(..\)/0x\2,0x\1,/g' | 40 | ## -e 's/\(..\)\(..\)/0x\2,0x\1,/g' |
41 | ## -e 's/$/ \\/' | 41 | ## -e 's/$/ \\/' |
42 | "$loc/usage" | bzip2 -1 | $DD bs=2 skip=1 2>/dev/null | od -v -t x1 \ | 42 | "$loc/usage" | bzip2 -1 | $DD bs=2 skip=1 2>/dev/null | od -v -b \ |
43 | | $SED -e 's/^[^ ]*//' \ | 43 | | $SED -e 's/^[^ ]*//' \ |
44 | -e 's/ //g' \ | 44 | -e 's/ //g' \ |
45 | -e '/^$/d' \ | 45 | -e '/^$/d' \ |
46 | -e 's/\(..\)/0x\1,/g' \ | 46 | -e 's/\(...\)/0\1,/g' \ |
47 | -e 's/$/ \\/' | 47 | -e 's/$/ \\/' |
48 | echo '' | 48 | echo '' |
49 | 49 | ||
diff --git a/scripts/mkconfigs b/scripts/mkconfigs index db94fcc44..6a26fe1dd 100755 --- a/scripts/mkconfigs +++ b/scripts/mkconfigs | |||
@@ -65,11 +65,11 @@ static const char bbconfig_config_bz2[] ALIGN1 = {" | |||
65 | 65 | ||
66 | grep -e '^# CONFIG_' -e '^CONFIG_' "$config" \ | 66 | grep -e '^# CONFIG_' -e '^CONFIG_' "$config" \ |
67 | | bzip2 -1 | dd bs=2 skip=1 2>/dev/null \ | 67 | | bzip2 -1 | dd bs=2 skip=1 2>/dev/null \ |
68 | | od -v -t x1 \ | 68 | | od -v -b \ |
69 | | sed -e 's/^[^ ]*//' \ | 69 | | sed -e 's/^[^ ]*//' \ |
70 | -e 's/ //g' \ | 70 | -e 's/ //g' \ |
71 | -e '/^$/d' \ | 71 | -e '/^$/d' \ |
72 | -e 's/\(..\)/0x\1,/g' | 72 | -e 's/\(...\)/0\1,/g' |
73 | 73 | ||
74 | echo "};" | 74 | echo "};" |
75 | echo "#endif" | 75 | echo "#endif" |