2
0
Эх сурвалжийг харах

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 <[email protected]>
[reword commit message]
Signed-off-by: Jo-Philipp Wich <[email protected]>
Yorkie Liu 6 жил өмнө
parent
commit
8b2efc87db
1 өөрчлөгдсөн 1 нэмэгдсэн , 1 устгасан
  1. 1 1
      scripts/rstrip.sh

+ 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