summaryrefslogtreecommitdiffstats
path: root/remote/includes
diff options
context:
space:
mode:
authorChristian Rößler2015-09-14 13:21:55 +0200
committerChristian Rößler2015-09-14 13:21:55 +0200
commit92c04f646e86f01425e1e1ac3382498f0c189302 (patch)
treee8954c04587ee70230cd7f5c3ecf62c9b5f4f813 /remote/includes
parent[runvirt] [vmware] Minor cosmetics, logging (diff)
parent[binutil] Fix accidental exclusion of libs by using full path for automatic b... (diff)
downloadtm-scripts-92c04f646e86f01425e1e1ac3382498f0c189302.tar.gz
tm-scripts-92c04f646e86f01425e1e1ac3382498f0c189302.tar.xz
tm-scripts-92c04f646e86f01425e1e1ac3382498f0c189302.zip
Merge branch 'master' of git.openslx.org:openslx-ng/tm-scripts
Diffstat (limited to 'remote/includes')
-rw-r--r--remote/includes/binutil.inc4
1 files changed, 2 insertions, 2 deletions
diff --git a/remote/includes/binutil.inc b/remote/includes/binutil.inc
index ae173deb..92ab8d87 100644
--- a/remote/includes/binutil.inc
+++ b/remote/includes/binutil.inc
@@ -73,7 +73,7 @@ get_dynamic_dependencies() {
rm -f "$LDD_OUT"
continue
fi
- rm -f "$LDD_OUT"
+ rm -f -- "$LDD_OUT"
done
}
@@ -103,7 +103,7 @@ lib_search() {
for LOCALLIB in ${LOCAL_MATCHES}; do
get_link_chain "${LOCALSEARCHDIR}/${LOCALLIB}" "${LOCALSEARCHDIR}"
get_dynamic_dependencies -l "${LOCALSEARCHDIR}" "${LOCALLIB}"
- CURRENT_BLACKLIST+="\|${LIBLINK[0]}"
+ CURRENT_BLACKLIST+="\|${LOCALLIB:1}"
done
# found the libs, we are done
return