revert [8907] and rename kmod-soundcore and kmod-ipip modules in 7.09 as well

[openwrt.git] / scripts / metadata.pl

diff --git a/scripts/metadata.pl b/scripts/metadata.pl
index 2527915..695abf7 100755 (executable)
--- a/scripts/metadata.pl
+++ b/scripts/metadata.pl
@@ -4,6 +4,8 @@ my %preconfig;
 my %package;
 my %srcpackage;
 my %category;
 my %package;
 my %srcpackage;
 my %category;

+my %subdir;
+my %board;

 
 sub get_multiline {
        my $prefix = shift;
 
 sub get_multiline {
        my $prefix = shift;


@@ -17,22 +19,29 @@ sub get_multiline {
        return $str;
 }
 
        return $str;
 }
 

+sub confstr($) {
+       my $conf = shift;
+       $conf =~ tr#/\.\-/#___#;
+       return $conf;
+}
+

 sub parse_target_metadata() {
        my ($target, @target, $profile);        
        while (<>) {
                chomp;
 sub parse_target_metadata() {
        my ($target, @target, $profile);        
        while (<>) {
                chomp;

-               /^Target:\s*((.+)-(\d+\.\d+))\s*$/ and do {
-                       my $conf = uc $3.'_'.$2;
-                       $conf =~ tr/\.-/__/;
+               /^Target:\s*(.+)\s*$/ and do {

                        $target = {
                                id => $1,
                        $target = {
                                id => $1,

-                               conf => $conf,
-                               board => $2,
-                               kernel => $3,
+                               conf => confstr($1),

                                profiles => []
                        };
                        push @target, $target;
                };
                                profiles => []
                        };
                        push @target, $target;
                };

+               /^Target-Board:\s*(.+)\s*$/ and do {
+                       $target->{board} = $1;
+                       $target->{boardconf} = confstr($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-Name:\s*(.+)\s*$/ and $target->{name} = $1;
                /^Target-Path:\s*(.+)\s*$/ and $target->{path} = $1;
                /^Target-Arch:\s*(.+)\s*$/ and $target->{arch} = $1;


@@ -72,12 +81,16 @@ sub parse_package_metadata() {
        my $pkg;
        my $makefile;
        my $preconfig;
        my $pkg;
        my $makefile;
        my $preconfig;

+       my $subdir;

        my $src;
        while (<>) {
                chomp;
        my $src;
        while (<>) {
                chomp;

-               /^Source-Makefile: \s*(.+\/([^\/]+)\/Makefile)\s*$/ and do {
+               /^Source-Makefile: \s*((.+\/)([^\/]+)\/Makefile)\s*$/ and do {

                        $makefile = $1;
                        $makefile = $1;

-                       $src = $2;
+                       $subdir = $2;
+                       $src = $3;
+                       $subdir =~ s/^package\///;
+                       $subdir{$src} = $subdir;

                        $srcpackage{$src} = [];
                        undef $pkg;
                };
                        $srcpackage{$src} = [];
                        undef $pkg;
                };


@@ -89,6 +102,7 @@ sub parse_package_metadata() {
                        $pkg->{default} = "m if ALL";
                        $pkg->{depends} = [];
                        $pkg->{builddepends} = [];
                        $pkg->{default} = "m if ALL";
                        $pkg->{depends} = [];
                        $pkg->{builddepends} = [];

+                       $pkg->{subdir} = $subdir;

                        $package{$1} = $pkg;
                        push @{$srcpackage{$src}}, $pkg;
                };
                        $package{$1} = $pkg;
                        push @{$srcpackage{$src}}, $pkg;
                };


@@ -131,46 +145,66 @@ sub parse_package_metadata() {
        return %category;
 }
 
        return %category;
 }
 

+sub gen_kconfig_overrides() {
+       my %config;
+       my %kconfig;
+       my $package;
+       my $pkginfo = shift @ARGV;
+       my $cfgfile = shift @ARGV;
+
+       # parameter 2: build system config
+       open FILE, "<$cfgfile" or return;
+       while (<FILE>) {
+               /^(CONFIG_.+?)=(.+)$/ and $config{$1} = 1;
+       }
+       close FILE;
+
+       # parameter 1: package metadata
+       open FILE, "<$pkginfo" or return;
+       while (<FILE>) {
+               /^Package:\s*(.+?)\s*$/ and $package = $1;
+               /^Kernel-Config:\s*(.+?)\s*$/ and do {
+                       my @config = split /\s+/, $1;
+                       foreach my $config (@config) {
+                               my $val = 'm';
+                               my $override;
+                               if ($config =~ /^(.+?)=(.+)$/) {
+                                       $config = $1;
+                                       $override = 1;
+                                       $val = $2;
+                               }
+                               if ($config{"CONFIG_PACKAGE_$package"} and ($config ne 'n')) {
+                                       $kconfig{$config} = $val;
+                               } elsif (!$override) {
+                                       $kconfig{$config} or $kconfig{$config} = 'n';
+                               }
+                       }
+               };
+       };
+       close FILE;

 
 

-sub gen_target_mk() {
-       my @target = parse_target_metadata();
-       
-       @target = sort {
-               $a->{id} cmp $b->{id}
-       } @target;
-       
-       foreach my $target (@target) {
-               my ($profiles_def, $profiles_eval);
-               my $conf = uc $target->{kernel}.'_'.$target->{board};
-               $conf =~ tr/\.-/__/;
-               
-               foreach my $profile (@{$target->{profiles}}) {
-                       $profiles_def .= "
-  define Profile/$conf\_$profile->{id}
-    ID:=$profile->{id}
-    NAME:=$profile->{name}
-    PACKAGES:=".join(" ", @{$profile->{packages}})."\n";
-                       $profile->{kconfig} and $profiles_def .= "    KCONFIG:=1\n";
-                       $profiles_def .= "  endef";
-                       $profiles_eval .= "
-\$(eval \$(call AddProfile,$conf\_$profile->{id}))"
+       foreach my $kconfig (sort keys %kconfig) {
+               if ($kconfig{$kconfig} eq 'n') {
+                       print "# $kconfig is not set\n";
+               } else {
+                       print "$kconfig=$kconfig{$kconfig}\n";

                }
                }

-               print "
-ifeq (\$(CONFIG_LINUX_$conf),y)
-  define Target
-    KERNEL:=$target->{kernel}
-    BOARD:=$target->{board}
-    BOARDNAME:=$target->{name}
-    LINUX_VERSION:=$target->{version}
-    LINUX_RELEASE:=$target->{release}
-    LINUX_KARCH:=$target->{karch}
-    DEFAULT_PACKAGES:=".join(" ", @{$target->{packages}})."
-  endef$profiles_def
-endif$profiles_eval
-
-"

        }
        }

-       print "\$(eval \$(call Target))\n";
+}
+
+sub merge_package_lists($$) {
+       my $list1 = shift;
+       my $list2 = shift;
+       my @l = ();
+       my %pkgs;
+
+       foreach my $pkg (@$list1, @$list2) {
+               $pkgs{$pkg} = 1;
+       }
+       foreach my $pkg (keys %pkgs) {
+               push @l, $pkg unless ($pkg =~ /^-/ or $pkgs{"-$pkg"});
+       }
+       return sort(@l);

 }
 
 sub target_config_features(@) {
 }
 
 sub target_config_features(@) {


@@ -180,12 +214,11 @@ sub target_config_features(@) {
                /broken/ and $ret .= "\tdepends BROKEN\n";
                /pci/ and $ret .= "\tselect PCI_SUPPORT\n";
                /usb/ and $ret .= "\tselect USB_SUPPORT\n";
                /broken/ and $ret .= "\tdepends BROKEN\n";
                /pci/ and $ret .= "\tselect PCI_SUPPORT\n";
                /usb/ and $ret .= "\tselect USB_SUPPORT\n";

-               /atm/ and $ret .= "\tselect ATM_SUPPORT\n";

                /pcmcia/ and $ret .= "\tselect PCMCIA_SUPPORT\n";
                /pcmcia/ and $ret .= "\tselect PCMCIA_SUPPORT\n";

-               /video/ and $ret .= "\tselect VIDEO_SUPPORT\n";

                /squashfs/ and $ret .= "\tselect USES_SQUASHFS\n";
                /jffs2/ and $ret .= "\tselect USES_JFFS2\n";
                /ext2/ and $ret .= "\tselect USES_EXT2\n";
                /squashfs/ and $ret .= "\tselect USES_SQUASHFS\n";
                /jffs2/ and $ret .= "\tselect USES_JFFS2\n";
                /ext2/ and $ret .= "\tselect USES_EXT2\n";

+               /tgz/ and $ret .= "\tselect USES_TGZ\n";

        }
        return $ret;
 }
        }
        return $ret;
 }


@@ -202,7 +235,7 @@ sub gen_target_config() {
        print <<EOF;
 choice
        prompt "Target System"
        print <<EOF;
 choice
        prompt "Target System"

-       default LINUX_2_4_BRCM
+       default TARGET_brcm_2_4

        reset if !DEVEL
        
 EOF
        reset if !DEVEL
        
 EOF


@@ -222,70 +255,37 @@ EOF
                        undef $help;
                }
        
                        undef $help;
                }
        

-               print <<EOF
-config LINUX_$target->{conf}
+               print <<EOF;
+config TARGET_$target->{conf}

        bool "$target->{name}"
        select $target->{arch}
        select LINUX_$kernel
        bool "$target->{name}"
        select $target->{arch}
        select LINUX_$kernel

-$features$help
-

 EOF
 EOF

+               if ($target->{id} ne $target->{board}) {
+                       print "\tselect TARGET_".$target->{boardconf}."\n";
+               }
+               print "$features$help\n\n"

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

-if DEVEL
-
-config LINUX_2_6_ARM
-       bool "UNSUPPORTED little-endian arm platform"
-       depends BROKEN
-       select LINUX_2_6
-       select arm
-
-config LINUX_2_6_CRIS
-       bool "UNSUPPORTED cris platform"
-       depends BROKEN
-       select LINUX_2_6
-       select cris
-
-config LINUX_2_6_M68K
-       bool "UNSUPPORTED m68k platform"
-       depends BROKEN
-       select LINUX_2_6
-       select m68k
-
-config LINUX_2_6_SH3
-       bool "UNSUPPORTED little-endian sh3 platform"
-       depends BROKEN
-       select LINUX_2_6
-       select sh3
-
-config LINUX_2_6_SH3EB
-       bool "UNSUPPORTED big-endian sh3 platform"
-       depends BROKEN
-       select LINUX_2_6
-       select sh3eb
-
-config LINUX_2_6_SH4
-       bool "UNSUPPORTED little-endian sh4 platform"
-       depends BROKEN
-       select LINUX_2_6
-       select sh4
-
-config LINUX_2_6_SH4EB
-       bool "UNSUPPORTED big-endian sh4 platform"
-       depends BROKEN
-       select LINUX_2_6
-       select sh4eb
-
-config LINUX_2_6_SPARC
-       bool "UNSUPPORTED sparc platform"
-       depends BROKEN
-       select LINUX_2_6
-       select sparc
+endchoice

 
 

-endif
+config TARGET_BOARD
+       string
+EOF
+       foreach my $target (@target) {
+               print "\t\tdefault \"".$target->{board}."\" if TARGET_".$target->{conf}."\n";
+       }

 
 

-endchoice
+       # 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;

 
 choice
        prompt "Target Profile"
 
 choice
        prompt "Target Profile"


@@ -297,18 +297,15 @@ EOF
                
                foreach my $profile (@$profiles) {
                        print <<EOF;
                
                foreach my $profile (@$profiles) {
                        print <<EOF;

-config LINUX_$target->{conf}_$profile->{id}
+config TARGET_$target->{conf}_$profile->{id}

        bool "$profile->{name}"
        bool "$profile->{name}"

-       depends LINUX_$target->{conf}
+       depends TARGET_$target->{conf}

 $profile->{config}
 EOF
                        $profile->{kconfig} and print "\tselect PROFILE_KCONFIG\n";
 $profile->{config}
 EOF
                        $profile->{kconfig} and print "\tselect PROFILE_KCONFIG\n";

-                       my %pkgs;
-                       foreach my $pkg (@{$target->{packages}}, @{$profile->{packages}}) {
-                               $pkgs{$pkg} = 1;
-                       }
-                       foreach my $pkg (keys %pkgs) {
-                               print "\tselect DEFAULT_$pkg\n" unless ($pkg =~ /^-/ or $pkgs{"-$pkg"});
+                       my @pkglist = merge_package_lists($target->{packages}, $profile->{packages});
+                       foreach my $pkg (@pkglist) {
+                               print "\tselect DEFAULT_$pkg\n";

                        }
                        print "\n";
                }
                        }
                        print "\n";
                }


@@ -317,6 +314,7 @@ EOF
        print "endchoice\n";
 }
 
        print "endchoice\n";
 }
 

+

 sub find_package_dep($$) {
        my $pkg = shift;
        my $name = shift;
 sub find_package_dep($$) {
        my $pkg = shift;
        my $name = shift;


@@ -451,22 +449,20 @@ sub print_package_config_category($) {
 
 sub gen_package_config() {
        parse_package_metadata();
 
 sub gen_package_config() {
        parse_package_metadata();

-       print "menu \"Image configuration\"\n";
+       print "menuconfig UCI_PRECONFIG\n\tbool \"Image configuration\"\n";

        foreach my $preconfig (keys %preconfig) {
        foreach my $preconfig (keys %preconfig) {

-               print "\tcomment \"$preconfig\"\n";

                foreach my $cfg (@{$preconfig{$preconfig}}) {
                        my $conf = $cfg->{id};
                        $conf =~ tr/\.-/__/;
                        print <<EOF
        config UCI_PRECONFIG_$conf
                foreach my $cfg (@{$preconfig{$preconfig}}) {
                        my $conf = $cfg->{id};
                        $conf =~ tr/\.-/__/;
                        print <<EOF
        config UCI_PRECONFIG_$conf

-               string "$cfg->{label}"
+               string "$cfg->{label}" if UCI_PRECONFIG

                depends PACKAGE_$preconfig
                default "$cfg->{default}"
 
 EOF
                }
        }
                depends PACKAGE_$preconfig
                default "$cfg->{default}"
 
 EOF
                }
        }

-       print "endmenu\n\n";

        print_package_config_category 'Base system';
        foreach my $cat (keys %category) {
                print_package_config_category $cat;
        print_package_config_category 'Base system';
        foreach my $cat (keys %category) {
                print_package_config_category $cat;


@@ -493,8 +489,8 @@ sub gen_package_mk() {
                        $config = "\$(CONFIG_PACKAGE_$name)"
                }
                if ($config) {
                        $config = "\$(CONFIG_PACKAGE_$name)"
                }
                if ($config) {

-                       print "package-$config += $pkg->{src}\n";
-                       $pkg->{prereq} and print "prereq-$config += $pkg->{src}\n";
+                       print "package-$config += $pkg->{subdir}$pkg->{src}\n";
+                       $pkg->{prereq} and print "prereq-$config += $pkg->{subdir}$pkg->{src}\n";

                }
        
                my $hasdeps = 0;
                }
        
                my $hasdeps = 0;


@@ -504,24 +500,22 @@ sub gen_package_mk() {
                        $dep =~ s/\+//;
                        my $idx;
                        my $pkg_dep = $package{$dep};
                        $dep =~ s/\+//;
                        my $idx;
                        my $pkg_dep = $package{$dep};

-                       $pkg_dep or $pkg_dep = $srcpackage{$dep}->[0];
-                       next unless defined $pkg_dep;

                        next if defined $pkg_dep->{vdepends};
 
                        if (defined $pkg_dep->{src}) {
                        next if defined $pkg_dep->{vdepends};
 
                        if (defined $pkg_dep->{src}) {

-                               ($pkg->{src} ne $pkg_dep->{src}) and $idx = $pkg_dep->{src};
-                       } elsif (defined($pkg_dep) && !defined($ENV{SDK})) {
-                               $idx = $dep;
+                               ($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 $dep{$pkg->{src}."->".$idx};
                        }
                        undef $idx if $idx =~ /^(kernel)|(base-files)$/;
                        if ($idx) {
                                next if $dep{$pkg->{src}."->".$idx};

-                               $depline .= " $idx\-compile";
+                               $depline .= " \$(curdir)/$idx/compile";

                                $dep{$pkg->{src}."->".$idx} = 1;
                        }
                }
                if ($depline) {
                                $dep{$pkg->{src}."->".$idx} = 1;
                        }
                }
                if ($depline) {

-                       $line .= "$pkg->{src}-compile: $depline\n";
+                       $line .= "\$(curdir)/".$pkg->{subdir}."$pkg->{src}/compile += $depline\n";

                }
        }
        
                }
        }
        


@@ -542,8 +536,10 @@ sub gen_package_mk() {
        ( \\
 $cmds \\
        ) > \$@
        ( \\
 $cmds \\
        ) > \$@

-
-preconfig: \$(TARGET_DIR)/etc/uci-defaults/$preconfig
+       
+ifneq (\$(UCI_PRECONFIG)\$(CONFIG_UCI_PRECONFIG),)
+  package/preconfig: \$(TARGET_DIR)/etc/uci-defaults/$preconfig
+endif

 EOF
        }
 }
 EOF
        }
 }


@@ -552,17 +548,18 @@ EOF
 sub parse_command() {
        my $cmd = shift @ARGV;
        for ($cmd) {
 sub parse_command() {
        my $cmd = shift @ARGV;
        for ($cmd) {

-               /^target_mk$/ and return gen_target_mk();

                /^target_config$/ and return gen_target_config();
                /^package_mk$/ and return gen_package_mk();
                /^package_config$/ and return gen_package_config();
                /^target_config$/ and return gen_target_config();
                /^package_mk$/ and return gen_package_mk();
                /^package_config$/ and return gen_package_config();

+               /^kconfig/ and return gen_kconfig_overrides();

        }
        print <<EOF
 Available Commands:
        }
        print <<EOF
 Available Commands:

-       $0 target_mk [file]             Target metadata in makefile format

        $0 target_config [file]         Target metadata in Kconfig format
        $0 target_config [file]         Target metadata in Kconfig format

-       $0 package_mk [file]            Package metadata in makefile format
+       $0 package_mk [file]            Package metadata in makefile format

        $0 package_config [file]        Package metadata in Kconfig format
        $0 package_config [file]        Package metadata in Kconfig format

+       $0 kconfig [file] [config]      Kernel config overrides
+

 EOF
 }
 
 EOF
 }