domenico/openwrt_NSS_ACW
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

add support for hidden packages that get selected/built but do not show up in menuconfig

Browse Source 
SVN-Revision: 27344
This commit is contained in:
Felix Fietkau
2011-07-02 06:49:09 +00:00
parent 701543d3ef
commit bcf4757508
4 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
include/package-defaults.mk
View File

@@ -42,6 +42,7 @@ define Package/Default
TITLE:= TITLE:=
KCONFIG:= KCONFIG:=
BUILDONLY:= BUILDONLY:=
HIDDEN:=
URL:= URL:=
VARIANT:= VARIANT:=
endef endef

1
include/package-dumpinfo.mk
View File

@@ -45,6 +45,7 @@ Source: $(PKG_SOURCE)
Type: $(if $(Package/$(1)/targets),$(Package/$(1)/targets),$(if $(PKG_TARGETS),$(PKG_TARGETS),ipkg)) Type: $(if $(Package/$(1)/targets),$(Package/$(1)/targets),$(if $(PKG_TARGETS),$(PKG_TARGETS),ipkg))
$(if $(KCONFIG),Kernel-Config: $(KCONFIG) $(if $(KCONFIG),Kernel-Config: $(KCONFIG)
)$(if $(BUILDONLY),Build-Only: $(BUILDONLY) )$(if $(BUILDONLY),Build-Only: $(BUILDONLY)
)$(if $(HIDDEN),Hidden: $(HIDDEN)
)Description: $(if $(Package/$(1)/description),$(Package/$(1)/description),$(TITLE)) )Description: $(if $(Package/$(1)/description),$(Package/$(1)/description),$(TITLE))
$(if $(URL),$(URL) $(if $(URL),$(URL)
)$(MAINTAINER) )$(MAINTAINER)

4
scripts/metadata.pl
View File

@@ -525,10 +525,12 @@ sub print_package_config_category($) {
if ($c > 0) { if ($c > 0) {
$title .= ("." x $c). " ". $pkg->{title}; $title .= ("." x $c). " ". $pkg->{title};
} }
$title = "\"$title\"";
print "\t"; print "\t";
$pkg->{menu} and print "menu"; $pkg->{menu} and print "menu";
print "config PACKAGE_".$pkg->{name}."\n"; print "config PACKAGE_".$pkg->{name}."\n";
print "\t\t".($pkg->{tristate} ? 'tristate' : 'bool')." \"$title\"\n"; $pkg->{hidden} and $title = "";
print "\t\t".($pkg->{tristate} ? 'tristate' : 'bool')." $title\n";
print "\t\tdefault y if DEFAULT_".$pkg->{name}."\n"; print "\t\tdefault y if DEFAULT_".$pkg->{name}."\n";
foreach my $default (split /\s*,\s*/, $pkg->{default}) { foreach my $default (split /\s*,\s*/, $pkg->{default}) {
print "\t\tdefault $default\n"; print "\t\tdefault $default\n";

1
scripts/metadata.pm
View File

@@ -114,6 +114,7 @@ sub parse_package_metadata($) {
}; };
/^Menu-Depends: \s*(.+)\s*$/ and $pkg->{mdepends} = [ split /\s+/, $1 ]; /^Menu-Depends: \s*(.+)\s*$/ and $pkg->{mdepends} = [ split /\s+/, $1 ];
/^Depends: \s*(.+)\s*$/ and $pkg->{depends} = [ split /\s+/, $1 ]; /^Depends: \s*(.+)\s*$/ and $pkg->{depends} = [ split /\s+/, $1 ];
/^Hidden: \s*(.+)\s*$/ and $pkg->{hidden} = 1;
/^Build-Variant: \s*([\w\-]+)\s*/ and $pkg->{variant} = $1; /^Build-Variant: \s*([\w\-]+)\s*/ and $pkg->{variant} = $1;
/^Build-Only: \s*(.+)\s*$/ and $pkg->{buildonly} = 1; /^Build-Only: \s*(.+)\s*$/ and $pkg->{buildonly} = 1;
/^Build-Depends: \s*(.+)\s*$/ and $pkg->{builddepends} = [ split /\s+/, $1 ]; /^Build-Depends: \s*(.+)\s*$/ and $pkg->{builddepends} = [ split /\s+/, $1 ];