projects
/
openwrt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[package] mac80211: update ath9k patches
[openwrt.git]
/
scripts
/
metadata.pl
diff --git
a/scripts/metadata.pl
b/scripts/metadata.pl
index
cfda693
..
da29fdd
100755
(executable)
--- a/
scripts/metadata.pl
+++ b/
scripts/metadata.pl
@@
-368,7
+368,8
@@
sub package_depends($$) {
return $ret;
}
return $ret;
}
-sub mconf_depends($$) {
+sub mconf_depends {
+ my $pkgname = shift;
my $depends = shift;
my $only_dep = shift;
my $res;
my $depends = shift;
my $only_dep = shift;
my $res;
@@
-387,10
+388,17
@@
sub mconf_depends($$) {
my $vdep;
if ($depend =~ /^(.+):(.+)$/) {
my $vdep;
if ($depend =~ /^(.+):(.+)$/) {
- $condition and $condition = "$condition && $1" or $condition = $1;
+ if ($1 ne "PACKAGE_$pkgname") {
+ if ($condition) {
+ $condition = "$condition && $1";
+ } else {
+ $condition = $1;
+ }
+ }
$depend = $2;
}
next if $seen->{$depend};
$depend = $2;
}
next if $seen->{$depend};
+ next if $package{$depend} and $package{$depend}->{buildonly};
$seen->{$depend} = 1;
if ($vdep = $package{$depend}->{vdepends}) {
$depend = join("||", map { "PACKAGE_".$_ } @$vdep);
$seen->{$depend} = 1;
if ($vdep = $package{$depend}->{vdepends}) {
$depend = join("||", map { "PACKAGE_".$_ } @$vdep);
@@
-400,13
+408,19
@@
sub mconf_depends($$) {
# thus if FOO depends on other config options, these dependencies
# will not be checked. To fix this, we simply emit all of FOO's
# depends here as well.
# thus if FOO depends on other config options, these dependencies
# will not be checked. To fix this, we simply emit all of FOO's
# depends here as well.
- $package{$depend} and mconf_depends($package{$depend}->{depends}, 1, $dep, $seen, $condition);
+ $package{$depend} and mconf_depends($p
kgname, $p
ackage{$depend}->{depends}, 1, $dep, $seen, $condition);
$m = "select";
next if $only_dep;
};
$flags =~ /@/ or $depend = "PACKAGE_$depend";
$m = "select";
next if $only_dep;
};
$flags =~ /@/ or $depend = "PACKAGE_$depend";
- $condition and ($m =~ /select/ and $depend = "$depend if $condition" or $depend = "!($condition) || $depend");
+ if ($condition) {
+ if ($m =~ /select/) {
+ $depend = "$depend if $condition";
+ } else {
+ $depend = "!($condition) || $depend";
+ }
+ }
}
$dep->{$depend} =~ /select/ or $dep->{$depend} = $m;
}
}
$dep->{$depend} =~ /select/ or $dep->{$depend} = $m;
}
@@
-429,6
+443,7
@@
sub print_package_config_category($) {
foreach my $spkg (sort {uc($a) cmp uc($b)} keys %spkg) {
foreach my $pkg (@{$spkg{$spkg}}) {
foreach my $spkg (sort {uc($a) cmp uc($b)} keys %spkg) {
foreach my $pkg (@{$spkg{$spkg}}) {
+ next if $pkg->{buildonly};
my $menu = $pkg->{submenu};
if ($menu) {
$menu_dep{$menu} or $menu_dep{$menu} = $pkg->{submenudep};
my $menu = $pkg->{submenu};
if ($menu) {
$menu_dep{$menu} or $menu_dep{$menu} = $pkg->{submenudep};
@@
-468,7
+483,7
@@
sub print_package_config_category($) {
foreach my $default (split /\s*,\s*/, $pkg->{default}) {
print "\t\tdefault $default\n";
}
foreach my $default (split /\s*,\s*/, $pkg->{default}) {
print "\t\tdefault $default\n";
}
- print mconf_depends($pkg->{depends}, 0);
+ print mconf_depends($pkg->{
name}, $pkg->{
depends}, 0);
print "\t\thelp\n";
print $pkg->{description};
print "\n";
print "\t\thelp\n";
print $pkg->{description};
print "\n";
@@
-530,6
+545,7
@@
sub gen_package_mk() {
$config = "\$(CONFIG_PACKAGE_$name)"
}
if ($config) {
$config = "\$(CONFIG_PACKAGE_$name)"
}
if ($config) {
+ $pkg->{buildonly} and $config = "";
print "package-$config += $pkg->{subdir}$pkg->{src}\n";
$pkg->{prereq} and print "prereq-$config += $pkg->{subdir}$pkg->{src}\n";
}
print "package-$config += $pkg->{subdir}$pkg->{src}\n";
$pkg->{prereq} and print "prereq-$config += $pkg->{subdir}$pkg->{src}\n";
}
@@
-547,7
+563,7
@@
sub gen_package_mk() {
}
my $hasdeps = 0;
}
my $hasdeps = 0;
- my
$depline = ""
;
+ my
%deplines
;
foreach my $deps (@srcdeps) {
my $idx;
my $condition;
foreach my $deps (@srcdeps) {
my $idx;
my $condition;
@@
-575,9
+591,10
@@
sub gen_package_mk() {
}
undef $idx if $idx =~ /^(kernel)|(base-files)$/;
if ($idx) {
}
undef $idx if $idx =~ /^(kernel)|(base-files)$/;
if ($idx) {
+ my $depline;
next if $pkg->{src} eq $pkg_dep->{src};
next if $dep{$pkg->{src}."->".$idx};
next if $pkg->{src} eq $pkg_dep->{src};
next if $dep{$pkg->{src}."->".$idx};
- next if $dep{$pkg->{src}."->($dep)".$idx};
+ next if $dep{$pkg->{src}."->($dep)".$idx}
and $pkg_dep->{vdepends}
;
my $depstr;
if ($pkg_dep->{vdepends}) {
my $depstr;
if ($pkg_dep->{vdepends}) {
@@
-589,16
+606,20
@@
sub gen_package_mk() {
}
if ($condition) {
if ($condition =~ /^!(.+)/) {
}
if ($condition) {
if ($condition =~ /^!(.+)/) {
- $depline
.= "
\$(if \$(CONFIG_$1),,$depstr)";
+ $depline
= "
\$(if \$(CONFIG_$1),,$depstr)";
} else {
} else {
- $depline
.= "
\$(if \$(CONFIG_$condition),$depstr)";
+ $depline
= "
\$(if \$(CONFIG_$condition),$depstr)";
}
} else {
}
} else {
- $depline .= " $depstr";
+ $depline = $depstr;
+ }
+ if ($depline) {
+ $deplines{$idx.$dep} = $depline;
}
}
}
}
}
}
}
}
+ my $depline = join(" ", values %deplines);
if ($depline) {
$line .= "\$(curdir)/".$pkg->{subdir}."$pkg->{src}/compile += $depline\n";
}
if ($depline) {
$line .= "\$(curdir)/".$pkg->{subdir}."$pkg->{src}/compile += $depline\n";
}
@@
-641,7
+662,7
@@
sub parse_command() {
print <<EOF
Available Commands:
$0 target_config [file] Target metadata in Kconfig format
print <<EOF
Available Commands:
$0 target_config [file] Target metadata in Kconfig format
- $0 package_mk [file] Package metadata in makefile format
+ $0 package_mk [file]
Package metadata in makefile format
$0 package_config [file] Package metadata in Kconfig format
$0 kconfig [file] [config] Kernel config overrides
$0 package_config [file] Package metadata in Kconfig format
$0 kconfig [file] [config] Kernel config overrides
This page took
0.031324 seconds
and
4
git commands to generate.
projects / openwrt.git / blobdiff