projects
/
openwrt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[ar71xx] aw-nr580: add support for the PCI slot
[openwrt.git]
/
scripts
/
metadata.pl
diff --git
a/scripts/metadata.pl
b/scripts/metadata.pl
index
da29fdd
..
fa30556
100755
(executable)
--- a/
scripts/metadata.pl
+++ b/
scripts/metadata.pl
@@
-375,7
+375,7
@@
sub mconf_depends {
my $res;
my $dep = shift;
my $seen = shift;
my $res;
my $dep = shift;
my $seen = shift;
- my $condition = shift;
+ my $
parent_
condition = shift;
$dep or $dep = {};
$seen or $seen = {};
$dep or $dep = {};
$seen or $seen = {};
@@
-386,11
+386,12
@@
sub mconf_depends {
$depend =~ s/^([@\+]+)//;
my $flags = $1;
my $vdep;
$depend =~ s/^([@\+]+)//;
my $flags = $1;
my $vdep;
+ my $condition;
if ($depend =~ /^(.+):(.+)$/) {
if ($1 ne "PACKAGE_$pkgname") {
if ($depend =~ /^(.+):(.+)$/) {
if ($1 ne "PACKAGE_$pkgname") {
- if ($condition) {
- $condition = "$condition && $1";
+ if ($
parent_
condition) {
+ $condition = "$
parent_
condition && $1";
} else {
$condition = $1;
}
} else {
$condition = $1;
}
This page took
0.021062 seconds
and
4
git commands to generate.