From 9a04a806772919c2ab2b599e134eae0d60e6e0a6 Mon Sep 17 00:00:00 2001
From: Jo-Philipp Wich <jo@mein.io>
Date: Wed, 13 Apr 2016 15:33:53 +0200
Subject: [PATCH] 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>
---
scripts/metadata.pl | 4 ++--
scripts/metadata.pm | 1 +
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} = {};
--
GitLab