From 8b2efc87dbf2a194c7d8afccf36a3f9f73854170 Mon Sep 17 00:00:00 2001 From: Yorkie Liu Date: Mon, 10 Dec 2018 17:35:32 +0800 Subject: [PATCH] scripts: rstrip.sh: allow rpath with sole $ORIGIN token 2efe776 introduces rpath checks with the commit message: > Remove all rpath entries which do not point to a location below /lib or > /usr/lib and which do not begin with '$ORIGIN'. However the implementation failed to support rpath entries with only the '$ORIGIN' token and no trailing slash, so allow these as well. Signed-off-by: Yorkie Liu [reword commit message] Signed-off-by: Jo-Philipp Wich --- scripts/rstrip.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/rstrip.sh b/scripts/rstrip.sh index 55caefc1a8..59f8624df2 100755 --- a/scripts/rstrip.sh +++ b/scripts/rstrip.sh @@ -34,7 +34,7 @@ find $TARGETS -type f -a -exec file {} \; | \ old_rpath="$($PATCHELF --print-rpath $F)"; new_rpath="" for path in $old_rpath; do case "$path" in - /lib/[^/]*|/usr/lib/[^/]*|\$ORIGIN/*) new_rpath="${new_rpath:+$new_rpath:}$path" ;; + /lib/[^/]*|/usr/lib/[^/]*|\$ORIGIN/*|\$ORIGIN) new_rpath="${new_rpath:+$new_rpath:}$path" ;; *) echo "$SELF: $F: removing rpath $path" ;; esac done