X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/89a10d913b8e4cf2d42a32ab9101c19197d48967..51f0f920a86889afc951135cf7421131a7496202:/scripts/metadata.pl?ds=sidebyside diff --git a/scripts/metadata.pl b/scripts/metadata.pl index 9f06299aa..0f4ae9fe0 100755 --- a/scripts/metadata.pl +++ b/scripts/metadata.pl @@ -45,7 +45,6 @@ sub parse_target_metadata() { $target->{parent} = $target{$1}; } }; - /^Target-Kernel:\s*(\d+\.\d+)\s*$/ and $target->{kernel} = $1; /^Target-Name:\s*(.+)\s*$/ and $target->{name} = $1; /^Target-Path:\s*(.+)\s*$/ and $target->{path} = $1; /^Target-Arch:\s*(.+)\s*$/ and $target->{arch} = $1; @@ -57,6 +56,7 @@ sub parse_target_metadata() { /^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; + /^Default-Subtarget:\s*(.+)\s*$/ and $target->{def_subtarget} = $1; /^Default-Packages:\s*(.+)\s*$/ and $target->{packages} = [ split(/\s+/, $1) ]; /^Target-Profile:\s*(.+)\s*$/ and do { $profile = { @@ -189,7 +189,11 @@ sub target_name($) { sub kver($) { my $v = shift; $v =~ tr/\./_/; - $v =~ /(\d+_\d+_\d+)(_\d+)?/ and $v = $1; + if (substr($v,0,2) eq "2_") { + $v =~ /(\d+_\d+_\d+)(_\d+)?/ and $v = $1; + } else { + $v =~ /(\d+_\d+)(_\d+)?/ and $v = $1; + } return $v; } @@ -227,6 +231,8 @@ EOF } if (@{$target->{subtargets}} > 0) { $confstr .= "\tselect HAS_SUBTARGETS\n"; + } else { + $confstr .= $features; } if ($target->{arch} =~ /\w/) { @@ -246,7 +252,6 @@ EOF $flags =~ /\+/ and $mode = "select"; $flags =~ /@/ and $confstr .= "\t$mode $name\n"; } - $confstr .= $features; $confstr .= "$help\n\n"; print $confstr; } @@ -278,6 +283,14 @@ endchoice choice prompt "Subtarget" if HAS_SUBTARGETS +EOF + foreach my $target (@target) { + next unless $target->{def_subtarget}; + print <{conf}_$target->{def_subtarget} if TARGET_$target->{conf} +EOF + } + print < 0) { $title .= ("." x $c). " ". $pkg->{title}; } + $title = "\"$title\""; print "\t"; $pkg->{menu} and print "menu"; print "config PACKAGE_".$pkg->{name}."\n"; - print "\t\t".($pkg->{tristate} ? 'tristate' : 'bool')." \"$title\"\n"; + $pkg->{hidden} and $title = ""; + print "\t\t".($pkg->{tristate} ? 'tristate' : 'bool')." $title\n"; print "\t\tdefault y if DEFAULT_".$pkg->{name}."\n"; foreach my $default (split /\s*,\s*/, $pkg->{default}) { print "\t\tdefault $default\n"; } print mconf_depends($pkg->{name}, $pkg->{depends}, 0); + print mconf_depends($pkg->{name}, $pkg->{mdepends}, 0); print "\t\thelp\n"; print $pkg->{description}; print "\n"; @@ -691,10 +707,10 @@ sub gen_package_mk() { my $depstr = "\$(curdir)/$idx$suffix/compile"; my $depline = get_conditional_dep($condition, $depstr); if ($depline) { - $deplines{$dep} = $depline; + $deplines{$depline}++; } } - my $depline = join(" ", values %deplines); + my $depline = join(" ", sort keys %deplines); if ($depline) { $line .= "\$(curdir)/".$pkg->{subdir}."$pkg->{src}/$type/compile += $depline\n"; } @@ -738,7 +754,7 @@ sub gen_package_mk() { if ($idx) { my $depline; next if $pkg->{src} eq $pkg_dep->{src}.$suffix; - next if $dep{$pkg->{src}."->".$idx}; + next if $dep{$condition.":".$pkg->{src}."->".$idx}; next if $dep{$pkg->{src}."->($dep)".$idx} and $pkg_dep->{vdepends}; my $depstr; @@ -751,12 +767,12 @@ sub gen_package_mk() { } $depline = get_conditional_dep($condition, $depstr); if ($depline) { - $deplines{$idx.$dep} = $depline; + $deplines{$depline}++; } } } } - my $depline = join(" ", values %deplines); + my $depline = join(" ", sort keys %deplines); if ($depline) { $line .= "\$(curdir)/".$pkg->{subdir}."$pkg->{src}/compile += $depline\n"; }