EljakimHerrewijnen/Openwrt
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

scripts: bundle-libraries: fix logic flaw

Browse Source 
Previous refactoring of the script moved the LDSO detection into a
file-not-exists condition, causing onyl the very first executable to
get bundled.

Solve the problem by unconditionally checking for LDSO again.

Fixes: 9030a78a71 ("scripts: bundle-libraries: prevent loading host locales")
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
This commit is contained in:
Jo-Philipp Wich 2018-08-29 13:16:34 +02:00
parent acedce1d79
commit 5ebcd32997
1 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
scripts/bundle-libraries.sh
View File

@ -156,17 +156,16 @@ for BIN in "$@"; do
dest="$DIR/lib/${token##*/}" dest="$DIR/lib/${token##*/}"
ddir="${dest%/*}" ddir="${dest%/*}"
case "$token" in
*/ld-*.so*) LDSO="${token##*/}" ;;
esac
[ -f "$token" -a ! -f "$dest" ] && { [ -f "$token" -a ! -f "$dest" ] && {
_md "$ddir" _md "$ddir"
_cp "$token" "$dest" _cp "$token" "$dest"
case "$token" in case "$token" in
*ld-*.so*) */ld-*.so*) _patch_ldso "$dest" ;;
LDSO="${token##*/}" */libc.so.6) _patch_glibc "$dest" ;;
_patch_ldso "$dest"
;;
libc.so.6|*/libc.so.6)
_patch_glibc "$dest"
;;
esac esac
} }
;; esac ;; esac