projects
/
openwrt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
kirkwood: drop PROFILE from image names
[openwrt.git]
/
scripts
/
metadata.pl
diff --git
a/scripts/metadata.pl
b/scripts/metadata.pl
index
f26d8fa
..
ddcf50b
100755
(executable)
--- a/
scripts/metadata.pl
+++ b/
scripts/metadata.pl
@@
-53,6
+53,7
@@
sub parse_target_metadata() {
/^Target-Depends:\s*(.+)\s*$/ and $target->{depends} = [ split(/\s+/, $1) ];
/^Target-Description:/ and $target->{desc} = get_multiline(*FILE);
/^Target-Optimization:\s*(.+)\s*$/ and $target->{cflags} = $1;
/^Target-Depends:\s*(.+)\s*$/ and $target->{depends} = [ split(/\s+/, $1) ];
/^Target-Description:/ and $target->{desc} = get_multiline(*FILE);
/^Target-Optimization:\s*(.+)\s*$/ and $target->{cflags} = $1;
+ /^CPU-Type:\s*(.+)\s*$/ and $target->{cputype} = $1;
/^Linux-Version:\s*(.+)\s*$/ and $target->{version} = $1;
/^Linux-Release:\s*(.+)\s*$/ and $target->{release} = $1;
/^Linux-Kernel-Arch:\s*(.+)\s*$/ and $target->{karch} = $1;
/^Linux-Version:\s*(.+)\s*$/ and $target->{version} = $1;
/^Linux-Release:\s*(.+)\s*$/ and $target->{release} = $1;
/^Linux-Kernel-Arch:\s*(.+)\s*$/ and $target->{karch} = $1;
@@
-177,6
+178,7
@@
sub target_config_features(@) {
/powerpc64/ and $ret .= "\tselect powerpc64\n";
/nommu/ and $ret .= "\tselect NOMMU\n";
/mips16/ and $ret .= "\tselect HAS_MIPS16\n";
/powerpc64/ and $ret .= "\tselect powerpc64\n";
/nommu/ and $ret .= "\tselect NOMMU\n";
/mips16/ and $ret .= "\tselect HAS_MIPS16\n";
+ /rfkill/ and $ret .= "\tselect RFKILL_SUPPORT\n";
}
return $ret;
}
}
return $ret;
}
@@
-371,6
+373,16
@@
EOF
print "\tdefault \"".$target->{cflags}."\" if TARGET_".$target->{conf}."\n";
}
print "\tdefault \"-Os -pipe -funit-at-a-time\"\n";
print "\tdefault \"".$target->{cflags}."\" if TARGET_".$target->{conf}."\n";
}
print "\tdefault \"-Os -pipe -funit-at-a-time\"\n";
+ print <<EOF;
+
+config CPU_TYPE
+ string
+EOF
+ foreach my $target (@target) {
+ next if @{$target->{subtargets}} > 0;
+ print "\tdefault \"".$target->{cputype}."\" if TARGET_".$target->{conf}."\n";
+ }
+ print "\tdefault \"\"\n";
my %kver;
foreach my $target (@target) {
my %kver;
foreach my $target (@target) {
@@
-441,6
+453,7
@@
sub mconf_depends {
my $parent_condition = shift;
$dep or $dep = {};
$seen or $seen = {};
my $parent_condition = shift;
$dep or $dep = {};
$seen or $seen = {};
+ my @t_depends;
$depends or return;
my @depends = @$depends;
$depends or return;
my @depends = @$depends;
@@
-453,6
+466,7
@@
sub mconf_depends {
next if $condition eq $depend;
next if $seen->{"$parent_condition:$depend"};
next if $condition eq $depend;
next if $seen->{"$parent_condition:$depend"};
+ next if $seen->{":$depend"};
$seen->{"$parent_condition:$depend"} = 1;
if ($depend =~ /^(.+):(.+)$/) {
if ($1 ne "PACKAGE_$pkgname") {
$seen->{"$parent_condition:$depend"} = 1;
if ($depend =~ /^(.+):(.+)$/) {
if ($1 ne "PACKAGE_$pkgname") {
@@
-473,7
+487,7
@@
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($pkgname, $package{$depend}->{depends}, 1, $dep, $seen, $condition)
;
+ $package{$depend} and
push @t_depends, [ $package{$depend}->{depends}, $condition ]
;
$m = "select";
next if $only_dep;
$m = "select";
next if $only_dep;
@@
-490,6
+504,11
@@
sub mconf_depends {
}
$dep->{$depend} =~ /select/ or $dep->{$depend} = $m;
}
}
$dep->{$depend} =~ /select/ or $dep->{$depend} = $m;
}
+
+ foreach my $tdep (@t_depends) {
+ mconf_depends($pkgname, $tdep->[0], 1, $dep, $seen, $tdep->[1]);
+ }
+
foreach my $depend (keys %$dep) {
my $m = $dep->{$depend};
$res .= "\t\t$m $depend\n";
foreach my $depend (keys %$dep) {
my $m = $dep->{$depend};
$res .= "\t\t$m $depend\n";
@@
-762,7
+781,7
@@
sub gen_package_mk() {
$idx = $subdir{$dep}.$dep;
}
$idx .= $suffix;
$idx = $subdir{$dep}.$dep;
}
$idx .= $suffix;
- undef $idx if $idx
=~ /^(kernel\/linux)|(base-files)$/
;
+ undef $idx if $idx
eq 'base-files'
;
if ($idx) {
my $depline;
next if $pkg->{src} eq $pkg_dep->{src}.$suffix;
if ($idx) {
my $depline;
next if $pkg->{src} eq $pkg_dep->{src}.$suffix;