From 39be6e7f19c917981365d75527fdd183c6b81ca8 Mon Sep 17 00:00:00 2001 From: Matthias Schiffer Date: Sat, 6 Jan 2018 13:53:42 +0100 Subject: metadata: move 'buildtypes' from binary to source packages Build types are a property of source rather than binary packages. This is a preparation for followup cleanup. Signed-off-by: Matthias Schiffer --- scripts/metadata.pm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'scripts/metadata.pm') diff --git a/scripts/metadata.pm b/scripts/metadata.pm index fdb1fbb433..d756c7242d 100644 --- a/scripts/metadata.pm +++ b/scripts/metadata.pm @@ -214,6 +214,7 @@ sub parse_package_metadata($) { $subdir{$src} = $subdir; $srcpackage{$src} = { packages => [], + buildtypes => [], }; $override = ""; undef $pkg; @@ -234,7 +235,6 @@ sub parse_package_metadata($) { $pkg->{depends} = []; $pkg->{mdepends} = []; $pkg->{builddepends} = []; - $pkg->{buildtypes} = []; $pkg->{subdir} = $subdir; $pkg->{tristate} = 1; $pkg->{override} = $override; @@ -258,6 +258,7 @@ sub parse_package_metadata($) { /^Feature-Description:/ and $feature->{description} = get_multiline(\*FILE, "\t\t\t"); next; }; + /^Build-Types:\s*(.+)\s*$/ and $srcpackage{$src}{buildtypes} = [ split /\s+/, $1 ]; next unless $pkg; /^Version: \s*(.+)\s*$/ and $pkg->{version} = $1; /^Title: \s*(.+)\s*$/ and $pkg->{title} = $1; @@ -290,7 +291,6 @@ sub parse_package_metadata($) { /^Build-Only: \s*(.+)\s*$/ and $pkg->{buildonly} = 1; /^Build-Depends: \s*(.+)\s*$/ and $pkg->{builddepends} = [ split /\s+/, $1 ]; /^Build-Depends\/(\w+): \s*(.+)\s*$/ and $pkg->{"builddepends/$1"} = [ split /\s+/, $2 ]; - /^Build-Types:\s*(.+)\s*$/ and $pkg->{buildtypes} = [ split /\s+/, $1 ]; /^Repository:\s*(.+?)\s*$/ and $pkg->{repository} = $1; /^Category: \s*(.+)\s*$/ and do { $pkg->{category} = $1; -- cgit v1.2.3