metadata: replace %subdir hash with a path field in source packages

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

diff --git a/scripts/package-metadata.pl b/scripts/package-metadata.pl
index 97b57c65eb8d5f7a556c3dc48ef7a685bb5d4d76..dab960e677a6825cc2d448dff7a7f09706f4f26e 100755 (executable)
--- a/scripts/package-metadata.pl
+++ b/scripts/package-metadata.pl
@@ -414,36 +414,44 @@ sub get_conditional_dep($$) {
 sub gen_package_mk() {
        my %conf;
        my %dep;
-       my %done;
        my $line;
 
        parse_package_metadata($ARGV[0]) or exit 1;
-       foreach my $name (sort {uc($a) cmp uc($b)} keys %package) {
-               my $config;
-               my $pkg = $package{$name};
-               my $src = $srcpackage{$pkg->{src}};
+       foreach my $srcname (sort {uc($a) cmp uc($b)} keys %srcpackage) {
+               my $src = $srcpackage{$srcname};
+               my $variant_default;
                my @srcdeps;
 
-               next if defined $pkg->{vdepends};
+               foreach my $pkg (@{$src->{packages}}) {
+                       next if defined $pkg->{vdepends};
+
+                       my $config = '';
+                       $config = "\$(CONFIG_PACKAGE_$pkg->{name})" unless $pkg->{buildonly};
+
+                       $pkg->{prereq} and print "prereq-$config += $src->{path}\n";
+
+                       next if $pkg->{buildonly};
+
+                       print "package-$config += $src->{path}\n";
 
-               $config = "\$(CONFIG_PACKAGE_$name)";
-               if ($config) {
-                       $pkg->{buildonly} and $config = "";
-                       print "package-$config += $pkg->{subdir}$pkg->{src}\n";
                        if ($pkg->{variant}) {
-                               if (!defined($done{$pkg->{src}}) or $pkg->{variant_default}) {
-                                       print "\$(curdir)/$pkg->{subdir}$pkg->{src}/default-variant := $pkg->{variant}\n";
+                               if (!defined($variant_default) or $pkg->{variant_default}) {
+                                       $variant_default = $pkg->{variant};
                                }
-                               print "\$(curdir)/$pkg->{subdir}$pkg->{src}/variants += \$(if $config,$pkg->{variant})\n"
+                               print "\$(curdir)/$src->{path}/variants += \$(if $config,$pkg->{variant})\n";
                        }
-                       $pkg->{prereq} and print "prereq-$config += $pkg->{subdir}$pkg->{src}\n";
                }
 
-               next if $done{$pkg->{src}};
-               $done{$pkg->{src}} = 1;
+               if (defined($variant_default)) {
+                       print "\$(curdir)/$src->{path}/default-variant := $variant_default\n";
+               }
+
+               unless (grep {!$_->{buildonly}} @{$src->{packages}}) {
+                       print "package- += $src->{path}\n";
+               }
 
                if (@{$src->{buildtypes}} > 0) {
-                       print "buildtypes-$pkg->{subdir}$pkg->{src} = ".join(' ', @{$src->{buildtypes}})."\n";
+                       print "buildtypes-$src->{path} = ".join(' ', @{$src->{buildtypes}})."\n";
                }
 
                foreach my $dep (@{$src->{builddepends}}, map { @{$_->{depends}} } @{$src->{packages}}) {
@@ -475,14 +483,14 @@ sub gen_package_mk() {
                                my $idx = "";
                                my $pkg_dep = $package{$dep};
                                if (defined($pkg_dep) && defined($pkg_dep->{src})) {
-                                       unless (!$deptype || grep { $_ eq $deptype } @{$srcpackage{$pkg_dep->{src}}{buildtypes}}) {
+                                       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",
-                                                       $pkg->{makefile}, $type, $pkg_dep->{src}, $deptype, $pkg_dep->{makefile}, $deptype;
+                                                       $src->{makefile}, $type, $pkg_dep->{src}{name}, $deptype, $pkg_dep->{makefile}, $deptype;
                                                next;
                                        }
-                                       $idx = $pkg_dep->{subdir}.$pkg_dep->{src};
+                                       $idx = $pkg_dep->{src}{path};
                                } elsif (defined($srcpackage{$dep})) {
-                                       $idx = $subdir{$dep}.$dep;
+                                       $idx = $srcpackage{$dep}{path};
                                } else {
                                        next;
                                }
@@ -494,7 +502,7 @@ sub gen_package_mk() {
                        }
                        my $depline = join(" ", sort keys %deplines);
                        if ($depline) {
-                               $line .= "\$(curdir)/".$pkg->{subdir}."$pkg->{src}/$type/compile += $depline\n";
+                               $line .= "\$(curdir)/$src->{path}/$type/compile += $depline\n";
                        }
                }
 
@@ -529,31 +537,31 @@ sub gen_package_mk() {
                        foreach my $dep (@deps) {
                                $pkg_dep = $package{$deps};
                                if (defined $pkg_dep->{src}) {
-                                       unless (!$deptype || grep { $_ eq $deptype } @{$srcpackage{$pkg_dep->{src}}{buildtypes}}) {
+                                       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",
-                                                       $pkg->{makefile}, $pkg_dep->{src}, $deptype, $pkg_dep->{makefile}, $deptype;
+                                                       $src->{makefile}, $pkg_dep->{src}{name}, $deptype, $pkg_dep->{makefile}, $deptype;
                                                next;
                                        }
-                                       $idx = $pkg_dep->{subdir}.$pkg_dep->{src};
+                                       $idx = $pkg_dep->{src}{path};
                                } elsif (defined($srcpackage{$dep})) {
-                                       $idx = $subdir{$dep}.$dep;
+                                       $idx = $srcpackage{$dep}{path};
                                }
 
                                if ($idx) {
                                        $idx .= $suffix;
 
                                        my $depline;
-                                       next if $pkg->{src} eq $pkg_dep->{src}.$suffix;
-                                       next if $dep{$condition.":".$pkg->{src}."->".$idx};
-                                       next if $dep{$pkg->{src}."->($dep)".$idx} and $pkg_dep->{vdepends};
+                                       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{$pkg->{src}."->($dep)".$idx} = 1;
+                                               $dep{$srcname."->($dep)".$idx} = 1;
                                        } else {
                                                $depstr = "\$(curdir)/$idx/compile";
-                                               $dep{$pkg->{src}."->".$idx} = 1;
+                                               $dep{$srcname."->".$idx} = 1;
                                        }
                                        $depline = get_conditional_dep($condition, $depstr);
                                        if ($depline) {
@@ -564,7 +572,7 @@ sub gen_package_mk() {
                }
                my $depline = join(" ", sort keys %deplines);
                if ($depline) {
-                       $line .= "\$(curdir)/".$pkg->{subdir}."$pkg->{src}/compile += $depline\n";
+                       $line .= "\$(curdir)/$src->{path}/compile += $depline\n";
                }
        }