aboutsummaryrefslogtreecommitdiff
path: root/applets
diff options
context:
space:
mode:
authorGravatar Denys Vlasenko <vda.linux@googlemail.com>2015-10-05 11:15:43 +0200
committerGravatar Denys Vlasenko <vda.linux@googlemail.com>2015-10-05 11:15:43 +0200
commit5fa6d1a632505789409a2ba6cf8e112529f9db18 (patch)
tree9666bad5a3b4ebd4c9dfabbe5b0f67617e075c00 /applets
parent12efcf3285a75d197704d2eef23824b3e4f11e66 (diff)
downloadbusybox-5fa6d1a632505789409a2ba6cf8e112529f9db18.tar.gz
busybox-5fa6d1a632505789409a2ba6cf8e112529f9db18.tar.bz2
Aboriginal linux/musl build fixes
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
Diffstat (limited to 'applets')
-rwxr-xr-xapplets/usage_compressed9
1 files changed, 9 insertions, 0 deletions
diff --git a/applets/usage_compressed b/applets/usage_compressed
index fb6e1c286..186fcde77 100755
--- a/applets/usage_compressed
+++ b/applets/usage_compressed
@@ -20,6 +20,7 @@ exec >"$target.$$"
echo '#define UNPACKED_USAGE "" \'
"$loc/usage" | od -v -b \
+| grep -v '^ ' \
| $SED -e 's/^[^ ]*//' \
-e 's/ //g' \
-e '/^$/d' \
@@ -27,6 +28,13 @@ echo '#define UNPACKED_USAGE "" \'
-e 's/^/"/' \
-e 's/$/" \\/'
echo ''
+# "grep -v '^ '" is for toybox's od bug: od -b prints some extra lines:
+#0000000 010 000 010 000 133 055 144 146 135 040 133 055 143 040 103 117
+# 000010 000010 026533 063144 020135 026533 020143 047503
+#0000020 116 106 104 111 122 135 040 133 055 154 040 114 117 107 106 111
+# 043116 044504 056522 055440 066055 046040 043517 044506
+#0000040 114 105 135 040 133 055 141 040 101 103 124 111 117 116 106 111
+# 042514 020135 026533 020141 041501 044524 047117 044506
echo '#define PACKED_USAGE \'
## Breaks on big-endian systems!
@@ -40,6 +48,7 @@ echo '#define PACKED_USAGE \'
## -e 's/\(..\)\(..\)/0x\2,0x\1,/g'
## -e 's/$/ \\/'
"$loc/usage" | bzip2 -1 | $DD bs=2 skip=1 2>/dev/null | od -v -b \
+| grep -v '^ ' \
| $SED -e 's/^[^ ]*//' \
-e 's/ //g' \
-e '/^$/d' \