metadata: make srcpackage extensible

Turn the srcpackage values into hashes to allow storing more information
than just binary package names.

Signed-off-by: Matthias Schiffer <mschiffer@universe-factory.net>

diff --git a/scripts/feeds b/scripts/feeds
index 55c294ad0a4ec2f0419d12deddeda7324c349e04..0228c7ac079d3541ab0f1261b04bf6e95909345b 100755 (executable)
--- a/scripts/feeds
+++ b/scripts/feeds
@@ -525,7 +525,7 @@ sub install_package {
        };
 
        # install all dependencies referenced from the source package
        };
 
        # install all dependencies referenced from the source package

-       foreach my $vpkg (@{$feed_src->{$src}}) {
+       foreach my $vpkg (@{$feed_src->{$src}{packages}}) {

                foreach my $dep (@{$vpkg->{depends}}, @{$vpkg->{builddepends}}, @{$vpkg->{"builddepends/host"}}) {
                        next if $dep =~ /@/;
                        $dep =~ s/^\+//;
                foreach my $dep (@{$vpkg->{depends}}, @{$vpkg->{builddepends}}, @{$vpkg->{"builddepends/host"}}) {
                        next if $dep =~ /@/;
                        $dep =~ s/^\+//;

diff --git a/scripts/metadata.pm b/scripts/metadata.pm
index d446892e2bc15b00e89fa04b98c9aeaae1d1343b..fdb1fbb433646f95a2c87b8d6739ab1d1021b4f4 100644 (file)
--- a/scripts/metadata.pm
+++ b/scripts/metadata.pm
@@ -212,7 +212,9 @@ sub parse_package_metadata($) {
                        $src = $3;
                        $subdir =~ s/^package\///;
                        $subdir{$src} = $subdir;
                        $src = $3;
                        $subdir =~ s/^package\///;
                        $subdir{$src} = $subdir;

-                       $srcpackage{$src} = [];
+                       $srcpackage{$src} = {
+                               packages => [],
+                       };

                        $override = "";
                        undef $pkg;
                };
                        $override = "";
                        undef $pkg;
                };


@@ -237,7 +239,7 @@ sub parse_package_metadata($) {
                        $pkg->{tristate} = 1;
                        $pkg->{override} = $override;
                        $package{$1} = $pkg;
                        $pkg->{tristate} = 1;
                        $pkg->{override} = $override;
                        $package{$1} = $pkg;

-                       push @{$srcpackage{$src}}, $pkg;
+                       push @{$srcpackage{$src}{packages}}, $pkg;

                };
                /^Feature:\s*(.+?)\s*$/ and do {
                        undef $pkg;
                };
                /^Feature:\s*(.+?)\s*$/ and do {
                        undef $pkg;

diff --git a/scripts/package-metadata.pl b/scripts/package-metadata.pl
index 46446e994bada8fb88bfca735a1c3d907d5ce6ba..f03547a0d4478ee56be8bc3d0d848bd31fe853e7 100755 (executable)
--- a/scripts/package-metadata.pl
+++ b/scripts/package-metadata.pl
@@ -445,7 +445,7 @@ sub gen_package_mk() {
                        print "buildtypes-$pkg->{subdir}$pkg->{src} = ".join(' ', @{$pkg->{buildtypes}})."\n";
                }
 
                        print "buildtypes-$pkg->{subdir}$pkg->{src} = ".join(' ', @{$pkg->{buildtypes}})."\n";
                }
 

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

                        foreach my $dep (@{$spkg->{depends}}, @{$spkg->{builddepends}}) {
                                $dep =~ /@/ or do {
                                        $dep =~ s/\+//g;
                        foreach my $dep (@{$spkg->{depends}}, @{$spkg->{builddepends}}) {
                                $dep =~ /@/ or do {
                                        $dep =~ s/\+//g;