From 195c436f84dce8525670fa6bc6db7916a4702f57 Mon Sep 17 00:00:00 2001 From: Denys Vlasenko Date: Tue, 26 Nov 2013 14:56:29 +0100 Subject: [PATCH] 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 --- applets/usage_compressed | 12 ++++++------ 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 test "$DD" || DD=dd # Some people were bitten by their system lacking a (proper) od -od -v -t x1 /dev/null +od -v -b /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 db94fcc44..6a26fe1dd 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" -- 2.25.1