emo/busybox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

build system: use od -b instead of od -t x1

Browse Source 
od -t is not available in non-CONFIG_DESKTOPed busybox od

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
This commit is contained in:
Denys Vlasenko 2013-11-26 14:56:29 +01:00
parent 760fc6debc
commit 195c436f84
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
applets/usage_compressed
View File

@ -10,20 +10,20 @@ test "$SED" || SED=sed
test "$DD" || DD=dd test "$DD" || DD=dd
# Some people were bitten by their system lacking a (proper) od # 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 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 exit 1
fi fi
exec >"$target.$$" exec >"$target.$$"
echo '#define UNPACKED_USAGE "" \' echo '#define UNPACKED_USAGE "" \'
"$loc/usage" | od -v -t x1 \ "$loc/usage" | od -v -b \
| $SED -e 's/^[^ ]*//' \ | $SED -e 's/^[^ ]*//' \
-e 's/ //g' \ -e 's/ //g' \
-e '/^$/d' \ -e '/^$/d' \
-e 's/\(..\)/\\x\1/g' \ -e 's/\(...\)/\\\1/g' \
-e 's/^/"/' \ -e 's/^/"/' \
-e 's/$/" \\/' -e 's/$/" \\/'
echo '' echo ''
@ -39,11 +39,11 @@ echo '#define PACKED_USAGE \'
## -e '/^$/d' \ ## -e '/^$/d' \
## -e 's/\(..\)\(..\)/0x\2,0x\1,/g' ## -e 's/\(..\)\(..\)/0x\2,0x\1,/g'
## -e 's/$/ \\/' ## -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/^[^ ]*//' \ | $SED -e 's/^[^ ]*//' \
-e 's/ //g' \ -e 's/ //g' \
-e '/^$/d' \ -e '/^$/d' \
-e 's/\(..\)/0x\1,/g' \ -e 's/\(...\)/0\1,/g' \
-e 's/$/ \\/' -e 's/$/ \\/'
echo '' echo ''

4
scripts/mkconfigs
View File

@ -65,11 +65,11 @@ static const char bbconfig_config_bz2[] ALIGN1 = {"
grep -e '^# CONFIG_' -e '^CONFIG_' "$config" \ grep -e '^# CONFIG_' -e '^CONFIG_' "$config" \
| bzip2 -1 | dd bs=2 skip=1 2>/dev/null \ | bzip2 -1 | dd bs=2 skip=1 2>/dev/null \
| od -v -t x1 \ | od -v -b \
| sed -e 's/^[^ ]*//' \ | sed -e 's/^[^ ]*//' \
-e 's/ //g' \ -e 's/ //g' \
-e '/^$/d' \ -e '/^$/d' \
-e 's/\(..\)/0x\1,/g' -e 's/\(...\)/0\1,/g'
echo "};" echo "};"
echo "#endif" echo "#endif"