annoying initrd bug introduced by 2.6.17

[openwrt.git] / scripts / gen_deps.pl

diff --git a/scripts/gen_deps.pl b/scripts/gen_deps.pl
index d75f06d..de8572c 100755 (executable)
--- a/scripts/gen_deps.pl
+++ b/scripts/gen_deps.pl
@@ -22,7 +22,7 @@ while ($line = <>) {
        $line =~ /^(Build-)?Depends: \s*(.+)\s*$/ and do {
                $pkg{$name}->{depends} ||= [];
                foreach my $v (split /\s+/, $2) {
        $line =~ /^(Build-)?Depends: \s*(.+)\s*$/ and do {
                $pkg{$name}->{depends} ||= [];
                foreach my $v (split /\s+/, $2) {

-                       next if $v =~ /^@/;
+                       next if $v =~ /^[\+]?@/;

                        $v =~ s/^\+//;
                        push @{$pkg{$name}->{depends}}, $v;
                }
                        $v =~ s/^\+//;
                        push @{$pkg{$name}->{depends}}, $v;
                }


@@ -38,8 +38,8 @@ foreach $name (sort {uc($a) cmp uc($b)} keys %pkg) {
        my $depline = "";
        foreach my $dep (@{$pkg{$name}->{depends}}) {
                my $idx;
        my $depline = "";
        foreach my $dep (@{$pkg{$name}->{depends}}) {
                my $idx;

-               if (defined $pkg{$dep}->{src} && $pkg{$name}->{src} ne $pkg{$dep}->{src}) {
-                       $idx = $pkg{$dep}->{src};
+               if (defined $pkg{$dep}->{src}) {
+                       ($pkg{$name}->{src} ne $pkg{$dep}->{src}) and $idx = $pkg{$dep}->{src};

                } elsif (defined $pkg{$dep}) {
                        $idx = $dep;
                }
                } elsif (defined $pkg{$dep}) {
                        $idx = $dep;
                }