fix broken patch.

[openwrt.git] / scripts / metadata.pl

diff --git a/scripts/metadata.pl b/scripts/metadata.pl
index d920f59..32370d5 100755 (executable)
--- a/scripts/metadata.pl
+++ b/scripts/metadata.pl
@@ -1,4 +1,4 @@
-#!/usr/bin/perl
+#!/usr/bin/env perl
 use FindBin;
 use lib "$FindBin::Bin";
 use strict;
@@ -223,6 +223,7 @@ EOF
                        $flags = $1;
                        $name = $2;
 
+                       next if $name =~ /:/;
                        $flags =~ /-/ and $mode = "deselect";
                        $flags =~ /\+/ and $mode = "select";
                        $flags =~ /@/ and $confstr .= "\t$mode $name\n";
@@ -236,6 +237,7 @@ EOF
 
 sub gen_target_config() {
        my @target = parse_target_metadata();
+       my %defaults;
 
        my @target_sort = sort {
                target_name($a) cmp target_name($b);
@@ -289,6 +291,7 @@ EOF
                        my @pkglist = merge_package_lists($target->{packages}, $profile->{packages});
                        foreach my $pkg (@pkglist) {
                                print "\tselect DEFAULT_$pkg\n";
+                               $defaults{$pkg} = 1;
                        }
                        print "\n";
                }
@@ -318,6 +321,10 @@ config LINUX_$v
        bool
 EOF
        }
+       foreach my $def (sort keys %defaults) {
+               print "\tconfig DEFAULT_".$def."\n";
+               print "\t\tbool\n\n";
+       }
 }
 
 my %dep_check;
@@ -366,7 +373,9 @@ sub mconf_depends($$) {
        my $only_dep = shift;
        my $res;
        my $dep = shift;
+       my $seen = shift;
        $dep or $dep = {};
+       $seen or $seen = {};
 
        $depends or return;
        my @depends = @$depends;
@@ -374,8 +383,15 @@ sub mconf_depends($$) {
                my $m = "depends";
                $depend =~ s/^([@\+]+)//;
                my $flags = $1;
+               my $condition;
                my $vdep;
 
+               if ($depend =~ /^(.+):(.+)$/) {
+                       $condition = $1;
+                       $depend = $2;
+               }
+               next if $seen->{$depend};
+               $seen->{$depend} = 1;
                if ($vdep = $package{$depend}->{vdepends}) {
                        $depend = join("||", map { "PACKAGE_".$_ } @$vdep);
                } else {
@@ -384,12 +400,13 @@ sub mconf_depends($$) {
                                # thus if FOO depends on other config options, these dependencies
                                # will not be checked. To fix this, we simply emit all of FOO's
                                # depends here as well.
-                               $package{$depend} and mconf_depends($package{$depend}->{depends}, 1, $dep);
+                               $package{$depend} and mconf_depends($package{$depend}->{depends}, 1, $dep, $seen);
 
                                $m = "select";
                                next if $only_dep;
                        };
                        $flags =~ /@/ or $depend = "PACKAGE_$depend";
+                       $condition and $depend = "$depend if $condition";
                }
                $dep->{$depend} =~ /select/ or $dep->{$depend} = $m;
        }
@@ -420,8 +437,6 @@ sub print_package_config_category($) {
                        }
                        $menus{$menu} or $menus{$menu} = [];
                        push @{$menus{$menu}}, $pkg;
-                       print "\tconfig DEFAULT_".$pkg->{name}."\n";
-                       print "\t\tbool\n\n";
                }
        }
        my @menus = sort {
@@ -472,7 +487,7 @@ sub print_package_config_category($) {
 
 sub gen_package_config() {
        parse_package_metadata($ARGV[0]) or exit 1;
-       print "menuconfig UCI_PRECONFIG\n\tbool \"Image configuration\"\n";
+       print "menuconfig UCI_PRECONFIG\n\tbool \"Image configuration\"\n" if %preconfig;
        foreach my $preconfig (keys %preconfig) {
                foreach my $cfg (keys %{$preconfig{$preconfig}}) {
                        my $conf = $preconfig{$preconfig}->{$cfg}->{id};
@@ -535,6 +550,13 @@ sub gen_package_mk() {
                my $depline = "";
                foreach my $deps (@srcdeps) {
                        my $idx;
+                       my $condition;
+
+                       if ($deps =~ /^(.+):(.+)/) {
+                               $condition = $1;
+                               $deps = $2;
+                       }
+
                        my $pkg_dep = $package{$deps};
                        my @deps;
 
@@ -556,13 +578,20 @@ sub gen_package_mk() {
                                        next if $pkg->{src} eq $pkg_dep->{src};
                                        next if $dep{$pkg->{src}."->".$idx};
                                        next if $dep{$pkg->{src}."->($dep)".$idx};
+                                       my $depstr;
+
                                        if ($pkg_dep->{vdepends}) {
-                                               $depline .= " \$(if \$(CONFIG_PACKAGE_$dep),\$(curdir)/$idx/compile)";
+                                               $depstr = "\$(if \$(CONFIG_PACKAGE_$dep),\$(curdir)/$idx/compile)";
                                                $dep{$pkg->{src}."->($dep)".$idx} = 1;
                                        } else {
-                                               $depline .= " \$(curdir)/$idx/compile";
+                                               $depstr = "\$(curdir)/$idx/compile";
                                                $dep{$pkg->{src}."->".$idx} = 1;
                                        }
+                                       if ($condition) {
+                                               $depline .= " \$(if \$(CONFIG_$condition),$depstr)";
+                                       } else {
+                                               $depline .= " $depstr";
+                                       }
                                }
                        }
                }