build system cleanup/restructuring as described in http://lists.openwrt.org/pipermail...

[openwrt.git] / scripts / metadata.pl

diff --git a/scripts/metadata.pl b/scripts/metadata.pl
index a665361..9b98354 100755 (executable)
--- a/scripts/metadata.pl
+++ b/scripts/metadata.pl
@@ -139,6 +139,7 @@ sub parse_package_metadata() {
 
 sub gen_kconfig_overrides() {
        my %config;
 
 sub gen_kconfig_overrides() {
        my %config;

+       my %kconfig;

        my $package;
        my $pkginfo = shift @ARGV;
        my $cfgfile = shift @ARGV;
        my $package;
        my $pkginfo = shift @ARGV;
        my $cfgfile = shift @ARGV;


@@ -158,19 +159,29 @@ sub gen_kconfig_overrides() {
                        my @config = split /\s+/, $1;
                        foreach my $config (@config) {
                                my $val = 'm';
                        my @config = split /\s+/, $1;
                        foreach my $config (@config) {
                                my $val = 'm';

+                               my $override;

                                if ($config =~ /^(.+?)=(.+)$/) {
                                        $config = $1;
                                if ($config =~ /^(.+?)=(.+)$/) {
                                        $config = $1;

+                                       $override = 1;

                                        $val = $2;
                                }
                                if ($config{"CONFIG_PACKAGE_$package"} and ($config ne 'n')) {
                                        $val = $2;
                                }
                                if ($config{"CONFIG_PACKAGE_$package"} and ($config ne 'n')) {

-                                       print "$config=$val\n";
-                               } else {
-                                       print "# $config is not set\n";
+                                       $kconfig{$config} = $val;
+                               } elsif (!$override) {
+                                       $kconfig{$config} or $kconfig{$config} = 'n';

                                }
                        }
                };
        };
        close FILE;
                                }
                        }
                };
        };
        close FILE;

+
+       foreach my $kconfig (sort keys %kconfig) {
+               if ($kconfig{$kconfig} eq 'n') {
+                       print "# $kconfig is not set\n";
+               } else {
+                       print "$kconfig=$kconfig{$kconfig}\n";
+               }
+       }

 }
 
 sub merge_package_lists($$) {
 }
 
 sub merge_package_lists($$) {


@@ -236,12 +247,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;
 }


@@ -546,7 +556,7 @@ sub gen_package_mk() {
                }
                if ($config) {
                        print "package-$config += $pkg->{subdir}$pkg->{src}\n";
                }
                if ($config) {
                        print "package-$config += $pkg->{subdir}$pkg->{src}\n";

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

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


@@ -566,12 +576,12 @@ sub gen_package_mk() {
                        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->{subdir}."$pkg->{src}-compile: $depline\n";
+                       $line .= "\$(curdir)/".$pkg->{subdir}."$pkg->{src}/compile += $depline\n";

                }
        }
        
                }
        }
        


@@ -594,7 +604,7 @@ $cmds \\
        ) > \$@
        
 ifneq (\$(UCI_PRECONFIG)\$(CONFIG_UCI_PRECONFIG),)
        ) > \$@
        
 ifneq (\$(UCI_PRECONFIG)\$(CONFIG_UCI_PRECONFIG),)

-  preconfig: \$(TARGET_DIR)/etc/uci-defaults/$preconfig
+  package/preconfig: \$(TARGET_DIR)/etc/uci-defaults/$preconfig

 endif
 EOF
        }
 endif
 EOF
        }