diff options
| author | Matthias Schiffer <mschiffer@universe-factory.net> | 2018-01-04 19:52:18 +0100 |
|---|---|---|
| committer | Matthias Schiffer <mschiffer@universe-factory.net> | 2018-01-13 19:54:43 +0100 |
| commit | 19577582e437dcff50c97c5c19726b12f7b3a5ac (patch) | |
| tree | 1702de1680de4d4da9501d9f76c075a80821af19 /scripts | |
| parent | 1a2b5eb7ac6bce10fe9afa941db6ee5001ce80e3 (diff) | |
| download | upstream-19577582e437dcff50c97c5c19726b12f7b3a5ac.tar.gz upstream-19577582e437dcff50c97c5c19726b12f7b3a5ac.tar.bz2 upstream-19577582e437dcff50c97c5c19726b12f7b3a5ac.zip | |
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>
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/feeds | 2 | ||||
| -rw-r--r-- | scripts/metadata.pm | 6 | ||||
| -rwxr-xr-x | scripts/package-metadata.pl | 2 |
3 files changed, 6 insertions, 4 deletions
diff --git a/scripts/feeds b/scripts/feeds index 55c294ad0a..0228c7ac07 100755 --- a/scripts/feeds +++ b/scripts/feeds @@ -525,7 +525,7 @@ sub install_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/^\+//; diff --git a/scripts/metadata.pm b/scripts/metadata.pm index d446892e2b..fdb1fbb433 100644 --- a/scripts/metadata.pm +++ b/scripts/metadata.pm @@ -212,7 +212,9 @@ sub parse_package_metadata($) { $src = $3; $subdir =~ s/^package\///; $subdir{$src} = $subdir; - $srcpackage{$src} = []; + $srcpackage{$src} = { + packages => [], + }; $override = ""; undef $pkg; }; @@ -237,7 +239,7 @@ sub parse_package_metadata($) { $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; diff --git a/scripts/package-metadata.pl b/scripts/package-metadata.pl index 46446e994b..f03547a0d4 100755 --- 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"; } - 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; |