projects
/
openwrt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[au1000] refresh patches
[openwrt.git]
/
scripts
/
metadata.pl
diff --git
a/scripts/metadata.pl
b/scripts/metadata.pl
index
50d636a
..
dc6eada
100755
(executable)
--- a/
scripts/metadata.pl
+++ b/
scripts/metadata.pl
@@
-1,4
+1,4
@@
-#!/usr/bin/perl
+#!/usr/bin/
env
perl
use FindBin;
use lib "$FindBin::Bin";
use strict;
use FindBin;
use lib "$FindBin::Bin";
use strict;
@@
-223,6
+223,7
@@
EOF
$flags = $1;
$name = $2;
$flags = $1;
$name = $2;
+ next if $name =~ /:/;
$flags =~ /-/ and $mode = "deselect";
$flags =~ /\+/ and $mode = "select";
$flags =~ /@/ and $confstr .= "\t$mode $name\n";
$flags =~ /-/ and $mode = "deselect";
$flags =~ /\+/ and $mode = "select";
$flags =~ /@/ and $confstr .= "\t$mode $name\n";
@@
-236,6
+237,7
@@
EOF
sub gen_target_config() {
my @target = parse_target_metadata();
sub gen_target_config() {
my @target = parse_target_metadata();
+ my %defaults;
my @target_sort = sort {
target_name($a) cmp target_name($b);
my @target_sort = sort {
target_name($a) cmp target_name($b);
@@
-289,6
+291,7
@@
EOF
my @pkglist = merge_package_lists($target->{packages}, $profile->{packages});
foreach my $pkg (@pkglist) {
print "\tselect DEFAULT_$pkg\n";
my @pkglist = merge_package_lists($target->{packages}, $profile->{packages});
foreach my $pkg (@pkglist) {
print "\tselect DEFAULT_$pkg\n";
+ $defaults{$pkg} = 1;
}
print "\n";
}
}
print "\n";
}
@@
-318,6
+321,10
@@
config LINUX_$v
bool
EOF
}
bool
EOF
}
+ foreach my $def (sort keys %defaults) {
+ print "\tconfig DEFAULT_".$def."\n";
+ print "\t\tbool\n\n";
+ }
}
my %dep_check;
}
my %dep_check;
@@
-366,7
+373,10
@@
sub mconf_depends($$) {
my $only_dep = shift;
my $res;
my $dep = shift;
my $only_dep = shift;
my $res;
my $dep = shift;
+ my $seen = shift;
+ my $condition = shift;
$dep or $dep = {};
$dep or $dep = {};
+ $seen or $seen = {};
$depends or return;
my @depends = @$depends;
$depends or return;
my @depends = @$depends;
@@
-376,20
+386,27
@@
sub mconf_depends($$) {
my $flags = $1;
my $vdep;
my $flags = $1;
my $vdep;
+ if ($depend =~ /^(.+):(.+)$/) {
+ $condition and $condition = "$condition && $1" or $condition = $1;
+ $depend = $2;
+ }
+ next if $seen->{$depend};
+ $seen->{$depend} = 1;
if ($vdep = $package{$depend}->{vdepends}) {
$depend = join("||", map { "PACKAGE_".$_ } @$vdep);
} else {
$flags =~ /\+/ and do {
if ($vdep = $package{$depend}->{vdepends}) {
$depend = join("||", map { "PACKAGE_".$_ } @$vdep);
} else {
$flags =~ /\+/ and do {
- next if $only_dep;
- $m = "select";
-
# Menuconfig will not treat 'select FOO' as a real dependency
# 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.
# Menuconfig will not treat 'select FOO' as a real dependency
# 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);
+ $package{$depend} and mconf_depends($package{$depend}->{depends}, 1, $dep, $seen, $condition);
+
+ $m = "select";
+ next if $only_dep;
};
$flags =~ /@/ or $depend = "PACKAGE_$depend";
};
$flags =~ /@/ or $depend = "PACKAGE_$depend";
+ $condition and ($m =~ /select/ and $depend = "$depend if $condition" or $depend = "!($condition) || $depend");
}
$dep->{$depend} =~ /select/ or $dep->{$depend} = $m;
}
}
$dep->{$depend} =~ /select/ or $dep->{$depend} = $m;
}
@@
-420,8
+437,6
@@
sub print_package_config_category($) {
}
$menus{$menu} or $menus{$menu} = [];
push @{$menus{$menu}}, $pkg;
}
$menus{$menu} or $menus{$menu} = [];
push @{$menus{$menu}}, $pkg;
- print "\tconfig DEFAULT_".$pkg->{name}."\n";
- print "\t\tbool\n\n";
}
}
my @menus = sort {
}
}
my @menus = sort {
@@
-472,7
+487,7
@@
sub print_package_config_category($) {
sub gen_package_config() {
parse_package_metadata($ARGV[0]) or exit 1;
sub gen_package_config() {
parse_package_metadata($ARGV[0]) or exit 1;
- print "menuconfig UCI_PRECONFIG\n\tbool \"Image configuration\"\n";
+ print "menuconfig UCI_PRECONFIG\n\tbool \"Image configuration\"\n"
if %preconfig
;
foreach my $preconfig (keys %preconfig) {
foreach my $cfg (keys %{$preconfig{$preconfig}}) {
my $conf = $preconfig{$preconfig}->{$cfg}->{id};
foreach my $preconfig (keys %preconfig) {
foreach my $cfg (keys %{$preconfig{$preconfig}}) {
my $conf = $preconfig{$preconfig}->{$cfg}->{id};
@@
-502,10
+517,9
@@
sub gen_package_mk() {
foreach my $name (sort {uc($a) cmp uc($b)} keys %package) {
my $config;
my $pkg = $package{$name};
foreach my $name (sort {uc($a) cmp uc($b)} keys %package) {
my $config;
my $pkg = $package{$name};
+ my @srcdeps;
next if defined $pkg->{vdepends};
next if defined $pkg->{vdepends};
- next if $done{$pkg->{src}};
- $done{$pkg->{src}} = 1;
if ($ENV{SDK}) {
$conf{$pkg->{src}} or do {
if ($ENV{SDK}) {
$conf{$pkg->{src}} or do {
@@
-520,12
+534,29
@@
sub gen_package_mk() {
$pkg->{prereq} and print "prereq-$config += $pkg->{subdir}$pkg->{src}\n";
}
$pkg->{prereq} and print "prereq-$config += $pkg->{subdir}$pkg->{src}\n";
}
+ next if $done{$pkg->{src}};
+ $done{$pkg->{src}} = 1;
+
+ foreach my $spkg (@{$srcpackage{$pkg->{src}}}) {
+ foreach my $dep (@{$spkg->{depends}}, @{$spkg->{builddepends}}) {
+ $dep =~ /@/ or do {
+ $dep =~ s/\+//g;
+ push @srcdeps, $dep;
+ };
+ }
+ }
+
my $hasdeps = 0;
my $depline = "";
my $hasdeps = 0;
my $depline = "";
- foreach my $deps (@{$pkg->{depends}}, @{$pkg->{builddepends}}) {
- next if $deps =~ /@/;
- $deps =~ s/\+//;
+ foreach my $deps (@srcdeps) {
my $idx;
my $idx;
+ my $condition;
+
+ if ($deps =~ /^(.+):(.+)/) {
+ $condition = $1;
+ $deps = $2;
+ }
+
my $pkg_dep = $package{$deps};
my @deps;
my $pkg_dep = $package{$deps};
my @deps;
@@
-544,14
+575,27
@@
sub gen_package_mk() {
}
undef $idx if $idx =~ /^(kernel)|(base-files)$/;
if ($idx) {
}
undef $idx if $idx =~ /^(kernel)|(base-files)$/;
if ($idx) {
- next if $dep{$pkg->{src}."->".$idx};
next if $pkg->{src} eq $pkg_dep->{src};
next if $pkg->{src} eq $pkg_dep->{src};
+ next if $dep{$pkg->{src}."->".$idx};
+ next if $dep{$pkg->{src}."->($dep)".$idx};
+ my $depstr;
+
if ($pkg_dep->{vdepends}) {
if ($pkg_dep->{vdepends}) {
- $depline .= " \$(if \$(CONFIG_PACKAGE_$dep),\$(curdir)/$idx/compile)";
+ $depstr = "\$(if \$(CONFIG_PACKAGE_$dep),\$(curdir)/$idx/compile)";
+ $dep{$pkg->{src}."->($dep)".$idx} = 1;
} else {
} else {
- $dep
line .= "
\$(curdir)/$idx/compile";
+ $dep
str = "
\$(curdir)/$idx/compile";
$dep{$pkg->{src}."->".$idx} = 1;
}
$dep{$pkg->{src}."->".$idx} = 1;
}
+ if ($condition) {
+ if ($condition =~ /^!(.+)/) {
+ $depline .= " \$(if \$(CONFIG_$1),,$depstr)";
+ } else {
+ $depline .= " \$(if \$(CONFIG_$condition),$depstr)";
+ }
+ } else {
+ $depline .= " $depstr";
+ }
}
}
}
}
}
}
@@
-597,7
+641,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.026397 seconds
and
4
git commands to generate.