merge r14009, r14010 to 8.09

[openwrt/svn-archive/archive.git] / scripts / metadata.pl

diff --git a/scripts/metadata.pl b/scripts/metadata.pl
index f000e9db9a5877cb04069998698a1d6544cb788a..da29fdd895c26d86cac0f2e4b608886428d46bdc 100755 (executable)
--- a/scripts/metadata.pl
+++ b/scripts/metadata.pl
@@ -398,6 +398,7 @@ sub mconf_depends {
                        $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);
@@ -442,6 +443,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};
@@ -543,6 +545,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";
                }