remove duplicate package/ prefix from package dump error message

[openwrt.git] / scripts / gen_deps.pl

diff --git a/scripts/gen_deps.pl b/scripts/gen_deps.pl
index 40153bd..0cdcc97 100755 (executable)
--- a/scripts/gen_deps.pl
+++ b/scripts/gen_deps.pl
@@ -1,10 +1,25 @@
 #!/usr/bin/perl
+# 
+# Copyright (C) 2006 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+
 use strict;
 
 my $name;
 my $src;
 my $makefile;
+my %conf;
 my %pkg;
+my %dep;
+my %options;
+my $opt;
+
+while ($opt = shift @ARGV) {
+       $opt =~ /^-s/ and $options{SDK} = 1;
+}
 
 my $line;
 while ($line = <>) {
@@ -19,21 +34,38 @@ while ($line = <>) {
                $pkg{$name}->{src} = $src;
        };
        $line =~ /^(Build-)?Depends: \s*(.+)\s*$/ and do {
-               my @dep = split /,\s*/, $2;
-               $pkg{$name}->{depends} = \@dep;
+               $pkg{$name}->{depends} ||= [];
+               foreach my $v (split /\s+/, $2) {
+                       next if $v =~ /^[\+]?@/;
+                       $v =~ s/^\+//;
+                       push @{$pkg{$name}->{depends}}, $v;
+               }
        };
 }
 
 $line="";
 
 foreach $name (sort {uc($a) cmp uc($b)} keys %pkg) {
-       print "package-\$(CONFIG_PACKAGE_$name) += $pkg{$name}->{src}\n";
+       if ($options{SDK}) {
+               $conf{$pkg{$name}->{src}} or print "package-m += $pkg{$name}->{src}\n";
+               $conf{$pkg{$name}->{src}} = 1;
+       } else {
+               print "package-\$(CONFIG_PACKAGE_$name) += $pkg{$name}->{src}\n";
+       }
 
        my $hasdeps = 0;
        my $depline = "";
        foreach my $dep (@{$pkg{$name}->{depends}}) {
-               if (defined $pkg{$dep}->{src} && $pkg{$name}->{src} ne $pkg{$dep}->{src}) {
-                       $depline .= " $pkg{$dep}->{src}-compile";
+               my $idx;
+               if (defined $pkg{$dep}->{src}) {
+                       ($pkg{$name}->{src} ne $pkg{$dep}->{src}) and $idx = $pkg{$dep}->{src};
+               } elsif (defined($pkg{$dep}) && !$options{SDK}) {
+                       $idx = $dep;
+               }
+               if ($idx) {
+                       next if $dep{$pkg{$name}->{src}."->".$idx};
+                       $depline .= " $idx\-compile";
+                       $dep{$pkg{$name}->{src}."->".$idx} = 1;
                }
        }
        if ($depline ne "") {