X-Git-Url: http://git.ozo.com/?a=blobdiff_plain;f=scripts%2Fgen_deps.pl;h=0fc80aae8508154ddc8dfdb02e40c48e75a425d9;hb=a121c194db7c7e3512209fe74f6f46aa8b0d06cb;hp=745d31c7d0877da9bc380978bcf8af6a648b2be1;hpb=3dcabf1774447d7a2a0065c20f5dee5cf6c75c56;p=openwrt-10.03%2F.git diff --git a/scripts/gen_deps.pl b/scripts/gen_deps.pl index 745d31c7d..0fc80aae8 100755 --- a/scripts/gen_deps.pl +++ b/scripts/gen_deps.pl @@ -28,12 +28,20 @@ while ($line = <>) { $line =~ /^Source-Makefile: \s*(.+\/([^\/]+)\/Makefile)\s*$/ and do { $makefile = $1; $src = $2; + defined $pkg{$src} or $pkg{$src} = {}; + $pkg{$src}->{src} = $src; }; $line =~ /^Package: \s*(.+)\s*$/ and do { $name = $1; defined $pkg{$name} or $pkg{$name} = {}; $pkg{$name}->{src} = $src; }; + $line =~ /^Provides: \s*(.+)\s*$/ and do { + foreach my $vpkg (split /\s+/, $1) { + defined $pkg{$vpkg} or $pkg{$vpkg} = {}; + $pkg{$vpkg}->{virtual} = 1; + } + }; $line =~ /^Prereq-Check:/ and !defined $prereq{$src} and do { $pkg{$name}->{prereq} = 1; }; @@ -52,6 +60,7 @@ $line=""; foreach $name (sort {uc($a) cmp uc($b)} keys %pkg) { my $config; + next if defined $pkg{$name}->{virtual}; if ($options{SDK}) { $conf{$pkg{$name}->{src}} or do { $config = 'm'; @@ -69,6 +78,7 @@ foreach $name (sort {uc($a) cmp uc($b)} keys %pkg) { my $depline = ""; foreach my $dep (@{$pkg{$name}->{depends}}) { my $idx; + next if defined $pkg{$dep}->{virtual}; if (defined $pkg{$dep}->{src}) { ($pkg{$name}->{src} ne $pkg{$dep}->{src}) and $idx = $pkg{$dep}->{src}; } elsif (defined($pkg{$dep}) && !$options{SDK}) {