From 1a42e88839e1328b07d09d95e71292aefba9b125 Mon Sep 17 00:00:00 2001 From: Jesse Keating Date: Thu, 6 Aug 2009 15:48:21 -1000 Subject: Don't try to get dso deps of statically linked files. This was causing get_dso_deps to go haywire when encountering statically linked things like /sbin/grub. Particularly bad on x86_64 when it would try to use the 64bit LDSO to run the 32bit executable. The output would be bad enough that it would short circuit our loop to install all the things in KEEPFILES. We noticed this because on x86_64 the gtk2 theme is what is listed after /sbin/grub in keepfiles, and we weren't getting our theme on x86_64. --- scripts/buildinstall.functions | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/scripts/buildinstall.functions b/scripts/buildinstall.functions index 2afb65235..af90070a0 100755 --- a/scripts/buildinstall.functions +++ b/scripts/buildinstall.functions @@ -110,7 +110,8 @@ instFile() { fi f=$(file $FILE) - echo $f | egrep -q ": (setuid )?ELF" && { + echo $f | egrep -q ": (setuid )?ELF" && + echo $f | egrep -qv "statically linked" && { if echo $f | grep -q " 64-bit " ; then get_dso_deps $(pwd) "$FILE" lib64 else -- cgit