reorder nas command line parameters (required for bridge operation)

[openwrt.git] / scripts / gen_deps.pl

diff --git a/scripts/gen_deps.pl b/scripts/gen_deps.pl
index d75f06d..0499871 100755 (executable)
--- a/scripts/gen_deps.pl
+++ b/scripts/gen_deps.pl
@@ -4,8 +4,15 @@ use strict;
 my $name;
 my $src;
 my $makefile;
 my $name;
 my $src;
 my $makefile;

+my %conf;

 my %pkg;
 my %dep;
 my %pkg;
 my %dep;

+my %options;
+my $opt;
+
+while ($opt = shift @ARGV) {
+       $opt =~ /^-s/ and $options{SDK} = 1;
+}

 
 my $line;
 while ($line = <>) {
 
 my $line;
 while ($line = <>) {


@@ -22,7 +29,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;
                }


@@ -32,15 +39,20 @@ while ($line = <>) {
 $line="";
 
 foreach $name (sort {uc($a) cmp uc($b)} keys %pkg) {
 $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}}) {
                my $idx;
 
        my $hasdeps = 0;
        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};
-               } elsif (defined $pkg{$dep}) {
+               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) {
                        $idx = $dep;
                }
                if ($idx) {