aboutsummaryrefslogtreecommitdiffstats
path: root/scripts
diff options
context:
space:
mode:
authorMatthias Schiffer <mschiffer@universe-factory.net>2018-01-08 12:31:03 +0100
committerMatthias Schiffer <mschiffer@universe-factory.net>2018-01-13 19:54:45 +0100
commit4bb54ed15ee4647c36a4c2b3cb9416f344594b8a (patch)
treef4246c75ef243d3a0c63dbedd31bfa8b5b099855 /scripts
parent52719c2b67aff4b406e23ea5ed746c6c006e85bc (diff)
downloadupstream-4bb54ed15ee4647c36a4c2b3cb9416f344594b8a.tar.gz
upstream-4bb54ed15ee4647c36a4c2b3cb9416f344594b8a.tar.bz2
upstream-4bb54ed15ee4647c36a4c2b3cb9416f344594b8a.zip
build: remove obsolete "package feature" feature
Package "features" seem to be unused for some time. In any case, custom Config.in snippets and package PROVIDES are a much more flexible way to express similar options. Signed-off-by: Matthias Schiffer <mschiffer@universe-factory.net>
Diffstat (limited to 'scripts')
-rw-r--r--scripts/metadata.pm23
-rwxr-xr-xscripts/package-metadata.pl26
2 files changed, 1 insertions, 48 deletions
diff --git a/scripts/metadata.pm b/scripts/metadata.pm
index 394ac1f515..ea38735389 100644
--- a/scripts/metadata.pm
+++ b/scripts/metadata.pm
@@ -2,13 +2,12 @@ package metadata;
use base 'Exporter';
use strict;
use warnings;
-our @EXPORT = qw(%package %vpackage %srcpackage %category %features %overrides clear_packages parse_package_metadata parse_target_metadata get_multiline @ignore %usernames %groupnames);
+our @EXPORT = qw(%package %vpackage %srcpackage %category %overrides clear_packages parse_package_metadata parse_target_metadata get_multiline @ignore %usernames %groupnames);
our %package;
our %vpackage;
our %srcpackage;
our %category;
-our %features;
our %overrides;
our @ignore;
@@ -181,7 +180,6 @@ sub clear_packages() {
%vpackage = ();
%srcpackage = ();
%category = ();
- %features = ();
%overrides = ();
%usernames = ();
%groupnames = ();
@@ -190,7 +188,6 @@ sub clear_packages() {
sub parse_package_metadata($) {
my $file = shift;
my $pkg;
- my $feature;
my $src;
my $override;
my %ignore = map { $_ => 1 } @ignore;
@@ -221,7 +218,6 @@ sub parse_package_metadata($) {
};
next unless $src;
/^Package:\s*(.+?)\s*$/ and do {
- undef $feature;
$pkg = {};
$pkg->{src} = $src;
$pkg->{name} = $1;
@@ -237,23 +233,6 @@ sub parse_package_metadata($) {
$vpackage{$1} or $vpackage{$1} = [];
unshift @{$vpackage{$1}}, $pkg;
};
- /^Feature:\s*(.+?)\s*$/ and do {
- undef $pkg;
- $feature = {};
- $feature->{name} = $1;
- $feature->{priority} = 0;
- };
- $feature and do {
- /^Target-Name:\s*(.+?)\s*$/ and do {
- $features{$1} or $features{$1} = [];
- push @{$features{$1}}, $feature unless $src->{ignore};
- };
- /^Target-Title:\s*(.+?)\s*$/ and $feature->{target_title} = $1;
- /^Feature-Priority:\s*(\d+)\s*$/ and $feature->{priority} = $1;
- /^Feature-Name:\s*(.+?)\s*$/ and $feature->{title} = $1;
- /^Feature-Description:/ and $feature->{description} = get_multiline(\*FILE, "\t\t\t");
- next;
- };
/^Build-Depends: \s*(.+)\s*$/ and $src->{builddepends} = [ split /\s+/, $1 ];
/^Build-Depends\/(\w+): \s*(.+)\s*$/ and $src->{"builddepends/$1"} = [ split /\s+/, $2 ];
/^Build-Types:\s*(.+)\s*$/ and $src->{buildtypes} = [ split /\s+/, $1 ];
diff --git a/scripts/package-metadata.pl b/scripts/package-metadata.pl
index 2dc29ea6ff..70e7f8e2c8 100755
--- a/scripts/package-metadata.pl
+++ b/scripts/package-metadata.pl
@@ -337,31 +337,6 @@ sub print_package_config_category($) {
undef $category{$cat};
}
-sub print_package_features() {
- keys %features > 0 or return;
- print "menu \"Package features\"\n";
- foreach my $n (keys %features) {
- my @features = sort { $b->{priority} <=> $a->{priority} or $a->{title} cmp $b->{title} } @{$features{$n}};
- print <<EOF;
-choice
- prompt "$features[0]->{target_title}"
- default FEATURE_$features[0]->{name}
-EOF
-
- foreach my $feature (@features) {
- print <<EOF;
- config FEATURE_$feature->{name}
- bool "$feature->{title}"
-EOF
- $feature->{description} =~ /\w/ and do {
- print "\t\thelp\n".$feature->{description}."\n";
- };
- }
- print "endchoice\n"
- }
- print "endmenu\n\n";
-}
-
sub print_package_overrides() {
keys %overrides > 0 or return;
print "\tconfig OVERRIDE_PKGS\n";
@@ -376,7 +351,6 @@ sub gen_package_config() {
if (scalar glob "package/feeds/*/*/image-config.in") {
print "source \"package/feeds/*/*/image-config.in\"\n";
}
- print_package_features();
print_package_config_category 'Base system';
foreach my $cat (sort {uc($a) cmp uc($b)} keys %category) {
print_package_config_category $cat;