aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJo-Philipp Wich <jo@mein.io>2016-04-13 15:33:53 +0200
committerJo-Philipp Wich <jo@mein.io>2016-04-13 15:33:53 +0200
commit9a04a806772919c2ab2b599e134eae0d60e6e0a6 (patch)
treef07a116a426a7fca315e40dfc319a4a6160dfdc5
parentaad2b92603d5d317a4acac446ca2ed1e97ae7b02 (diff)
downloadupstream-9a04a806772919c2ab2b599e134eae0d60e6e0a6.tar.gz
upstream-9a04a806772919c2ab2b599e134eae0d60e6e0a6.tar.bz2
upstream-9a04a806772919c2ab2b599e134eae0d60e6e0a6.zip
scripts: metadata: use the new "Repository" field
Switch to the new "Repository" metadata field to populate tmp/.packagesubdirs Signed-off-by: Jo-Philipp Wich <jo@mein.io>
-rwxr-xr-xscripts/metadata.pl4
-rw-r--r--scripts/metadata.pm1
2 files changed, 3 insertions, 2 deletions
diff --git a/scripts/metadata.pl b/scripts/metadata.pl
index 6ad3c39f00..a55b7990f7 100755
--- a/scripts/metadata.pl
+++ b/scripts/metadata.pl
@@ -849,8 +849,8 @@ sub gen_package_subdirs() {
parse_package_metadata($ARGV[0]) or exit 1;
foreach my $name (sort {uc($a) cmp uc($b)} keys %package) {
my $pkg = $package{$name};
- if ($pkg->{name} && $pkg->{package_subdir}) {
- print "Package/$name/subdir = $pkg->{package_subdir}\n";
+ if ($pkg->{name} && $pkg->{repository}) {
+ print "Package/$name/subdir = $pkg->{repository}\n";
}
}
}
diff --git a/scripts/metadata.pm b/scripts/metadata.pm
index 8e285e53a8..e00f4e97cf 100644
--- a/scripts/metadata.pm
+++ b/scripts/metadata.pm
@@ -223,6 +223,7 @@ sub parse_package_metadata($) {
/^Build-Depends\/(\w+): \s*(.+)\s*$/ and $pkg->{"builddepends/$1"} = [ split /\s+/, $2 ];
/^Build-Types:\s*(.+)\s*$/ and $pkg->{buildtypes} = [ split /\s+/, $1 ];
/^Package-Subdir:\s*(.+?)\s*$/ and $pkg->{package_subdir} = $1;
+ /^Repository:\s*(.+?)\s*$/ and $pkg->{repository} = $1;
/^Category: \s*(.+)\s*$/ and do {
$pkg->{category} = $1;
defined $category{$1} or $category{$1} = {};