ar71xx: fix RB941-2nD detection

[openwrt/openwrt.git] / scripts / bundle-libraries.sh

diff --git a/scripts/bundle-libraries.sh b/scripts/bundle-libraries.sh
index b108fd8f7768a34205ae1529548bec08d9c978c1..d3c7206a4dddd2b44a5b7d506f88212de850e0b4 100755 (executable)
--- a/scripts/bundle-libraries.sh
+++ b/scripts/bundle-libraries.sh
@@ -79,13 +79,19 @@ _runas_so() {
                int mangle_arg0(int argc, char **argv, char **env) {
                        char *arg0 = getenv("RUNAS_ARG0");
 
-                       if (arg0)
+                       if (arg0) {
                                argv[0] = arg0;
+                               unsetenv("RUNAS_ARG0");
+                       }
 
                        return 0;
                }
 
+               #ifdef __APPLE__
+               __attribute__((section("__DATA,__mod_init_func")))
+               #else
                __attribute__((section(".init_array")))
+               #endif
                static void *mangle_arg0_constructor = &mangle_arg0;
        EOT
 
@@ -95,6 +101,30 @@ _runas_so() {
        }
 }
 
+_patch_ldso() {
+       _cp "$1" "$1.patched"
+       sed -i -e 's,/\(usr\|lib\|etc\)/,/###/,g' "$1.patched"
+
+       if "$1.patched" 2>&1 | grep -q -- --library-path; then
+               _mv "$1.patched" "$1"
+       else
+               echo "binary patched ${1##*/} not executable, using original" >&2
+               rm -f "$1.patched"
+       fi
+}
+
+_patch_glibc() {
+       _cp "$1" "$1.patched"
+       sed -i -e 's,/usr/\(\(lib\|share\)/locale\),/###/\1,g' "$1.patched"
+
+       if "$1.patched" 2>&1 | grep -q -- GNU; then
+               _mv "$1.patched" "$1"
+       else
+               echo "binary patched ${1##*/} not executable, using original" >&2
+               rm -f "$1.patched"
+       fi
+}
+
 for LDD in ${PATH//://ldd }/ldd; do
        "$LDD" --version >/dev/null 2>/dev/null && break
        LDD=""
@@ -123,16 +153,20 @@ for BIN in "$@"; do
        [ -n "$LDD" ] && [ -x "$BIN" ] && file "$BIN" | grep -sqE "ELF.*(executable|interpreter)" && {
                for token in $("$LDD" "$BIN" 2>/dev/null); do
                        case "$token" in */*.so*)
-                               case "$token" in
-                                       *ld-*.so*) LDSO="${token##*/}" ;;
-                               esac
-
                                dest="$DIR/lib/${token##*/}"
                                ddir="${dest%/*}"
 
+                               case "$token" in
+                                       */ld-*.so*) LDSO="${token##*/}" ;;
+                               esac
+
                                [ -f "$token" -a ! -f "$dest" ] && {
                                        _md "$ddir"
                                        _cp "$token" "$dest"
+                                       case "$token" in
+                                               */ld-*.so*) _patch_ldso "$dest" ;;
+                                               */libc.so.6) _patch_glibc "$dest" ;;
+                                       esac
                                }
                        ;; esac
                done