If a package is part of a virtual dependency and also listed as a normal dependency...

[openwrt/openwrt.git] / scripts / metadata.pl

diff --git a/scripts/metadata.pl b/scripts/metadata.pl
index cfda69351bfc1240c616da304e18c6e43cc55baf..f000e9db9a5877cb04069998698a1d6544cb788a 100755 (executable)
--- a/scripts/metadata.pl
+++ b/scripts/metadata.pl
@@ -368,7 +368,8 @@ sub package_depends($$) {
        return $ret;
 }
 
-sub mconf_depends($$) {
+sub mconf_depends {
+       my $pkgname = shift;
        my $depends = shift;
        my $only_dep = shift;
        my $res;
@@ -387,7 +388,13 @@ sub mconf_depends($$) {
                my $vdep;
 
                if ($depend =~ /^(.+):(.+)$/) {
-                       $condition and $condition = "$condition && $1" or $condition = $1;
+                       if ($1 ne "PACKAGE_$pkgname") {
+                               if ($condition) {
+                                       $condition = "$condition && $1";
+                               } else {
+                                       $condition = $1;
+                               }
+                       }
                        $depend = $2;
                }
                next if $seen->{$depend};
@@ -400,13 +407,19 @@ 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, $seen, $condition);
+                               $package{$depend} and mconf_depends($pkgname, $package{$depend}->{depends}, 1, $dep, $seen, $condition);
 
                                $m = "select";
                                next if $only_dep;
                        };
                        $flags =~ /@/ or $depend = "PACKAGE_$depend";
-                       $condition and ($m =~ /select/ and $depend = "$depend if $condition" or $depend = "!($condition) || $depend");
+                       if ($condition) {
+                               if ($m =~ /select/) {
+                                       $depend = "$depend if $condition";
+                               } else {
+                                       $depend = "!($condition) || $depend";
+                               }
+                       }
                }
                $dep->{$depend} =~ /select/ or $dep->{$depend} = $m;
        }
@@ -468,7 +481,7 @@ sub print_package_config_category($) {
                        foreach my $default (split /\s*,\s*/, $pkg->{default}) {
                                print "\t\tdefault $default\n";
                        }
-                       print mconf_depends($pkg->{depends}, 0);
+                       print mconf_depends($pkg->{name}, $pkg->{depends}, 0);
                        print "\t\thelp\n";
                        print $pkg->{description};
                        print "\n";
@@ -547,7 +560,7 @@ sub gen_package_mk() {
                }
 
                my $hasdeps = 0;
-               my $depline = "";
+               my %deplines;
                foreach my $deps (@srcdeps) {
                        my $idx;
                        my $condition;
@@ -575,9 +588,10 @@ sub gen_package_mk() {
                                }
                                undef $idx if $idx =~ /^(kernel)|(base-files)$/;
                                if ($idx) {
+                                       my $depline;
                                        next if $pkg->{src} eq $pkg_dep->{src};
                                        next if $dep{$pkg->{src}."->".$idx};
-                                       next if $dep{$pkg->{src}."->($dep)".$idx};
+                                       next if $dep{$pkg->{src}."->($dep)".$idx} and $pkg_dep->{vdepends};
                                        my $depstr;
 
                                        if ($pkg_dep->{vdepends}) {
@@ -589,16 +603,20 @@ sub gen_package_mk() {
                                        }
                                        if ($condition) {
                                                if ($condition =~ /^!(.+)/) {
-                                                       $depline .= " \$(if \$(CONFIG_$1),,$depstr)";
+                                                       $depline = "\$(if \$(CONFIG_$1),,$depstr)";
                                                } else {
-                                                       $depline .= " \$(if \$(CONFIG_$condition),$depstr)";
+                                                       $depline = "\$(if \$(CONFIG_$condition),$depstr)";
                                                }
                                        } else {
-                                               $depline .= " $depstr";
+                                               $depline = $depstr;
+                                       }
+                                       if ($depline) {
+                                               $deplines{$idx.$dep} = $depline;
                                        }
                                }
                        }
                }
+               my $depline = join(" ", values %deplines);
                if ($depline) {
                        $line .= "\$(curdir)/".$pkg->{subdir}."$pkg->{src}/compile += $depline\n";
                }
@@ -641,7 +659,7 @@ sub parse_command() {
        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