fix shimming code to detect executables like ssh that file(1) says are shared objects

This commit is contained in:
Joey Hess 2013-12-18 16:11:06 -04:00
parent 52283f0fb1
commit 96a62dadd7
2 changed files with 4 additions and 1 deletions

View file

@ -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/"; \

View file

@ -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]]