aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@openwrt.org>2009-11-05 01:24:30 +0000
committerFelix Fietkau <nbd@openwrt.org>2009-11-05 01:24:30 +0000
commitea63b88b10642bdc482650db389dcc75880495db (patch)
tree22f108f33c8f598d45ad0151c5bdb90ac09d0916
parent94249f3c936f2fd74a47d47ef6aab7c2155ff27d (diff)
downloadupstream-ea63b88b10642bdc482650db389dcc75880495db.tar.gz
upstream-ea63b88b10642bdc482650db389dcc75880495db.tar.bz2
upstream-ea63b88b10642bdc482650db389dcc75880495db.zip
metadata: process dependencies for targets that have subtargets as well - hides the ramips target unless the user has requested to play with broken packages/targets (related to #6051)
SVN-Revision: 18306
-rwxr-xr-xscripts/metadata.pl33
1 files changed, 17 insertions, 16 deletions
diff --git a/scripts/metadata.pl b/scripts/metadata.pl
index 2da8851171..ca00fcae6d 100755
--- a/scripts/metadata.pl
+++ b/scripts/metadata.pl
@@ -225,25 +225,26 @@ EOF
}
if (@{$target->{subtargets}} > 0) {
$confstr .= "\tselect HAS_SUBTARGETS\n";
- } else {
+ }
+
+ if ($target->{arch} =~ /\w/) {
$confstr .= "\tselect $target->{arch}\n";
- foreach my $dep (@{$target->{depends}}) {
- my $mode = "depends";
- my $flags;
- my $name;
-
- $dep =~ /^([@\+\-]+)(.+)$/;
- $flags = $1;
- $name = $2;
-
- next if $name =~ /:/;
- $flags =~ /-/ and $mode = "deselect";
- $flags =~ /\+/ and $mode = "select";
- $flags =~ /@/ and $confstr .= "\t$mode $name\n";
- }
- $confstr .= $features;
}
+ foreach my $dep (@{$target->{depends}}) {
+ my $mode = "depends";
+ my $flags;
+ my $name;
+
+ $dep =~ /^([@\+\-]+)(.+)$/;
+ $flags = $1;
+ $name = $2;
+ next if $name =~ /:/;
+ $flags =~ /-/ and $mode = "deselect";
+ $flags =~ /\+/ and $mode = "select";
+ $flags =~ /@/ and $confstr .= "\t$mode $name\n";
+ }
+ $confstr .= $features;
$confstr .= "$help\n\n";
print $confstr;
}