aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatthias Schiffer <mschiffer@universe-factory.net>2018-01-07 13:05:23 +0100
committerMatthias Schiffer <mschiffer@universe-factory.net>2018-01-13 19:54:44 +0100
commit3abf663c22e32636306cfcdfd5fb29402a1c1a7f (patch)
tree813ad50fe70491c6408f38b42e25d52fae86e9f1
parent423ec18116f333bd51ff5264b0b5c9edc02945c6 (diff)
downloadupstream-3abf663c22e32636306cfcdfd5fb29402a1c1a7f.tar.gz
upstream-3abf663c22e32636306cfcdfd5fb29402a1c1a7f.tar.bz2
upstream-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>
-rw-r--r--include/package-dumpinfo.mk16
-rw-r--r--package/Makefile3
-rw-r--r--scripts/metadata.pm20
-rwxr-xr-xscripts/package-metadata.pl36
4 files changed, 2 insertions, 73 deletions
diff --git a/include/package-dumpinfo.mk b/include/package-dumpinfo.mk
index 1be7d958d4..7cc8f3f6dc 100644
--- a/include/package-dumpinfo.mk
+++ b/include/package-dumpinfo.mk
@@ -9,19 +9,6 @@ ifneq ($(DUMP),)
dumpinfo: FORCE
-define Config/template
-Preconfig: $(1)
-Preconfig-Type: $(2)
-Preconfig-Default: $(3)
-Preconfig-Label: $(4)
-
-endef
-
-define Config
- Preconfig/$(1) = $$(call Config/template,$(1),$(2),$(3),$(4))
- preconfig_$$(1) += $(1)
-endef
-
define Dumpinfo/Package
$(info Package: $(1)
$(if $(MENU),Menu: $(MENU)
@@ -59,8 +46,7 @@ $(if $(URL),$(URL)
$(if $(Package/$(1)/config),Config:
$(Package/$(1)/config)
@@
-)$(foreach pc,$(preconfig_$(1)),
-$(Preconfig/$(pc))))
+))
endef
define Feature/Default
diff --git a/package/Makefile b/package/Makefile
index 4fdf415046..0aefbb8023 100644
--- a/package/Makefile
+++ b/package/Makefile
@@ -72,7 +72,6 @@ $(curdir)/install: $(TMP_DIR)/.build $(curdir)/merge $(if $(CONFIG_TARGET_PER_DE
$(call opkg,$(TARGET_DIR)) flag $$flag `cat $$file`; \
done; \
done || true
- @-$(MAKE) package/preconfig
$(CP) $(TARGET_DIR) $(TARGET_DIR_ORIG)
@@ -96,8 +95,6 @@ ifdef CONFIG_SIGNED_PACKAGES
); done
endif
-$(curdir)/preconfig:
-
$(curdir)/flags-install:= -j1
$(eval $(call stampfile,$(curdir),package,prereq,.config))
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;
diff --git a/scripts/package-metadata.pl b/scripts/package-metadata.pl
index 7bffb2374c..fe6e25b3c8 100755
--- a/scripts/package-metadata.pl
+++ b/scripts/package-metadata.pl
@@ -372,19 +372,6 @@ sub print_package_overrides() {
sub gen_package_config() {
parse_package_metadata($ARGV[0]) or exit 1;
print "menuconfig IMAGEOPT\n\tbool \"Image configuration\"\n\tdefault n\n";
- foreach my $preconfig (keys %preconfig) {
- foreach my $cfg (keys %{$preconfig{$preconfig}}) {
- my $conf = $preconfig{$preconfig}->{$cfg}->{id};
- $conf =~ tr/\.-/__/;
- print <<EOF
- config UCI_PRECONFIG_$conf
- string "$preconfig{$preconfig}->{$cfg}->{label}" if IMAGEOPT
- depends on PACKAGE_$preconfig
- default "$preconfig{$preconfig}->{$cfg}->{default}"
-
-EOF
- }
- }
print "source \"package/*/image-config.in\"\n";
if (scalar glob "package/feeds/*/*/image-config.in") {
print "source \"package/feeds/*/*/image-config.in\"\n";
@@ -579,29 +566,6 @@ sub gen_package_mk() {
if ($line ne "") {
print "\n$line";
}
- foreach my $preconfig (keys %preconfig) {
- my $cmds;
- foreach my $cfg (keys %{$preconfig{$preconfig}}) {
- my $conf = $preconfig{$preconfig}->{$cfg}->{id};
- $conf =~ tr/\.-/__/;
- $cmds .= "\techo \"uci set '$preconfig{$preconfig}->{$cfg}->{id}=\$(subst \",,\$(CONFIG_UCI_PRECONFIG_$conf))'\"; \\\n";
- }
- next unless $cmds;
- print <<EOF
-
-ifndef DUMP_TARGET_DB
-\$(TARGET_DIR)/etc/uci-defaults/$preconfig: FORCE
- ( \\
-$cmds \\
- ) > \$@
-
-ifneq (\$(IMAGEOPT)\$(CONFIG_IMAGEOPT),)
- package/preconfig: \$(TARGET_DIR)/etc/uci-defaults/$preconfig
-endif
-endif
-
-EOF
- }
}
sub gen_package_source() {