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

remove "local" bashism from a few scripts

Browse Source 
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
This commit is contained in:
Denys Vlasenko 2017-01-24 20:52:42 +01:00
parent 89193f985b
commit bca4ea8b68
4 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
examples/depmod
View File

@ -7,7 +7,7 @@
# Licensed under GPLv2, see file LICENSE in this source tree. # Licensed under GPLv2, see file LICENSE in this source tree.
# #
local BASE="${1:-/usr/lib/modules}" BASE="${1:-/usr/lib/modules}"
find "$BASE" -name '*.ko.gz' | while read I ; do find "$BASE" -name '*.ko.gz' | while read I ; do
N=`basename "$I" '.ko.gz'` N=`basename "$I" '.ko.gz'`

4
scripts/gen_build_files.sh
View File

@ -20,7 +20,9 @@ chk() { status "CHK" "$@"; }
generate() generate()
{ {
# NB: data to be inserted at INSERT line is coming on stdin # NB: data to be inserted at INSERT line is coming on stdin
local src="$1" dst="$2" header="$3" src="$1"
dst="$2"
header="$3"
#chk "${dst}" #chk "${dst}"
{ {
# Need to use printf: different shells have inconsistent # Need to use printf: different shells have inconsistent

14
scripts/trylink
View File

@ -46,8 +46,7 @@ try() {
} }
check_cc() { check_cc() {
local tempname="$(mktemp tmp.XXXXXXXXXX)" tempname="$(mktemp tmp.XXXXXXXXXX)"
local r
echo "int main(int argc,char**argv){return argv?argc:0;}" >"$tempname".c echo "int main(int argc,char**argv){return argv?argc:0;}" >"$tempname".c
# Can use "-o /dev/null", but older gcc tend to *unlink it* on failure! :( # Can use "-o /dev/null", but older gcc tend to *unlink it* on failure! :(
# Was using "-xc /dev/null", but we need a valid C program. # Was using "-xc /dev/null", but we need a valid C program.
@ -55,14 +54,13 @@ check_cc() {
# '... -D"BB_VER=KBUILD_STR(1.N.M)" ...' # '... -D"BB_VER=KBUILD_STR(1.N.M)" ...'
# and we need shell to process quotes! # and we need shell to process quotes!
$CC $CFLAGS $LDFLAGS $1 "$tempname".c -o "$tempname" >/dev/null 2>&1 $CC $CFLAGS $LDFLAGS $1 "$tempname".c -o "$tempname" >/dev/null 2>&1
r=$? exitcode=$?
rm -f "$tempname" "$tempname".c "$tempname".o rm -f "$tempname" "$tempname".c "$tempname".o
return $r return $exitcode
} }
check_libc_is_glibc() { check_libc_is_glibc() {
local tempname="$(mktemp tmp.XXXXXXXXXX)" tempname="$(mktemp tmp.XXXXXXXXXX)"
local r
echo "\ echo "\
#include <stdlib.h> #include <stdlib.h>
/* Apparently uclibc defines __GLIBC__ (compat trick?). Oh well. */ /* Apparently uclibc defines __GLIBC__ (compat trick?). Oh well. */
@ -71,9 +69,9 @@ check_libc_is_glibc() {
#endif #endif
" >"$tempname".c " >"$tempname".c
! $CC $CFLAGS "$tempname".c -c -o "$tempname".o >/dev/null 2>&1 ! $CC $CFLAGS "$tempname".c -c -o "$tempname".o >/dev/null 2>&1
r=$? exitcode=$?
rm -f "$tempname" "$tempname".c "$tempname".o rm -f "$tempname" "$tempname".c "$tempname".o
return $r return $exitcode
} }
EXE="$1" EXE="$1"

10
testsuite/runtest
View File

@ -12,12 +12,12 @@ total_failed=0
# Option -e will make testcase stop on the first failed command. # Option -e will make testcase stop on the first failed command.
run_applet_testcase() run_applet_testcase()
{ {
local applet="$1" applet="$1"
local testcase="$2" testcase="$2"
local status=0 status=0
local uc_applet=$(echo "$applet" | tr a-z A-Z) uc_applet=$(echo "$applet" | tr a-z A-Z)
local testname="$testcase" testname="$testcase"
testname="${testname##*/}" # take basename testname="${testname##*/}" # take basename
if grep "^# CONFIG_$uc_applet is not set$" "$bindir/.config" >/dev/null; then if grep "^# CONFIG_$uc_applet is not set$" "$bindir/.config" >/dev/null; then