RepoMirrors
/
openwrt
mirror of git://git.openwrt.org/openwrt/openwrt.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

scripts: extend rstrip.sh to remove bad rpaths 

Remove all rpath entries which do not point to a location below /lib or
/usr/lib and which do not begin with '$ORIGIN'.

Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>

SVN-Revision: 44377
This commit is contained in:
Jo-Philipp Wich 2015-02-10 15:48:48 +00:00
parent 572b943080
commit 2efe776ab0
2 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
rules.mk
View File

@ -269,6 +269,7 @@ else
NM="$(TARGET_CROSS)nm" \ NM="$(TARGET_CROSS)nm" \
STRIP="$(STRIP)" \ STRIP="$(STRIP)" \
STRIP_KMOD="$(SCRIPT_DIR)/strip-kmod.sh" \ STRIP_KMOD="$(SCRIPT_DIR)/strip-kmod.sh" \
PATCHELF="$(STAGING_DIR_HOST)/bin/patchelf" \
$(SCRIPT_DIR)/rstrip.sh $(SCRIPT_DIR)/rstrip.sh
endif endif

12
scripts/rstrip.sh
View File

@ -25,11 +25,21 @@ find $TARGETS -type f -a -exec file {} \; | \
( (
IFS=":" IFS=":"
while read F S; do while read F S; do
echo "$SELF: $F:$S" echo "$SELF: $F: $S"
[ "${S}" = "relocatable" ] && { [ "${S}" = "relocatable" ] && {
eval "$STRIP_KMOD $F" eval "$STRIP_KMOD $F"
} || { } || {
b=$(stat -c '%a' $F) b=$(stat -c '%a' $F)
[ -z "$PATCHELF" ] || [ -z "$TOPDIR" ] || {
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" ;;
*) echo "$SELF: $F: removing rpath $path" ;;
esac
done
[ "$new_rpath" = "$old_rpath" ] || $PATCHELF --set-rpath "$new_rpath" $F
}
eval "$STRIP $F" eval "$STRIP $F"
a=$(stat -c '%a' $F) a=$(stat -c '%a' $F)
[ "$a" = "$b" ] || chmod $b $F [ "$a" = "$b" ] || chmod $b $F