Skip to content
Permalink
Browse files

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 <yazhong.liu@rokid.com>
[reword commit message]
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
  • Loading branch information...
rokidbot authored and jow- committed Dec 10, 2018
1 parent 386803a commit 8b2efc87dbf2a194c7d8afccf36a3f9f73854170
Showing with 1 addition and 1 deletion.
  1. +1 −1 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

0 comments on commit 8b2efc8

Please sign in to comment.
You can’t perform that action at this time.