fix shimming code to detect executables like ssh that file(1) says are shared objects
This commit is contained in:
parent
52283f0fb1
commit
96a62dadd7
2 changed files with 4 additions and 1 deletions
2
Makefile
2
Makefile
|
@ -147,7 +147,7 @@ linuxstandalone: Build/Standalone
|
||||||
# in its own separate directory, to avoid eg git looking for
|
# in its own separate directory, to avoid eg git looking for
|
||||||
# binaries in its directory rather than in PATH.
|
# binaries in its directory rather than in PATH.
|
||||||
for file in $$(find "$(LINUXSTANDALONE_DEST)" -type f); do \
|
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"); \
|
base=$$(basename "$$file"); \
|
||||||
mkdir -p "$(LINUXSTANDALONE_DEST)/shimmed/$$base"; \
|
mkdir -p "$(LINUXSTANDALONE_DEST)/shimmed/$$base"; \
|
||||||
mv "$$file" "$(LINUXSTANDALONE_DEST)/shimmed/$$base/"; \
|
mv "$$file" "$(LINUXSTANDALONE_DEST)/shimmed/$$base/"; \
|
||||||
|
|
|
@ -26,3 +26,6 @@ remote types: git gcrypt S3 bup directory rsync web glacier hook
|
||||||
"""]]
|
"""]]
|
||||||
|
|
||||||
arm build (downloaded from [[install/Linux_standalone]])
|
arm build (downloaded from [[install/Linux_standalone]])
|
||||||
|
|
||||||
|
> ssh was not shimmed. [[fixed|done]]; build will update in a few hours
|
||||||
|
> --[[Joey]]
|
||||||
|
|
Loading…
Reference in a new issue