Fix bridge-utils configuration failure (#3931), thanks sn9
[openwrt.git] / scripts / metadata.pl
index f3d6e9d..ce80924 100755 (executable)
@@ -15,6 +15,8 @@ sub confstr($) {
 sub parse_target_metadata() {
        my $file = shift @ARGV;
        my ($target, @target, $profile);
+       my %target;
+
        open FILE, "<$file" or do {
                warn "Can't open file '$file': $!\n";
                return;
@@ -22,22 +24,33 @@ sub parse_target_metadata() {
        while (<FILE>) {
                chomp;
                /^Target:\s*(.+)\s*$/ and do {
+                       my $name = $1;
                        $target = {
-                               id => $1,
-                               conf => confstr($1),
-                               profiles => []
+                               id => $name,
+                               board => $name,
+                               boardconf => confstr($name),
+                               conf => confstr($name),
+                               profiles => [],
+                               features => [],
+                               depends => [],
+                               subtargets => []
                        };
                        push @target, $target;
-               };
-               /^Target-Board:\s*(.+)\s*$/ and do {
-                       $target->{board} = $1;
-                       $target->{boardconf} = confstr($1);
+                       $target{$name} = $target;
+                       if ($name =~ /([^\/]+)\/([^\/]+)/) {
+                               push @{$target{$1}->{subtargets}}, $2;
+                               $target->{board} = $1;
+                               $target->{boardconf} = confstr($1);
+                               $target->{subtarget} = 1;
+                               $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;
                /^Target-Features:\s*(.+)\s*$/ and $target->{features} = [ split(/\s+/, $1) ];
+               /^Target-Depends:\s*(.+)\s*$/ and $target->{depends} = [ split(/\s+/, $1) ];
                /^Target-Description:/ and $target->{desc} = get_multiline(*FILE);
                /^Linux-Version:\s*(.+)\s*$/ and $target->{version} = $1;
                /^Linux-Release:\s*(.+)\s*$/ and $target->{release} = $1;
@@ -59,6 +72,7 @@ sub parse_target_metadata() {
        }
        close FILE;
        foreach my $target (@target) {
+               next if @{$target->{subtargets}} > 0;
                @{$target->{profiles}} > 0 or $target->{profiles} = [
                        {
                                id => 'Default',
@@ -137,6 +151,8 @@ sub target_config_features(@) {
 
        while ($_ = shift @_) {
                /broken/ and $ret .= "\tdepends BROKEN\n";
+               /display/ and $ret .= "\tselect DISPLAY_SUPPORT\n";
+               /gpio/ and $ret .= "\tselect GPIO_SUPPORT\n";
                /pci/ and $ret .= "\tselect PCI_SUPPORT\n";
                /usb/ and $ret .= "\tselect USB_SUPPORT\n";
                /pcmcia/ and $ret .= "\tselect PCMCIA_SUPPORT\n";
@@ -144,19 +160,88 @@ sub target_config_features(@) {
                /jffs2/ and $ret .= "\tselect USES_JFFS2\n";
                /ext2/ and $ret .= "\tselect USES_EXT2\n";
                /tgz/ and $ret .= "\tselect USES_TGZ\n";
+               /cpiogz/ and $ret .= "\tselect USES_CPIOGZ\n";
+               /fpu/ and $ret .= "\tselect HAS_FPU\n";
        }
        return $ret;
 }
 
+sub target_name($) {
+       my $target = shift;
+       my $parent = $target->{parent};
+       if ($parent) {
+               return $target->{parent}->{name}." - ".$target->{name};
+       } else {
+               return $target->{name};
+       }
+}
+
+sub kver($) {
+       my $v = shift;
+       $v =~ tr/\./_/;
+       $v =~ /(\d+_\d+_\d+)(_\d+)?/ and $v = $1;
+       return $v;
+}
+
+sub print_target($) {
+       my $target = shift;
+       my $features = target_config_features(@{$target->{features}});
+       my $help = $target->{desc};
+       my $kernel = $target->{kernel};
+       my $confstr;
+       $kernel =~ tr/./_/;
+
+       chomp $features;
+       $features .= "\n";
+       if ($help =~ /\w+/) {
+               $help =~ s/^\s*/\t  /mg;
+               $help = "\thelp\n$help";
+       } else {
+               undef $help;
+       }
+
+       my $v = kver($target->{version});
+       $confstr = <<EOF;
+config TARGET_$target->{conf}
+       bool "$target->{name}"
+       select LINUX_$kernel
+       select LINUX_$v
+EOF
+       if ($target->{subtarget}) {
+               $confstr .= "\tdepends TARGET_$target->{boardconf}\n";
+       }
+       if (@{$target->{subtargets}} > 0) {
+               $confstr .= "\tselect HAS_SUBTARGETS\n";
+       } else {
+               $confstr .= "\tselect $target->{arch}\n";
+               foreach my $dep (@{$target->{depends}}) {
+                       my $mode = "depends";
+                       my $flags;
+                       my $name;
+
+                       $dep =~ /^([@\+\-]+)(.+)$/;
+                       $flags = $1;
+                       $name = $2;
+
+                       $flags =~ /-/ and $mode = "deselect";
+                       $flags =~ /\+/ and $mode = "select";
+                       $flags =~ /@/ and $confstr .= "\t$mode $name\n";
+               }
+               $confstr .= $features;
+       }
+
+       $confstr .= "$help\n\n";
+       print $confstr;
+}
 
 sub gen_target_config() {
        my @target = parse_target_metadata();
 
-       @target = sort {
-               $a->{name} cmp $b->{name}
+       my @target_sort = sort {
+               target_name($a) cmp target_name($b);
        } @target;
-       
-       
+
+
        print <<EOF;
 choice
        prompt "Target System"
@@ -165,61 +250,34 @@ choice
        
 EOF
 
-       foreach my $target (@target) {
-               my $features = target_config_features(@{$target->{features}});
-               my $help = $target->{desc};
-               my $kernel = $target->{kernel};
-               $kernel =~ tr/./_/;
-
-               chomp $features;
-               $features .= "\n";
-               if ($help =~ /\w+/) {
-                       $help =~ s/^\s*/\t  /mg;
-                       $help = "\thelp\n$help";
-               } else {
-                       undef $help;
-               }
-       
-               print <<EOF;
-config TARGET_$target->{conf}
-       bool "$target->{name}"
-       select $target->{arch}
-       select LINUX_$kernel
-EOF
-               if ($target->{id} ne $target->{board}) {
-                       print "\tselect TARGET_".$target->{boardconf}."\n";
-               }
-               print "$features$help\n\n"
+       foreach my $target (@target_sort) {
+               next if $target->{subtarget};
+               print_target($target);
        }
 
        print <<EOF;
 endchoice
 
-config TARGET_BOARD
-       string
+choice
+       prompt "Subtarget" if HAS_SUBTARGETS
+
 EOF
        foreach my $target (@target) {
-               print "\t\tdefault \"".$target->{board}."\" if TARGET_".$target->{conf}."\n";
+               next unless $target->{subtarget};
+               print_target($target);
        }
 
-       # add hidden target config options 
-       foreach my $target (@target) {
-               next if $board{$target->{board}};
-               if ($target->{id} ne $target->{board}) {
-                       print "\nconfig TARGET_".$target->{boardconf}."\n\tbool\n";
-                       $board{$target->{board}} = 1;
-               }
-       }
-       print <<EOF;
+print <<EOF;
+endchoice
 
 choice
        prompt "Target Profile"
 
 EOF
-       
+
        foreach my $target (@target) {
                my $profiles = $target->{profiles};
-               
+
                foreach my $profile (@$profiles) {
                        print <<EOF;
 config TARGET_$target->{conf}_$profile->{id}
@@ -236,7 +294,30 @@ EOF
                }
        }
 
-       print "endchoice\n";
+       print <<EOF;
+endchoice
+
+config HAS_SUBTARGETS
+       bool
+
+config TARGET_BOARD
+       string
+
+EOF
+       foreach my $target (@target) {
+               $target->{subtarget} or print "\t\tdefault \"".$target->{board}."\" if TARGET_".$target->{conf}."\n";
+       }
+
+       my %kver;
+       foreach my $target (@target) {
+               my $v = kver($target->{version});
+               next if $kver{$v};
+               $kver{$v} = 1;
+               print <<EOF;
+config LINUX_$v
+       bool
+EOF
+       }
 }
 
 my %dep_check;
@@ -284,6 +365,8 @@ sub mconf_depends($$) {
        my $depends = shift;
        my $only_dep = shift;
        my $res;
+       my $dep = shift;
+       $dep or $dep = {};
 
        $depends or return;
        my @depends = @$depends;
@@ -292,22 +375,26 @@ sub mconf_depends($$) {
                $depend =~ s/^([@\+]+)//;
                my $flags = $1;
                my $vdep;
-       
+
                if ($vdep = $package{$depend}->{vdepends}) {
                        $depend = join("||", map { "PACKAGE_".$_ } @$vdep);
                } else {
                        $flags =~ /\+/ and do {
-                               next if $only_dep;
-                               $m = "select";
-
                                # Menuconfig will not treat 'select FOO' as a real dependency
                                # 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 $res .= mconf_depends($package{$depend}->{depends}, 1);
+                               $package{$depend} and mconf_depends($package{$depend}->{depends}, 1, $dep);
+
+                               $m = "select";
+                               next if $only_dep;
                        };
                        $flags =~ /@/ or $depend = "PACKAGE_$depend";
                }
+               $dep->{$depend} =~ /select/ or $dep->{$depend} = $m;
+       }
+       foreach my $depend (keys %$dep) {
+               my $m = $dep->{$depend};
                $res .= "\t\t$m $depend\n";
        }
        return $res;
@@ -317,12 +404,12 @@ sub print_package_config_category($) {
        my $cat = shift;
        my %menus;
        my %menu_dep;
-       
+
        return unless $category{$cat};
-       
+
        print "menu \"$cat\"\n\n";
        my %spkg = %{$category{$cat}};
-       
+
        foreach my $spkg (sort {uc($a) cmp uc($b)} keys %spkg) {
                foreach my $pkg (@{$spkg{$spkg}}) {
                        my $menu = $pkg->{submenu};
@@ -361,7 +448,7 @@ sub print_package_config_category($) {
                        print "\t";
                        $pkg->{menu} and print "menu";
                        print "config PACKAGE_".$pkg->{name}."\n";
-                       print "\t\ttristate \"$title\"\n";
+                       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";
@@ -379,13 +466,13 @@ sub print_package_config_category($) {
                }
        }
        print "endmenu\n\n";
-       
+
        undef $category{$cat};
 }
 
 sub gen_package_config() {
        parse_package_metadata($ARGV[0]) or exit 1;
-       print "menuconfig UCI_PRECONFIG\n\tbool \"Image configuration\"\n";
+       print "menuconfig UCI_PRECONFIG\n\tbool \"Image configuration\"\n" if %preconfig;
        foreach my $preconfig (keys %preconfig) {
                foreach my $cfg (keys %{$preconfig{$preconfig}}) {
                        my $conf = $preconfig{$preconfig}->{$cfg}->{id};
@@ -408,14 +495,17 @@ EOF
 sub gen_package_mk() {
        my %conf;
        my %dep;
+       my %done;
        my $line;
 
        parse_package_metadata($ARGV[0]) or exit 1;
        foreach my $name (sort {uc($a) cmp uc($b)} keys %package) {
                my $config;
                my $pkg = $package{$name};
-               
+               my @srcdeps;
+
                next if defined $pkg->{vdepends};
+
                if ($ENV{SDK}) {
                        $conf{$pkg->{src}} or do {
                                $config = 'm';
@@ -428,33 +518,59 @@ sub gen_package_mk() {
                        print "package-$config += $pkg->{subdir}$pkg->{src}\n";
                        $pkg->{prereq} and print "prereq-$config += $pkg->{subdir}$pkg->{src}\n";
                }
-       
+
+               next if $done{$pkg->{src}};
+               $done{$pkg->{src}} = 1;
+
+               foreach my $spkg (@{$srcpackage{$pkg->{src}}}) {
+                       foreach my $dep (@{$spkg->{depends}}, @{$spkg->{builddepends}}) {
+                               $dep =~ /@/ or do {
+                                       $dep =~ s/\+//g;
+                                       push @srcdeps, $dep;
+                               };
+                       }
+               }
+
                my $hasdeps = 0;
                my $depline = "";
-               foreach my $dep (@{$pkg->{depends}}, @{$pkg->{builddepends}}) {
-                       next if $dep =~ /@/;
-                       $dep =~ s/\+//;
+               foreach my $deps (@srcdeps) {
                        my $idx;
-                       my $pkg_dep = $package{$dep};
-                       next if defined $pkg_dep->{vdepends};
+                       my $pkg_dep = $package{$deps};
+                       my @deps;
 
-                       if (defined $pkg_dep->{src}) {
-                               ($pkg->{src} ne $pkg_dep->{src}) and $idx = $pkg_dep->{subdir}.$pkg_dep->{src};
-                       } elsif (defined($srcpackage{$dep})) {
-                               $idx = $subdir{$dep}.$dep;
+                       if ($pkg_dep->{vdepends}) {
+                               @deps = @{$pkg_dep->{vdepends}};
+                       } else {
+                               @deps = ($deps);
                        }
-                       undef $idx if $idx =~ /^(kernel)|(base-files)$/;
-                       if ($idx) {
-                               next if $dep{$pkg->{src}."->".$idx};
-                               $depline .= " \$(curdir)/$idx/compile";
-                               $dep{$pkg->{src}."->".$idx} = 1;
+
+                       foreach my $dep (@deps) {
+                               $pkg_dep = $package{$deps};
+                               if (defined $pkg_dep->{src}) {
+                                       ($pkg->{src} ne $pkg_dep->{src}) and $idx = $pkg_dep->{subdir}.$pkg_dep->{src};
+                               } elsif (defined($srcpackage{$dep})) {
+                                       $idx = $subdir{$dep}.$dep;
+                               }
+                               undef $idx if $idx =~ /^(kernel)|(base-files)$/;
+                               if ($idx) {
+                                       next if $pkg->{src} eq $pkg_dep->{src};
+                                       next if $dep{$pkg->{src}."->".$idx};
+                                       next if $dep{$pkg->{src}."->($dep)".$idx};
+                                       if ($pkg_dep->{vdepends}) {
+                                               $depline .= " \$(if \$(CONFIG_PACKAGE_$dep),\$(curdir)/$idx/compile)";
+                                               $dep{$pkg->{src}."->($dep)".$idx} = 1;
+                                       } else {
+                                               $depline .= " \$(curdir)/$idx/compile";
+                                               $dep{$pkg->{src}."->".$idx} = 1;
+                                       }
+                               }
                        }
                }
                if ($depline) {
                        $line .= "\$(curdir)/".$pkg->{subdir}."$pkg->{src}/compile += $depline\n";
                }
        }
-       
+
        if ($line ne "") {
                print "\n$line";
        }
This page took 0.037668 seconds and 4 git commands to generate.