Fix small typo #4148

[openwrt.git] / scripts / metadata.pl

diff --git a/scripts/metadata.pl b/scripts/metadata.pl
index e05cc92..32370d5 100755 (executable)
--- a/scripts/metadata.pl
+++ b/scripts/metadata.pl
@@ -237,6 +237,7 @@ EOF
 
 sub gen_target_config() {
        my @target = parse_target_metadata();
 
 sub gen_target_config() {
        my @target = parse_target_metadata();

+       my %defaults;

 
        my @target_sort = sort {
                target_name($a) cmp target_name($b);
 
        my @target_sort = sort {
                target_name($a) cmp target_name($b);


@@ -290,6 +291,7 @@ EOF
                        my @pkglist = merge_package_lists($target->{packages}, $profile->{packages});
                        foreach my $pkg (@pkglist) {
                                print "\tselect DEFAULT_$pkg\n";
                        my @pkglist = merge_package_lists($target->{packages}, $profile->{packages});
                        foreach my $pkg (@pkglist) {
                                print "\tselect DEFAULT_$pkg\n";

+                               $defaults{$pkg} = 1;

                        }
                        print "\n";
                }
                        }
                        print "\n";
                }


@@ -319,6 +321,10 @@ config LINUX_$v
        bool
 EOF
        }
        bool
 EOF
        }

+       foreach my $def (sort keys %defaults) {
+               print "\tconfig DEFAULT_".$def."\n";
+               print "\t\tbool\n\n";
+       }

 }
 
 my %dep_check;
 }
 
 my %dep_check;


@@ -367,7 +373,9 @@ sub mconf_depends($$) {
        my $only_dep = shift;
        my $res;
        my $dep = shift;
        my $only_dep = shift;
        my $res;
        my $dep = shift;

+       my $seen = shift;

        $dep or $dep = {};
        $dep or $dep = {};

+       $seen or $seen = {};

 
        $depends or return;
        my @depends = @$depends;
 
        $depends or return;
        my @depends = @$depends;


@@ -382,6 +390,8 @@ sub mconf_depends($$) {
                        $condition = $1;
                        $depend = $2;
                }
                        $condition = $1;
                        $depend = $2;
                }

+               next if $seen->{$depend};
+               $seen->{$depend} = 1;

                if ($vdep = $package{$depend}->{vdepends}) {
                        $depend = join("||", map { "PACKAGE_".$_ } @$vdep);
                } else {
                if ($vdep = $package{$depend}->{vdepends}) {
                        $depend = join("||", map { "PACKAGE_".$_ } @$vdep);
                } else {


@@ -390,7 +400,7 @@ 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.
                                # 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;
 
                                $m = "select";
                                next if $only_dep;


@@ -427,8 +437,6 @@ sub print_package_config_category($) {
                        }
                        $menus{$menu} or $menus{$menu} = [];
                        push @{$menus{$menu}}, $pkg;
                        }
                        $menus{$menu} or $menus{$menu} = [];
                        push @{$menus{$menu}}, $pkg;

-                       print "\tconfig DEFAULT_".$pkg->{name}."\n";
-                       print "\t\tbool\n\n";

                }
        }
        my @menus = sort {
                }
        }
        my @menus = sort {