EljakimHerrewijnen/Openwrt
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

add a new package metadata variable MDEPENDS for specifying local menuconfig dependencies that do not propagate to other packages

Browse Source 
SVN-Revision: 26491
This commit is contained in:
Felix Fietkau 2011-04-05 19:03:51 +00:00
parent 980190367c
commit 459762ace2
4 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
include/package-defaults.mk
View File

@ -10,6 +10,7 @@ define Package/Default
SECTION:=opt SECTION:=opt
CATEGORY:=Extra packages CATEGORY:=Extra packages
DEPENDS:= DEPENDS:=
MDEPENDS:=
PROVIDES:= PROVIDES:=
EXTRA_DEPENDS:= EXTRA_DEPENDS:=
MAINTAINER:=OpenWrt Developers Team <openwrt-devel@openwrt.org> MAINTAINER:=OpenWrt Developers Team <openwrt-devel@openwrt.org>

1
include/package-dumpinfo.mk
View File

@ -31,6 +31,7 @@ $(if $(MENU),Menu: $(MENU)
)$(if $(findstring $(PREREQ_CHECK),1),Prereq-Check: 1 )$(if $(findstring $(PREREQ_CHECK),1),Prereq-Check: 1
)Version: $(VERSION) )Version: $(VERSION)
Depends: $(DEPENDS) Depends: $(DEPENDS)
Menu-Depends: $(MDEPENDS)
Provides: $(PROVIDES) Provides: $(PROVIDES)
$(if $(VARIANT),Build-Variant: $(VARIANT) $(if $(VARIANT),Build-Variant: $(VARIANT)
)$(if $(PKG_BUILD_DEPENDS),Build-Depends: $(PKG_BUILD_DEPENDS) )$(if $(PKG_BUILD_DEPENDS),Build-Depends: $(PKG_BUILD_DEPENDS)

1
scripts/metadata.pl
View File

@ -530,6 +530,7 @@ sub print_package_config_category($) {
print "\t\tdefault $default\n"; print "\t\tdefault $default\n";
} }
print mconf_depends($pkg->{name}, $pkg->{depends}, 0); print mconf_depends($pkg->{name}, $pkg->{depends}, 0);
print mconf_depends($pkg->{name}, $pkg->{mdepends}, 0);
print "\t\thelp\n"; print "\t\thelp\n";
print $pkg->{description}; print $pkg->{description};
print "\n"; print "\n";

2
scripts/metadata.pm
View File

@ -66,6 +66,7 @@ sub parse_package_metadata($) {
$pkg->{title} = ""; $pkg->{title} = "";
$pkg->{default} = "m if ALL"; $pkg->{default} = "m if ALL";
$pkg->{depends} = []; $pkg->{depends} = [];
$pkg->{mdepends} = [];
$pkg->{builddepends} = []; $pkg->{builddepends} = [];
$pkg->{buildtypes} = []; $pkg->{buildtypes} = [];
$pkg->{subdir} = $subdir; $pkg->{subdir} = $subdir;
@ -111,6 +112,7 @@ sub parse_package_metadata($) {
push @{$package{$vpkg}->{vdepends}}, $pkg->{name}; push @{$package{$vpkg}->{vdepends}}, $pkg->{name};
} }
}; };
/^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 ];
/^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;