diff options
| author | Simon Rettberg | 2015-09-13 18:50:16 +0200 |
|---|---|---|
| committer | Simon Rettberg | 2015-09-13 18:50:16 +0200 |
| commit | caf870056df88f4ee409124561a4da5760cf74da (patch) | |
| tree | 486ad76d1c4adf1d5c18e31e8568249a3bb51bee /remote | |
| parent | [sshd] !!! sshd service will not be started by default, link should go to con... (diff) | |
| download | tm-scripts-caf870056df88f4ee409124561a4da5760cf74da.tar.gz tm-scripts-caf870056df88f4ee409124561a4da5760cf74da.tar.xz tm-scripts-caf870056df88f4ee409124561a4da5760cf74da.zip | |
[binutil] Fix accidental exclusion of libs by using full path for automatic blacklisting
Diffstat (limited to 'remote')
| -rw-r--r-- | remote/includes/binutil.inc | 4 | ||||
| -rwxr-xr-x | remote/setup_target | 2 |
2 files changed, 3 insertions, 3 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 diff --git a/remote/setup_target b/remote/setup_target index 6b9a7a6c..91e657e0 100755 --- a/remote/setup_target +++ b/remote/setup_target @@ -228,7 +228,7 @@ copy_files_with_deps () { done #copy to initramfsdir - pdebug "File list generated at ${MODULE_BUILD_DIR}/${COPYFILES_LIST}." + pdebug "File list generated at ${COPYFILES_LIST}." # empty? if [ ! -s "$COPYFILES_LIST" ]; then return |