diff options
| author |  Joey Hess <joey@kitenet.net> | 2013-12-18 16:11:06 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2013-12-18 16:11:06 -0400 |
| commit | 92cc1eca0a53db1551c8c7646d29c65b71fced3e (patch) | |
| tree | a94147d1a0aef39ee078f9d44bb5be11a403b381 | |
| parent | 9cdef1e06b4784c745e25f0c65606737df27ce2e (diff) | |
fix shimming code to detect executables like ssh that file(1) says are shared objects
| -rw-r--r-- | Makefile | 2 | ||||
| -rw-r--r-- | doc/bugs/arm_build:_ssh:_error_while_loading_shared_libraries:_libselinux.so.1.mdwn | 3 |
2 files changed, 4 insertions, 1 deletions
@@ -147,7 +147,7 @@ linuxstandalone: Build/Standalone # in its own separate directory, to avoid eg git looking for # binaries in its directory rather than in PATH. for file in $$(find "$(LINUXSTANDALONE_DEST)" -type f); do \ - if file "$$file" | grep ELF | grep -q executable; then \ + if file "$$file" | grep ELF | egrep -q 'executable|shared object' && test -x "$$file"; then \ base=$$(basename "$$file"); \ mkdir -p "$(LINUXSTANDALONE_DEST)/shimmed/$$base"; \ mv "$$file" "$(LINUXSTANDALONE_DEST)/shimmed/$$base/"; \ diff --git a/doc/bugs/arm_build:_ssh:_error_while_loading_shared_libraries:_libselinux.so.1.mdwn b/doc/bugs/arm_build:_ssh:_error_while_loading_shared_libraries:_libselinux.so.1.mdwn index 1a1564ef9..dd544d7c7 100644 --- a/doc/bugs/arm_build:_ssh:_error_while_loading_shared_libraries:_libselinux.so.1.mdwn +++ b/doc/bugs/arm_build:_ssh:_error_while_loading_shared_libraries:_libselinux.so.1.mdwn @@ -26,3 +26,6 @@ remote types: git gcrypt S3 bup directory rsync web glacier hook """]] arm build (downloaded from [[install/Linux_standalone]]) + +> ssh was not shimmed. [[fixed|done]]; build will update in a few hours +> --[[Joey]] |