X-Git-Url: http://git.rohieb.name/openwrt.git/blobdiff_plain/59108c061701d2e288d4a533a9bf8f27aa305d2e..2c0ee53d13868ac9fed7dcc05523214546f315bc:/scripts/metadata.pl diff --git a/scripts/metadata.pl b/scripts/metadata.pl index bee302012..7496f33a7 100755 --- a/scripts/metadata.pl +++ b/scripts/metadata.pl @@ -201,12 +201,20 @@ sub print_target($) { } my $v = kver($target->{version}); + if (@{$target->{subtargets}} == 0) { $confstr = <{conf} bool "$target->{name}" select LINUX_$kernel select LINUX_$v EOF + } + else { + $confstr = <{conf} + bool "$target->{name}" +EOF + } if ($target->{subtarget}) { $confstr .= "\tdepends TARGET_$target->{boardconf}\n"; } @@ -223,6 +231,7 @@ EOF $flags = $1; $name = $2; + next if $name =~ /:/; $flags =~ /-/ and $mode = "deselect"; $flags =~ /\+/ and $mode = "select"; $flags =~ /@/ and $confstr .= "\t$mode $name\n"; @@ -236,6 +245,7 @@ EOF sub gen_target_config() { my @target = parse_target_metadata(); + my %defaults; my @target_sort = sort { target_name($a) cmp target_name($b); @@ -289,8 +299,16 @@ EOF my @pkglist = merge_package_lists($target->{packages}, $profile->{packages}); foreach my $pkg (@pkglist) { print "\tselect DEFAULT_$pkg\n"; + $defaults{$pkg} = 1; } - print "\n"; + my $help = $profile->{desc}; + if ($help =~ /\w+/) { + $help =~ s/^\s*/\t /mg; + $help = "\thelp\n$help"; + } else { + undef $help; + } + print "$help\n"; } } @@ -318,6 +336,10 @@ config LINUX_$v bool EOF } + foreach my $def (sort keys %defaults) { + print "\tconfig DEFAULT_".$def."\n"; + print "\t\tbool\n\n"; + } } my %dep_check; @@ -361,12 +383,16 @@ sub package_depends($$) { return $ret; } -sub mconf_depends($$) { +sub mconf_depends { + my $pkgname = shift; my $depends = shift; my $only_dep = shift; my $res; my $dep = shift; + my $seen = shift; + my $parent_condition = shift; $dep or $dep = {}; + $seen or $seen = {}; $depends or return; my @depends = @$depends; @@ -375,7 +401,21 @@ sub mconf_depends($$) { $depend =~ s/^([@\+]+)//; my $flags = $1; my $vdep; - + my $condition; + + if ($depend =~ /^(.+):(.+)$/) { + if ($1 ne "PACKAGE_$pkgname") { + if ($parent_condition) { + $condition = "$parent_condition && $1"; + } else { + $condition = $1; + } + } + $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); } else { @@ -384,12 +424,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. - $package{$depend} and mconf_depends($package{$depend}->{depends}, 1, $dep); + $package{$depend} and mconf_depends($pkgname, $package{$depend}->{depends}, 1, $dep, $seen, $condition); $m = "select"; next if $only_dep; }; $flags =~ /@/ or $depend = "PACKAGE_$depend"; + if ($condition) { + if ($m =~ /select/) { + $depend = "$depend if $condition"; + } else { + $depend = "!($condition) || $depend"; + } + } } $dep->{$depend} =~ /select/ or $dep->{$depend} = $m; } @@ -412,6 +459,7 @@ sub print_package_config_category($) { 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}; @@ -420,8 +468,6 @@ sub print_package_config_category($) { } $menus{$menu} or $menus{$menu} = []; push @{$menus{$menu}}, $pkg; - print "\tconfig DEFAULT_".$pkg->{name}."\n"; - print "\t\tbool\n\n"; } } my @menus = sort { @@ -453,7 +499,7 @@ sub print_package_config_category($) { 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"; @@ -515,6 +561,7 @@ sub gen_package_mk() { $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"; } @@ -532,9 +579,16 @@ sub gen_package_mk() { } my $hasdeps = 0; - my $depline = ""; + my %deplines; foreach my $deps (@srcdeps) { my $idx; + my $condition; + + if ($deps =~ /^(.+):(.+)/) { + $condition = $1; + $deps = $2; + } + my $pkg_dep = $package{$deps}; my @deps; @@ -553,19 +607,35 @@ sub gen_package_mk() { } 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 $dep{$pkg->{src}."->($dep)".$idx}; + next if $dep{$pkg->{src}."->($dep)".$idx} and $pkg_dep->{vdepends}; + my $depstr; + 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 { - $depline .= " \$(curdir)/$idx/compile"; + $depstr = "\$(curdir)/$idx/compile"; $dep{$pkg->{src}."->".$idx} = 1; } + if ($condition) { + if ($condition =~ /^!(.+)/) { + $depline = "\$(if \$(CONFIG_$1),,$depstr)"; + } else { + $depline = "\$(if \$(CONFIG_$condition),$depstr)"; + } + } else { + $depline = $depstr; + } + if ($depline) { + $deplines{$idx.$dep} = $depline; + } } } } + my $depline = join(" ", values %deplines); if ($depline) { $line .= "\$(curdir)/".$pkg->{subdir}."$pkg->{src}/compile += $depline\n"; } @@ -596,6 +666,16 @@ EOF } } +sub gen_package_source() { + parse_package_metadata($ARGV[0]) or exit 1; + foreach my $name (sort {uc($a) cmp uc($b)} keys %package) { + my $pkg = $package{$name}; + if ($pkg->{name} && $pkg->{source}) { + print "$pkg->{name}: "; + print "$pkg->{source}\n"; + } + } +} sub parse_command() { my $cmd = shift @ARGV; @@ -604,13 +684,15 @@ sub parse_command() { /^package_mk$/ and return gen_package_mk(); /^package_config$/ and return gen_package_config(); /^kconfig/ and return gen_kconfig_overrides(); + /^package_source$/ and return gen_package_source(); } print <