[ar71xx] tew-632brp: increase the size of rootfs partition, and build one unified...

[openwrt.git] / scripts / metadata.pl

diff --git a/scripts/metadata.pl b/scripts/metadata.pl
index da29fdd..7496f33 100755 (executable)
--- a/scripts/metadata.pl
+++ b/scripts/metadata.pl
@@ -201,12 +201,20 @@ sub print_target($) {
        }
 
        my $v = kver($target->{version});
        }
 
        my $v = kver($target->{version});

+       if (@{$target->{subtargets}} == 0) {

        $confstr = <<EOF;
 config TARGET_$target->{conf}
        bool "$target->{name}"
        select LINUX_$kernel
        select LINUX_$v
 EOF
        $confstr = <<EOF;
 config TARGET_$target->{conf}
        bool "$target->{name}"
        select LINUX_$kernel
        select LINUX_$v
 EOF

+       }
+       else {
+               $confstr = <<EOF;
+config TARGET_$target->{conf}
+       bool "$target->{name}"
+EOF
+       }

        if ($target->{subtarget}) {
                $confstr .= "\tdepends TARGET_$target->{boardconf}\n";
        }
        if ($target->{subtarget}) {
                $confstr .= "\tdepends TARGET_$target->{boardconf}\n";
        }


@@ -293,7 +301,14 @@ EOF
                                print "\tselect DEFAULT_$pkg\n";
                                $defaults{$pkg} = 1;
                        }
                                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";

                }
        }
 
                }
        }
 


@@ -375,7 +390,7 @@ sub mconf_depends {
        my $res;
        my $dep = shift;
        my $seen = shift;
        my $res;
        my $dep = shift;
        my $seen = shift;

-       my $condition = shift;
+       my $parent_condition = shift;

        $dep or $dep = {};
        $seen or $seen = {};
 
        $dep or $dep = {};
        $seen or $seen = {};
 


@@ -386,11 +401,12 @@ sub mconf_depends {
                $depend =~ s/^([@\+]+)//;
                my $flags = $1;
                my $vdep;
                $depend =~ s/^([@\+]+)//;
                my $flags = $1;
                my $vdep;

+               my $condition;

 
                if ($depend =~ /^(.+):(.+)$/) {
                        if ($1 ne "PACKAGE_$pkgname") {
 
                if ($depend =~ /^(.+):(.+)$/) {
                        if ($1 ne "PACKAGE_$pkgname") {

-                               if ($condition) {
-                                       $condition = "$condition && $1";
+                               if ($parent_condition) {
+                                       $condition = "$parent_condition && $1";

                                } else {
                                        $condition = $1;
                                }
                                } else {
                                        $condition = $1;
                                }


@@ -650,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;
 
 sub parse_command() {
        my $cmd = shift @ARGV;


@@ -658,6 +684,7 @@ sub parse_command() {
                /^package_mk$/ and return gen_package_mk();
                /^package_config$/ and return gen_package_config();
                /^kconfig/ and return gen_kconfig_overrides();
                /^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 <<EOF
 Available Commands:
        }
        print <<EOF
 Available Commands:


@@ -665,6 +692,7 @@ Available Commands:
        $0 package_mk [file]            Package metadata in makefile format
        $0 package_config [file]        Package metadata in Kconfig format
        $0 kconfig [file] [config]      Kernel config overrides
        $0 package_mk [file]            Package metadata in makefile format
        $0 package_config [file]        Package metadata in Kconfig format
        $0 kconfig [file] [config]      Kernel config overrides

+       $0 package_source [file]        Package source file information

 
 EOF
 }
 
 EOF
 }