some more build system cleanup

[openwrt.git] / scripts / metadata.pl

diff --git a/scripts/metadata.pl b/scripts/metadata.pl
index 4fa7be0..d920f59 100755 (executable)
--- a/scripts/metadata.pl
+++ b/scripts/metadata.pl
@@ -15,6 +15,8 @@ sub confstr($) {
 sub parse_target_metadata() {
        my $file = shift @ARGV;
        my ($target, @target, $profile);
 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;
        open FILE, "<$file" or do {
                warn "Can't open file '$file': $!\n";
                return;


@@ -22,18 +24,26 @@ sub parse_target_metadata() {
        while (<FILE>) {
                chomp;
                /^Target:\s*(.+)\s*$/ and do {
        while (<FILE>) {
                chomp;
                /^Target:\s*(.+)\s*$/ and do {

+                       my $name = $1;

                        $target = {
                        $target = {

-                               id => $1,
-                               conf => confstr($1),
+                               id => $name,
+                               board => $name,
+                               boardconf => confstr($name),
+                               conf => confstr($name),

                                profiles => [],
                                features => [],
                                profiles => [],
                                features => [],

-                               depends => []
+                               depends => [],
+                               subtargets => []

                        };
                        push @target, $target;
                        };
                        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-Kernel:\s*(\d+\.\d+)\s*$/ and $target->{kernel} = $1;
                /^Target-Name:\s*(.+)\s*$/ and $target->{name} = $1;


@@ -62,6 +72,7 @@ sub parse_target_metadata() {
        }
        close FILE;
        foreach my $target (@target) {
        }
        close FILE;
        foreach my $target (@target) {

+               next if @{$target->{subtargets}} > 0;

                @{$target->{profiles}} > 0 or $target->{profiles} = [
                        {
                                id => 'Default',
                @{$target->{profiles}} > 0 or $target->{profiles} = [
                        {
                                id => 'Default',


@@ -140,6 +151,8 @@ sub target_config_features(@) {
 
        while ($_ = shift @_) {
                /broken/ and $ret .= "\tdepends BROKEN\n";
 
        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";
                /pci/ and $ret .= "\tselect PCI_SUPPORT\n";
                /usb/ and $ret .= "\tselect USB_SUPPORT\n";
                /pcmcia/ and $ret .= "\tselect PCMCIA_SUPPORT\n";


@@ -147,51 +160,60 @@ 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";
                /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;
 }
 
        }
        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 gen_target_config() {
-       my @target = parse_target_metadata();
+sub kver($) {
+       my $v = shift;
+       $v =~ tr/\./_/;
+       $v =~ /(\d+_\d+_\d+)(_\d+)?/ and $v = $1;
+       return $v;
+}

 
 

-       @target = sort {
-               $a->{name} cmp $b->{name}
-       } @target;
-       
-       
-       print <<EOF;
-choice
-       prompt "Target System"
-       default TARGET_brcm_2_4
-       reset if !DEVEL
-       
-EOF
+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;
+       }

 
 

-       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;
+       my $v = kver($target->{version});
+       $confstr = <<EOF;

 config TARGET_$target->{conf}
        bool "$target->{name}"
 config TARGET_$target->{conf}
        bool "$target->{name}"

-       select $target->{arch}

        select LINUX_$kernel
        select LINUX_$kernel

+       select LINUX_$v

 EOF
 EOF

-               if ($target->{id} ne $target->{board}) {
-                       print "\tselect TARGET_".$target->{boardconf}."\n";
-               }
+       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;
                foreach my $dep (@{$target->{depends}}) {
                        my $mode = "depends";
                        my $flags;


@@ -203,40 +225,59 @@ EOF
 
                        $flags =~ /-/ and $mode = "deselect";
                        $flags =~ /\+/ and $mode = "select";
 
                        $flags =~ /-/ and $mode = "deselect";
                        $flags =~ /\+/ and $mode = "select";

-                       $flags =~ /@/ and print "\t$mode $name\n";
+                       $flags =~ /@/ and $confstr .= "\t$mode $name\n";

                }
                }

-               
-               print "$features$help\n\n"
+               $confstr .= $features;
+       }
+
+       $confstr .= "$help\n\n";
+       print $confstr;
+}
+
+sub gen_target_config() {
+       my @target = parse_target_metadata();
+
+       my @target_sort = sort {
+               target_name($a) cmp target_name($b);
+       } @target;
+
+
+       print <<EOF;
+choice
+       prompt "Target System"
+       default TARGET_brcm_2_4
+       reset if !DEVEL
+       
+EOF
+
+       foreach my $target (@target_sort) {
+               next if $target->{subtarget};
+               print_target($target);

        }
 
        print <<EOF;
 endchoice
 
        }
 
        print <<EOF;
 endchoice
 

-config TARGET_BOARD
-       string
+choice
+       prompt "Subtarget" if HAS_SUBTARGETS
+

 EOF
        foreach my $target (@target) {
 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
 
 choice
        prompt "Target Profile"
 
 EOF

-       
+

        foreach my $target (@target) {
                my $profiles = $target->{profiles};
        foreach my $target (@target) {
                my $profiles = $target->{profiles};

-               
+

                foreach my $profile (@$profiles) {
                        print <<EOF;
 config TARGET_$target->{conf}_$profile->{id}
                foreach my $profile (@$profiles) {
                        print <<EOF;
 config TARGET_$target->{conf}_$profile->{id}


@@ -253,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;
 }
 
 my %dep_check;


@@ -311,19 +375,19 @@ sub mconf_depends($$) {
                $depend =~ s/^([@\+]+)//;
                my $flags = $1;
                my $vdep;
                $depend =~ s/^([@\+]+)//;
                my $flags = $1;
                my $vdep;

-       
+

                if ($vdep = $package{$depend}->{vdepends}) {
                        $depend = join("||", map { "PACKAGE_".$_ } @$vdep);
                } else {
                        $flags =~ /\+/ and do {
                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 mconf_depends($package{$depend}->{depends}, 1, $dep);
                                # 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 mconf_depends($package{$depend}->{depends}, 1, $dep);

+
+                               $m = "select";
+                               next if $only_dep;

                        };
                        $flags =~ /@/ or $depend = "PACKAGE_$depend";
                }
                        };
                        $flags =~ /@/ or $depend = "PACKAGE_$depend";
                }


@@ -340,12 +404,12 @@ sub print_package_config_category($) {
        my $cat = shift;
        my %menus;
        my %menu_dep;
        my $cat = shift;
        my %menus;
        my %menu_dep;

-       
+

        return unless $category{$cat};
        return unless $category{$cat};

-       
+

        print "menu \"$cat\"\n\n";
        my %spkg = %{$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};
        foreach my $spkg (sort {uc($a) cmp uc($b)} keys %spkg) {
                foreach my $pkg (@{$spkg{$spkg}}) {
                        my $menu = $pkg->{submenu};


@@ -402,7 +466,7 @@ sub print_package_config_category($) {
                }
        }
        print "endmenu\n\n";
                }
        }
        print "endmenu\n\n";

-       
+

        undef $category{$cat};
 }
 
        undef $category{$cat};
 }
 


@@ -431,14 +495,17 @@ EOF
 sub gen_package_mk() {
        my %conf;
        my %dep;
 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 $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};
                next if defined $pkg->{vdepends};

+

                if ($ENV{SDK}) {
                        $conf{$pkg->{src}} or do {
                                $config = 'm';
                if ($ENV{SDK}) {
                        $conf{$pkg->{src}} or do {
                                $config = 'm';


@@ -451,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";
                }
                        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 = "";
                my $hasdeps = 0;
                my $depline = "";

-               foreach my $dep (@{$pkg->{depends}}, @{$pkg->{builddepends}}) {
-                       next if $dep =~ /@/;
-                       $dep =~ s/\+//;
+               foreach my $deps (@srcdeps) {

                        my $idx;
                        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 ($depline) {
                        $line .= "\$(curdir)/".$pkg->{subdir}."$pkg->{src}/compile += $depline\n";
                }
        }

-       
+

        if ($line ne "") {
                print "\n$line";
        }
        if ($line ne "") {
                print "\n$line";
        }