brcm2708: add kmod-hwmon-rpi-poe-fan

[openwrt/staging/chunkeey.git] / scripts / package-metadata.pl

diff --git a/scripts/package-metadata.pl b/scripts/package-metadata.pl
index fe6e25b3c8dedd8917382035a0b77ab8a7386cb0..53bb45a62c83d628e62dc3857eb8d9d48d3b9ba3 100755 (executable)
--- a/scripts/package-metadata.pl
+++ b/scripts/package-metadata.pl
@@ -101,14 +101,16 @@ my %dep_check;
 sub __find_package_dep($$) {
        my $pkg = shift;
        my $name = shift;
 sub __find_package_dep($$) {
        my $pkg = shift;
        my $name = shift;

-       my $deps = ($pkg->{vdepends} or $pkg->{depends});
+       my $deps = $pkg->{depends};

 
        return 0 unless defined $deps;
 
        return 0 unless defined $deps;

-       foreach my $dep (@{$deps}) {
-               next if $dep_check{$dep};
-               $dep_check{$dep} = 1;
-               return 1 if $dep eq $name;
-               return 1 if ($package{$dep} and (__find_package_dep($package{$dep},$name) == 1));
+       foreach my $vpkg (@{$deps}) {
+               foreach my $dep (@{$vpackage{$vpkg}}) {
+                       next if $dep_check{$dep->{name}};
+                       $dep_check{$dep->{name}} = 1;
+                       return 1 if $dep->{name} eq $name;
+                       return 1 if (__find_package_dep($dep, $name) == 1);
+               }

        }
        return 0;
 }
        }
        return 0;
 }


@@ -156,7 +158,6 @@ sub mconf_depends {
                my $m = "depends on";
                my $flags = "";
                $depend =~ s/^([@\+]+)// and $flags = $1;
                my $m = "depends on";
                my $flags = "";
                $depend =~ s/^([@\+]+)// and $flags = $1;

-               my $vdep;

                my $condition = $parent_condition;
 
                next if $condition eq $depend;
                my $condition = $parent_condition;
 
                next if $condition eq $depend;


@@ -173,23 +174,21 @@ sub mconf_depends {
                        }
                        $depend = $2;
                }
                        }
                        $depend = $2;
                }

