summaryrefslogtreecommitdiffstats
path: root/scripts
diff options
context:
space:
mode:
authornbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>2011-04-05 19:03:51 +0000
committernbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>2011-04-05 19:03:51 +0000
commitdb273bc36e951025393256e94b14310b5ead8da2 (patch)
treee18717be9422173578c83de4eba0e51b4103c94e /scripts
parentf6d755eda4c0e0a068aa8de2504e16ab81a20bc0 (diff)
add a new package metadata variable MDEPENDS for specifying local menuconfig dependencies that do not propagate to other packages
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@26491 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'scripts')
-rwxr-xr-xscripts/metadata.pl1
-rw-r--r--scripts/metadata.pm2
2 files changed, 3 insertions, 0 deletions
diff --git a/scripts/metadata.pl b/scripts/metadata.pl
index 7c60efbf4..9cb846539 100755
--- a/scripts/metadata.pl
+++ b/scripts/metadata.pl
@@ -530,6 +530,7 @@ sub print_package_config_category($) {
print "\t\tdefault $default\n";
}
print mconf_depends($pkg->{name}, $pkg->{depends}, 0);
+ print mconf_depends($pkg->{name}, $pkg->{mdepends}, 0);
print "\t\thelp\n";
print $pkg->{description};
print "\n";
diff --git a/scripts/metadata.pm b/scripts/metadata.pm
index 52ca9895e..6d544c883 100644
--- a/scripts/metadata.pm
+++ b/scripts/metadata.pm
@@ -66,6 +66,7 @@ sub parse_package_metadata($) {
$pkg->{title} = "";
$pkg->{default} = "m if ALL";
$pkg->{depends} = [];
+ $pkg->{mdepends} = [];
$pkg->{builddepends} = [];
$pkg->{buildtypes} = [];
$pkg->{subdir} = $subdir;
@@ -111,6 +112,7 @@ sub parse_package_metadata($) {
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 ];
/^Build-Variant: \s*([\w\-]+)\s*/ and $pkg->{variant} = $1;
/^Build-Only: \s*(.+)\s*$/ and $pkg->{buildonly} = 1;