diff options
| author | P. J. McDermott <pjm@nac.net> | 2013-09-08 11:47:14 (EDT) |
|---|---|---|
| committer | P. J. McDermott <pjm@nac.net> | 2013-09-08 11:47:14 (EDT) |
| commit | 5fc7d34f227a1132fac970e6907ac3a58b0ad4af (patch) | |
| tree | c5d1befaa5e1482640b92d4fb8028f577cf68a36 /patches/04_fix-bad-substitution.patch | |
| parent | b1dfd90088e390ea3c29af78cec94a24569541f7 (diff) | |
Renumber patches.
Diffstat (limited to 'patches/04_fix-bad-substitution.patch')
| -rw-r--r-- | patches/04_fix-bad-substitution.patch | 53 |
1 files changed, 53 insertions, 0 deletions
diff --git a/patches/04_fix-bad-substitution.patch b/patches/04_fix-bad-substitution.patch new file mode 100644 index 0000000..9131a95 --- /dev/null +++ b/patches/04_fix-bad-substitution.patch @@ -0,0 +1,53 @@ +From: "P. J. McDermott" <pjm@nac.net> +Description: Fix "bad substitution" errors in shell script + sysdeps/unix/make-syscalls.sh and sysdeps/unix/Makefile use GNU Bash's + "${parameter/pattern/string}" parameter expansion. Non-Bash shells (e.g. + BusyBox ash built with CONFIG_ASH_BASH_COMPAT disabled) don't support this + syntax: + . + for dir in [...]; do \ + test -f $dir/syscalls.list && \ + { sysdirs='[...]' \ + asm_CPP='gcc -c -I[...] -D_LIBC_REENTRANT -include include/libc-symbols.h -DASSEMBLER -g -Wa,--noexecstack -E -x assembler-with-cpp' \ + /bin/sh sysdeps/unix/make-syscalls.sh $dir || exit 1; }; \ + test $dir = sysdeps/unix && break; \ + done > /usr/src/eglibc_2.17~r22751+sip1-1/tmp/libcbuild/sysd-syscallsT + sysdeps/unix/make-syscalls.sh: line 273: syntax error: bad substitution + . + The following command will search the upstream source for this non-standard + expansion: + . + grep -ERn '\${[a-zA-Z0-9_]+/[^}]*/[^}]*}' tmp/src/libc + +diff -Naur src.orig/libc/sysdeps/unix/make-syscalls.sh src/libc/sysdeps/unix/make-syscalls.sh +--- src.orig/libc/sysdeps/unix/make-syscalls.sh 2012-12-02 16:11:45.000000000 -0500 ++++ src/libc/sysdeps/unix/make-syscalls.sh 2013-06-25 12:01:55.178740324 -0400 +@@ -279,7 +279,7 @@ + # name in the vDSO and KERNEL_X.Y is its symbol version. + vdso_symbol="${vdso_syscall%@*}" + vdso_symver="${vdso_syscall#*@}" +- vdso_symver="${vdso_symver//./_}" ++ vdso_symver=`echo $vdso_symver | sed 's/\./_/g'` + echo "\ + \$(foreach p,\$(sysd-rules-targets),\$(objpfx)\$(patsubst %,\$p,$file).os): \\ + \$(..)sysdeps/unix/make-syscalls.sh\ +diff -Naur src.orig/libc/sysdeps/unix/Makefile src/libc/sysdeps/unix/Makefile +--- src.orig/libc/sysdeps/unix/Makefile 2012-11-06 12:31:45.000000000 -0500 ++++ src/libc/sysdeps/unix/Makefile 2013-06-25 12:59:59.068197711 -0400 +@@ -51,12 +51,14 @@ + for call in $(unix-stub-syscalls); do \ + case $$call in \ + *@@*) \ +- ver=$${call##*@}; call=$${call%%@*}; ver=$${ver//./_}; \ ++ ver=$${call##*@}; call=$${call%%@*}; \ ++ ver=`echo $ver | sed 's/\./_/g'`; \ + echo "strong_alias (_no_syscall, __$${call}_$${ver})"; \ + echo "versioned_symbol (libc, __$${call}_$${ver}, $$call, $$ver);"\ + ;; \ + *@*) \ +- ver=$${call##*@}; call=$${call%%@*}; ver=$${ver//./_}; \ ++ ver=$${call##*@}; call=$${call%%@*}; \ ++ ver=`echo $ver | sed 's/\./_/g'`; \ + echo "strong_alias (_no_syscall, __$${call}_$${ver})"; \ + echo "compat_symbol (libc, __$${call}_$${ver}, $$call, $$ver);" \ + ;; \ |