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 1031e11460e4050a0bf4d049b1efb7bf77ffba38..dab960e677a6825cc2d448dff7a7f09706f4f26e 100755 (executable)
--- a/scripts/package-metadata.pl
+++ b/scripts/package-metadata.pl
@@ -419,7 +419,6 @@ sub gen_package_mk() {
        parse_package_metadata($ARGV[0]) or exit 1;
        foreach my $srcname (sort {uc($a) cmp uc($b)} keys %srcpackage) {
                my $src = $srcpackage{$srcname};
-               my $path = $subdir{$srcname}.$srcname;
                my $variant_default;
                my @srcdeps;
 
@@ -429,30 +428,30 @@ sub gen_package_mk() {
                        my $config = '';
                        $config = "\$(CONFIG_PACKAGE_$pkg->{name})" unless $pkg->{buildonly};
 
-                       $pkg->{prereq} and print "prereq-$config += $path\n";
+                       $pkg->{prereq} and print "prereq-$config += $src->{path}\n";
 
                        next if $pkg->{buildonly};
 
-                       print "package-$config += $path\n";
+                       print "package-$config += $src->{path}\n";
 
                        if ($pkg->{variant}) {
                                if (!defined($variant_default) or $pkg->{variant_default}) {
                                        $variant_default = $pkg->{variant};
                                }
-                               print "\$(curdir)/$path/variants += \$(if $config,$pkg->{variant})\n";
+                               print "\$(curdir)/$src->{path}/variants += \$(if $config,$pkg->{variant})\n";
                        }
                }
 
                if (defined($variant_default)) {
-                       print "\$(curdir)/$path/default-variant := $variant_default\n";
+                       print "\$(curdir)/$src->{path}/default-variant := $variant_default\n";
                }
 
                unless (grep {!$_->{buildonly}} @{$src->{packages}}) {
-                       print "package- += $path\n";
+                       print "package- += $src->{path}\n";
                }
 
                if (@{$src->{buildtypes}} > 0) {
-                       print "buildtypes-$path = ".join(' ', @{$src->{buildtypes}})."\n";
+                       print "buildtypes-$src->{path} = ".join(' ', @{$src->{buildtypes}})."\n";
                }
 
                foreach my $dep (@{$src->{builddepends}}, map { @{$_->{depends}} } @{$src->{packages}}) {
@@ -484,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",
-                                                       $src->{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;
                                }
@@ -503,7 +502,7 @@ sub gen_package_mk() {
                        }
                        my $depline = join(" ", sort keys %deplines);
                        if ($depline) {
-                               $line .= "\$(curdir)/$path/$type/compile += $depline\n";
+                               $line .= "\$(curdir)/$src->{path}/$type/compile += $depline\n";
                        }
                }
 
@@ -538,21 +537,21 @@ 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",
-                                                       $src->{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 $srcname eq $pkg_dep->{src}.$suffix;
+                                       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;
@@ -573,7 +572,7 @@ sub gen_package_mk() {
                }
                my $depline = join(" ", sort keys %deplines);
                if ($depline) {
-                       $line .= "\$(curdir)/$path/compile += $depline\n";
+                       $line .= "\$(curdir)/$src->{path}/compile += $depline\n";
                }
        }