[au1000] refresh patches

[openwrt.git] / scripts / metadata.pl

diff --git a/scripts/metadata.pl b/scripts/metadata.pl
index ce80924..dc6eada 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;
 use FindBin;
 use lib "$FindBin::Bin";
 use strict;


@@ -223,6 +223,7 @@ EOF
                        $flags = $1;
                        $name = $2;
 
                        $flags = $1;
                        $name = $2;
 

+                       next if $name =~ /:/;

                        $flags =~ /-/ and $mode = "deselect";
                        $flags =~ /\+/ and $mode = "select";
                        $flags =~ /@/ and $confstr .= "\t$mode $name\n";
                        $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();
 
 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);


@@ -289,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";
                }


@@ -318,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;


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

+       my $seen = shift;
+       my $condition = shift;

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

+       $seen or $seen = {};

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


@@ -376,6 +386,12 @@ sub mconf_depends($$) {
                my $flags = $1;
                my $vdep;
 
                my $flags = $1;
                my $vdep;
 

+               if ($depend =~ /^(.+):(.+)$/) {
+                       $condition and $condition = "$condition && $1" or $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 {


@@ -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.
                                # 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, $condition);

 
                                $m = "select";
                                next if $only_dep;
                        };
                        $flags =~ /@/ or $depend = "PACKAGE_$depend";
 
                                $m = "select";
                                next if $only_dep;
                        };
                        $flags =~ /@/ or $depend = "PACKAGE_$depend";

+                       $condition and ($m =~ /select/ and $depend = "$depend if $condition" or $depend = "!($condition) || $depend");

                }
                $dep->{$depend} =~ /select/ or $dep->{$depend} = $m;
        }
                }
                $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;
                        }
                        $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 {


@@ -535,6 +550,13 @@ sub gen_package_mk() {
                my $depline = "";
                foreach my $deps (@srcdeps) {
                        my $idx;
                my $depline = "";
                foreach my $deps (@srcdeps) {
                        my $idx;

+                       my $condition;
+
+                       if ($deps =~ /^(.+):(.+)/) {
+                               $condition = $1;
+                               $deps = $2;
+                       }
+

                        my $pkg_dep = $package{$deps};
                        my @deps;
 
                        my $pkg_dep = $package{$deps};
                        my @deps;
 


@@ -556,13 +578,24 @@ 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};
                                        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}) {
                                        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 {
                                                $dep{$pkg->{src}."->($dep)".$idx} = 1;
                                        } else {

-                                               $depline .= " \$(curdir)/$idx/compile";
+                                               $depstr = "\$(curdir)/$idx/compile";

                                                $dep{$pkg->{src}."->".$idx} = 1;
                                        }
                                                $dep{$pkg->{src}."->".$idx} = 1;
                                        }

+                                       if ($condition) {
+                                               if ($condition =~ /^!(.+)/) {
+                                                       $depline .= " \$(if \$(CONFIG_$1),,$depstr)";
+                                               } else {
+                                                       $depline .= " \$(if \$(CONFIG_$condition),$depstr)";
+                                               }
+                                       } else {
+                                               $depline .= " $depstr";
+                                       }

                                }
                        }
                }
                                }
                        }
                }


@@ -608,7 +641,7 @@ sub parse_command() {
        print <<EOF
 Available Commands:
        $0 target_config [file]         Target metadata in Kconfig format
        print <<EOF
 Available Commands:
        $0 target_config [file]         Target metadata in Kconfig format

-       $0 package_mk [file]            Package metadata in makefile format
+       $0 package_mk [file]            Package metadata in makefile format

        $0 package_config [file]        Package metadata in Kconfig format
        $0 kconfig [file] [config]      Kernel config overrides
 
        $0 package_config [file]        Package metadata in Kconfig format
        $0 kconfig [file] [config]      Kernel config overrides