diff options
| author | Matthias Schiffer <mschiffer@universe-factory.net> | 2018-01-07 13:05:23 +0100 |
|---|---|---|
| committer | Matthias Schiffer <mschiffer@universe-factory.net> | 2018-01-13 19:54:44 +0100 |
| commit | 3abf663c22e32636306cfcdfd5fb29402a1c1a7f (patch) | |
| tree | 813ad50fe70491c6408f38b42e25d52fae86e9f1 /scripts/metadata.pm | |
| parent | 423ec18116f333bd51ff5264b0b5c9edc02945c6 (diff) | |
| download | openwrt-3abf663c22e32636306cfcdfd5fb29402a1c1a7f.tar.gz openwrt-3abf663c22e32636306cfcdfd5fb29402a1c1a7f.tar.bz2 openwrt-3abf663c22e32636306cfcdfd5fb29402a1c1a7f.zip | |
build: remove package preconfig feature
This feature has been unused for years, and its scope is too limited to be
actually useful.
Signed-off-by: Matthias Schiffer <mschiffer@universe-factory.net>
Diffstat (limited to 'scripts/metadata.pm')
| -rw-r--r-- | scripts/metadata.pm | 20 |
1 files changed, 1 insertions, 19 deletions
diff --git a/scripts/metadata.pm b/scripts/metadata.pm index c0c967c01c..5d829ebbcd 100644 --- a/scripts/metadata.pm +++ b/scripts/metadata.pm @@ -2,10 +2,9 @@ package metadata; use base 'Exporter'; use strict; use warnings; -our @EXPORT = qw(%package %srcpackage %category %preconfig %features %overrides clear_packages parse_package_metadata parse_target_metadata get_multiline @ignore %usernames %groupnames); +our @EXPORT = qw(%package %srcpackage %category %features %overrides clear_packages parse_package_metadata parse_target_metadata get_multiline @ignore %usernames %groupnames); our %package; -our %preconfig; our %srcpackage; our %category; our %features; @@ -177,7 +176,6 @@ sub parse_target_metadata($) { } sub clear_packages() { - %preconfig = (); %package = (); %srcpackage = (); %category = (); @@ -191,7 +189,6 @@ sub parse_package_metadata($) { my $file = shift; my $pkg; my $feature; - my $preconfig; my $src; my $override; my %ignore = map { $_ => 1 } @ignore; @@ -299,21 +296,6 @@ sub parse_package_metadata($) { }; /^Config:\s*(.*)\s*$/ and $pkg->{config} = "$1\n".get_multiline(*FILE, "\t"); /^Prereq-Check:/ and $pkg->{prereq} = 1; - /^Preconfig:\s*(.+)\s*$/ and do { - my $pkgname = $pkg->{name}; - $preconfig{$pkgname} or $preconfig{$pkgname} = {}; - if (exists $preconfig{$pkgname}->{$1}) { - $preconfig = $preconfig{$pkgname}->{$1}; - } else { - $preconfig = { - id => $1 - }; - $preconfig{$pkgname}{$1} = $preconfig unless $src->{ignore}; - } - }; - /^Preconfig-Type:\s*(.*?)\s*$/ and $preconfig->{type} = $1; - /^Preconfig-Label:\s*(.*?)\s*$/ and $preconfig->{label} = $1; - /^Preconfig-Default:\s*(.*?)\s*$/ and $preconfig->{default} = $1; /^Require-User:\s*(.*?)\s*$/ and do { my @ugspecs = split /\s+/, $1; |