diff options
| author | Jesse Keating <jkeating@redhat.com> | 2009-08-06 15:48:21 -1000 |
|---|---|---|
| committer | David Cantrell <dcantrell@redhat.com> | 2009-08-06 15:52:02 -1000 |
| commit | 1a42e88839e1328b07d09d95e71292aefba9b125 (patch) | |
| tree | b5f23ef33bd1c6ed56c15ca6e4bbe7d42d8c0d93 | |
| parent | f08e122ea285e9b87197446bce1f31db6c61fa42 (diff) | |
| download | anaconda-1a42e88839e1328b07d09d95e71292aefba9b125.tar.gz anaconda-1a42e88839e1328b07d09d95e71292aefba9b125.tar.xz anaconda-1a42e88839e1328b07d09d95e71292aefba9b125.zip | |
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.
| -rwxr-xr-x | scripts/buildinstall.functions | 3 |
1 files changed, 2 insertions, 1 deletions
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 |