aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThierry Vignaud <tv@mageia.org>2012-07-25 17:02:10 +0000
committerThierry Vignaud <tv@mageia.org>2012-07-25 17:02:10 +0000
commite339ebf119bf173b984816cda9e524bf168c734f (patch)
tree8f79e0d8538dc1b7c8203fc90fed1ad03baefa35
parent7fb8fa5c3839befe2eed4890c6bf4df0da188958 (diff)
downloadrpm-setup-e339ebf119bf173b984816cda9e524bf168c734f.tar
rpm-setup-e339ebf119bf173b984816cda9e524bf168c734f.tar.gz
rpm-setup-e339ebf119bf173b984816cda9e524bf168c734f.tar.bz2
rpm-setup-e339ebf119bf173b984816cda9e524bf168c734f.tar.xz
rpm-setup-e339ebf119bf173b984816cda9e524bf168c734f.zip
"resolve" /bin/env foo interpreter to actual path, rather than generating
dependencies on coreutils, should trim off ~800 dependencies more (Per Oyvind, mdv)
-rw-r--r--NEWS3
-rwxr-xr-xfind-requires.in4
2 files changed, 7 insertions, 0 deletions
diff --git a/NEWS b/NEWS
index 772e53a..5f5c312 100644
--- a/NEWS
+++ b/NEWS
@@ -6,6 +6,9 @@
by glibc for five years now and can safely be assumed that there's no longer
any need for it, reducing ~8K packages' dependency on it during next rebuild.
(Per Oyvind, mdv)
+- "resolve" /bin/env foo interpreter to actual path, rather than generating
+ dependencies on coreutils, should trim off ~800 dependencies more
+ (Per Oyvind, mdv)
- perl.prov: sync with upstream rpm.org:
o avoid emitting empty perl() module deps
o filter out incorrect perl(main) provides (rh#177960)
diff --git a/find-requires.in b/find-requires.in
index 6d742e5..4c8c2c9 100755
--- a/find-requires.in
+++ b/find-requires.in
@@ -116,6 +116,10 @@ uniqdeplist+="$tmpdeplist"
for f in $scriptlist; do
[ -r $f -a -x $f ] || continue
interp=`head -n 1 $f | grep '^#!' | sed -e 's/^\#\![ ]*//' | cut -d" " -f1`
+ if [[ "$interp" == *bin/env ]]; then
+ arg=`head -n 1 $f | grep '^#!' | sed -e 's/^\#\![ ]*//' | cut -d" " -f2`
+ interp="`which $arg`"
+ fi
case $interp in
# we really don't need to add these dependencies as they're required by
# glibc and therefore guaranteed to be satisfied