X-Git-Url: http://git.openwrt.org/?a=blobdiff_plain;f=scripts%2Fgen_deps.pl;h=af206f004782675832ea7f2866232a5f704e65b5;hb=c5c7a2e5ab5b35b59b2144d8cde262c5ac4374ba;hp=745d31c7d0877da9bc380978bcf8af6a648b2be1;hpb=60c1f0f64d23003a19a07d6b9638542130f6641d;p=openwrt%2Fstaging%2Fdedeckeh.git diff --git a/scripts/gen_deps.pl b/scripts/gen_deps.pl index 745d31c7d0..af206f0047 100755 --- a/scripts/gen_deps.pl +++ b/scripts/gen_deps.pl @@ -34,6 +34,12 @@ while ($line = <>) { 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 +58,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 +76,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}) {