-               next if $package{$depend} and $package{$depend}->{buildonly};

                if ($flags =~ /\+/) {
                if ($flags =~ /\+/) {

-                       if ($vdep = $package{$depend}->{vdepends}) {
+                       my $vdep = $vpackage{$depend};
+                       if ($vdep) {

                                my @vdeps;
                                my @vdeps;

-                               $depend = undef;

 
                                foreach my $v (@$vdep) {
 
                                foreach my $v (@$vdep) {

-                                       if ($package{$v} && $package{$v}->{variant_default}) {
-                                               $depend = $v;
+                                       next if $v->{buildonly};
+                                       if ($v->{variant_default}) {
+                                               unshift @vdeps, $v->{name};

                                        } else {
                                        } else {

-                                               push @vdeps, $v;
+                                               push @vdeps, $v->{name};

                                        }
                                }
 
                                        }
                                }
 

-                               if (!$depend) {
-                                       $depend = shift @vdeps;
-                               }
+                               $depend = shift @vdeps;

 
                                if (@vdeps > 1) {
                                        $condition = ($condition ? "$condition && " : '') . '!('.join("||", map { "PACKAGE_".$_ } @vdeps).')';
 
                                if (@vdeps > 1) {
                                        $condition = ($condition ? "$condition && " : '') . '!('.join("||", map { "PACKAGE_".$_ } @vdeps).')';


@@ -209,8 +208,9 @@ sub mconf_depends {
 
                        $flags =~ /@/ or $depend = "PACKAGE_$depend";
                } else {
 
                        $flags =~ /@/ or $depend = "PACKAGE_$depend";
                } else {

-                       if ($vdep = $package{$depend}->{vdepends}) {
-                               $depend = join("||", map { "PACKAGE_".$_ } @$vdep);
+                       my $vdep = $vpackage{$depend};
+                       if ($vdep && @$vdep > 0) {
+                               $depend = join("||", map { "PACKAGE_".$_->{name} } @$vdep);

                        } else {
                                $flags =~ /@/ or $depend = "PACKAGE_$depend";
                        }
                        } else {
                                $flags =~ /@/ or $depend = "PACKAGE_$depend";
                        }


@@ -337,31 +337,6 @@ sub print_package_config_category($) {
        undef $category{$cat};
 }
 
        undef $category{$cat};
 }
 

-sub print_package_features() {
-       keys %features > 0 or return;
-       print "menu \"Package features\"\n";
-       foreach my $n (keys %features) {
-               my @features = sort { $b->{priority} <=> $a->{priority} or $a->{title} cmp $b->{title} } @{$features{$n}};
-               print <<EOF;
-choice
-       prompt "$features[0]->{target_title}"
-       default FEATURE_$features[0]->{name}
-EOF
-
-               foreach my $feature (@features) {
-                       print <<EOF;
-       config FEATURE_$feature->{name}
-               bool "$feature->{title}"
-EOF
-                       $feature->{description} =~ /\w/ and do {
-                               print "\t\thelp\n".$feature->{description}."\n";
-                       };
-               }
-               print "endchoice\n"
-       }
-       print "endmenu\n\n";
-}
-

 sub print_package_overrides() {
        keys %overrides > 0 or return;
        print "\tconfig OVERRIDE_PKGS\n";
 sub print_package_overrides() {
        keys %overrides > 0 or return;
        print "\tconfig OVERRIDE_PKGS\n";


@@ -376,7 +351,6 @@ sub gen_package_config() {
        if (scalar glob "package/feeds/*/*/image-config.in") {
            print "source \"package/feeds/*/*/image-config.in\"\n";
        }
        if (scalar glob "package/feeds/*/*/image-config.in") {
            print "source \"package/feeds/*/*/image-config.in\"\n";
        }

-       print_package_features();

        print_package_config_category 'Base system';
        foreach my $cat (sort {uc($a) cmp uc($b)} keys %category) {
                print_package_config_category $cat;
        print_package_config_category 'Base system';
        foreach my $cat (sort {uc($a) cmp uc($b)} keys %category) {
                print_package_config_category $cat;


@@ -399,61 +373,88 @@ sub get_conditional_dep($$) {
 }
 
 sub gen_package_mk() {
 }
 
 sub gen_package_mk() {

-       my %conf;
-       my %dep;

        my $line;
 
        parse_package_metadata($ARGV[0]) or exit 1;
        foreach my $srcname (sort {uc($a) cmp uc($b)} keys %srcpackage) {
                my $src = $srcpackage{$srcname};
                my $variant_default;
        my $line;
 
        parse_package_metadata($ARGV[0]) or exit 1;
        foreach my $srcname (sort {uc($a) cmp uc($b)} keys %srcpackage) {
                my $src = $srcpackage{$srcname};
                my $variant_default;

-               my @srcdeps;
+               my %deplines = ('' => {});

 
                foreach my $pkg (@{$src->{packages}}) {
 
                foreach my $pkg (@{$src->{packages}}) {

-                       next if defined $pkg->{vdepends};
+                       foreach my $dep (@{$pkg->{depends}}) {
+                               next if ($dep =~ /@/);
+
+                               my $condition;
+
+                               $dep =~ s/\+//g;
+                               if ($dep =~ /^(.+):(.+)/) {
+                                       $condition = $1;
+                                       $dep = $2;
+                               }
+
+                               my $vpkg_dep = $vpackage{$dep};
+                               unless (defined $vpkg_dep) {
+                                       warn sprintf "WARNING: Makefile '%s' has a dependency on '%s', which does not exist\n",
+                                               $src->{makefile}, $dep;
+                                       next;
+                               }
+
+                               # Filter out self-depends
+                               my @vdeps = grep { $srcname ne $_->{src}{name} } @{$vpkg_dep};
+
+                               foreach my $vdep (@vdeps) {
+                                       my $depstr = sprintf '$(curdir)/%s/compile', $vdep->{src}{path};
+                                       if (@vdeps > 1) {
+                                               $depstr = sprintf '$(if $(CONFIG_PACKAGE_%s),%s)', $vdep->{name}, $depstr;
+                                       }
+                                       my $depline = get_conditional_dep($condition, $depstr);
+                                       if ($depline) {
+                                               $deplines{''}{$depline}++;
+                                       }
+                               }
+                       }

 
                        my $config = '';
 
                        my $config = '';

-                       $config = "\$(CONFIG_PACKAGE_$pkg->{name})" unless $pkg->{buildonly};
+                       $config = sprintf '$(CONFIG_PACKAGE_%s)', $pkg->{name} unless $pkg->{buildonly};

 
 

-                       $pkg->{prereq} and print "prereq-$config += $src->{path}\n";
+                       $pkg->{prereq} and printf "prereq-%s += %s\n", $config, $src->{path};

 
                        next if $pkg->{buildonly};
 
 
                        next if $pkg->{buildonly};
 

-                       print "package-$config += $src->{path}\n";
+                       printf "package-%s += %s\n", $config, $src->{path};

 
                        if ($pkg->{variant}) {
                                if (!defined($variant_default) or $pkg->{variant_default}) {
                                        $variant_default = $pkg->{variant};
                                }
 
                        if ($pkg->{variant}) {
                                if (!defined($variant_default) or $pkg->{variant_default}) {
                                        $variant_default = $pkg->{variant};
                                }

-                               print "\$(curdir)/$src->{path}/variants += \$(if $config,$pkg->{variant})\n";
+                               printf "\$(curdir)/%s/variants += \$(if %s,%s)\n", $src->{path}, $config, $pkg->{variant};

                        }
                }
 
                if (defined($variant_default)) {
                        }
                }
 
                if (defined($variant_default)) {

-                       print "\$(curdir)/$src->{path}/default-variant := $variant_default\n";
+                       printf "\$(curdir)/%s/default-variant := %s\n", $src->{path}, $variant_default;

                }
 
                unless (grep {!$_->{buildonly}} @{$src->{packages}}) {
                }
 
                unless (grep {!$_->{buildonly}} @{$src->{packages}}) {

-                       print "package- += $src->{path}\n";
+                       printf "package- += %s\n", $src->{path};

                }
 
                if (@{$src->{buildtypes}} > 0) {
                }
 
                if (@{$src->{buildtypes}} > 0) {

-                       print "buildtypes-$src->{path} = ".join(' ', @{$src->{buildtypes}})."\n";
+                       printf "buildtypes-%s = %s\n", $src->{path}, join(' ', @{$src->{buildtypes}});

                }
 
                }
 

-               foreach my $dep (@{$src->{builddepends}}, map { @{$_->{depends}} } @{$src->{packages}}) {
-                       $dep =~ /@/ or do {
-                               $dep =~ s/\+//g;
-                               push @srcdeps, $dep;
-                       };
-               }
-               foreach my $type (@{$src->{buildtypes}}) {
-                       my @extra_deps;
-                       my %deplines;
+               foreach my $type ('', @{$src->{buildtypes}}) {
+                       my $suffix = '';
+
+                       $suffix = "/$type" if $type;
+
+                       next unless $src->{"builddepends$suffix"};
+
+                       defined $deplines{$suffix} or $deplines{$suffix} = {};

 
 

-                       next unless $src->{"builddepends/$type"};
-                       foreach my $dep (@{$src->{"builddepends/$type"}}) {
-                               my $suffix = "";
+                       foreach my $dep (@{$src->{"builddepends$suffix"}}) {
+                               my $depsuffix = "";

                                my $deptype = "";
                                my $condition;
 
                                my $deptype = "";
                                my $condition;
 


@@ -464,103 +465,32 @@ sub gen_package_mk() {
                                if ($dep =~ /^(.+)\/(.+)/) {
                                        $dep = $1;
                                        $deptype = $2;
                                if ($dep =~ /^(.+)\/(.+)/) {
                                        $dep = $1;
                                        $deptype = $2;

-                                       $suffix = "/$2";
+                                       $depsuffix = "/$2";

                                }
 
                                }
 

-                               my $idx = "";
-                               my $pkg_dep = $package{$dep};
-                               if (defined($pkg_dep) && defined($pkg_dep->{src})) {
-                                       unless (!$deptype || grep { $_ eq $deptype } @{$pkg_dep->{src}{buildtypes}}) {
-                                               warn sprintf "WARNING: Makefile '%s' has a %s build dependency on '%s/%s' but '%s' does not implement a '%s' build type\n",
-                                                       $src->{makefile}, $type, $pkg_dep->{src}{name}, $deptype, $pkg_dep->{src}{makefile}, $deptype;
-                                               next;
-                                       }
-                                       $idx = $pkg_dep->{src}{path};
-                               } elsif (defined($srcpackage{$dep})) {
-                                       $idx = $srcpackage{$dep}{path};
-                               } else {
+                               next if $srcname.$suffix eq $dep.$depsuffix;
+
+                               my $src_dep = $srcpackage{$dep};
+                               unless (defined($src_dep) && (!$deptype || grep { $_ eq $deptype } @{$src_dep->{buildtypes}})) {
+                                       warn sprintf "WARNING: Makefile '%s' has a build dependency on '%s', which does not exist\n",
+                                               $src->{makefile}, $dep.$depsuffix;

                                        next;
                                }
                                        next;
                                }

-                               my $depstr = "\$(curdir)/$idx$suffix/compile";
+
+                               my $depstr = sprintf '$(curdir)/%s/compile', $src_dep->{path}.$depsuffix;

                                my $depline = get_conditional_dep($condition, $depstr);
                                if ($depline) {
                                my $depline = get_conditional_dep($condition, $depstr);
                                if ($depline) {

-                                       $deplines{$depline}++;
+                                       $deplines{$suffix}{$depline}++;

                                }
                        }
                                }
                        }

-                       my $depline = join(" ", sort keys %deplines);
-                       if ($depline) {
-                               $line .= "\$(curdir)/$src->{path}/$type/compile += $depline\n";
-                       }

                }
 
                }
 

-               my $hasdeps = 0;
-               my %deplines;
-               foreach my $deps (@srcdeps) {
-                       my $idx;
-                       my $condition;
-                       my $prefix = "";
-                       my $suffix = "";
-                       my $deptype = "";
-
-                       if ($deps =~ /^(.+):(.+)/) {
-                               $condition = $1;
-                               $deps = $2;
-                       }
-                       if ($deps =~ /^(.+)\/(.+)/) {
-                               $deps = $1;
-                               $deptype = $2;
-                               $suffix = "/$2";
-                       }
-
-                       my $pkg_dep = $package{$deps};
-                       my @deps;
-
-                       if ($pkg_dep->{vdepends}) {
-                               @deps = @{$pkg_dep->{vdepends}};
-                       } else {
-                               @deps = ($deps);
-                       }
-
-                       foreach my $dep (@deps) {
-                               $pkg_dep = $package{$deps};
-                               if (defined $pkg_dep->{src}) {
-                                       unless (!$deptype || grep { $_ eq $deptype } @{$pkg_dep->{src}{buildtypes}}) {
-                                               warn sprintf "WARNING: Makefile '%s' has a build dependency on '%s/%s' but '%s' does not implement a '%s' build type\n",
-                                                       $src->{makefile}, $pkg_dep->{src}{name}, $deptype, $pkg_dep->{src}{makefile}, $deptype;
-                                               next;
-                                       }
-                                       $idx = $pkg_dep->{src}{path};
-                               } elsif (defined($srcpackage{$dep})) {
-                                       $idx = $srcpackage{$dep}{path};
-                               }
-
-                               if ($idx) {
-                                       $idx .= $suffix;
-
-                                       my $depline;
-                                       next if $srcname eq $pkg_dep->{src}{name}.$suffix;
-                                       next if $dep{$condition.":".$srcname."->".$idx};
-                                       next if $dep{$srcname."->($dep)".$idx} and $pkg_dep->{vdepends};
-                                       my $depstr;
-
-                                       if ($pkg_dep->{vdepends}) {
-                                               $depstr = "\$(if \$(CONFIG_PACKAGE_$dep),\$(curdir)/$idx/compile)";
-                                               $dep{$srcname."->($dep)".$idx} = 1;
-                                       } else {
-                                               $depstr = "\$(curdir)/$idx/compile";
-                                               $dep{$srcname."->".$idx} = 1;
-                                       }
-                                       $depline = get_conditional_dep($condition, $depstr);
-                                       if ($depline) {
-                                               $deplines{$depline}++;
-                                       }
-                               }
+               foreach my $suffix (sort keys %deplines) {
+                       my $depline = join(" ", sort keys %{$deplines{$suffix}});
+                       if ($depline) {
+                               $line .= sprintf "\$(curdir)/%s/compile += %s\n", $src->{path}.$suffix, $depline;

                        }
                }
                        }
                }

-               my $depline = join(" ", sort keys %deplines);
-               if ($depline) {
-                       $line .= "\$(curdir)/$src->{path}/compile += $depline\n";
-               }

        }
 
        if ($line ne "") {
        }
 
        if ($line ne "") {