scripts/metadata.pl: fix ignoring missing host dependencies

[openwrt/svn-archive/archive.git] / scripts / metadata.pl

diff --git a/scripts/metadata.pl b/scripts/metadata.pl
index 498456ea4d5ee7f85282b46e4f7b1b9a4cdf16ad..f075525e1dadea8256844edede19a3a0f12afc22 100755 (executable)
--- a/scripts/metadata.pl
+++ b/scripts/metadata.pl
@@ -53,6 +53,7 @@ sub parse_target_metadata() {
                /^Target-Depends:\s*(.+)\s*$/ and $target->{depends} = [ split(/\s+/, $1) ];
                /^Target-Description:/ and $target->{desc} = get_multiline(*FILE);
                /^Target-Optimization:\s*(.+)\s*$/ and $target->{cflags} = $1;
+               /^CPU-Type:\s*(.+)\s*$/ and $target->{cputype} = $1;
                /^Linux-Version:\s*(.+)\s*$/ and $target->{version} = $1;
                /^Linux-Release:\s*(.+)\s*$/ and $target->{release} = $1;
                /^Linux-Kernel-Arch:\s*(.+)\s*$/ and $target->{karch} = $1;
@@ -157,6 +158,7 @@ sub target_config_features(@) {
                /broken/ and $ret .= "\tdepends on BROKEN\n";
                /audio/ and $ret .= "\tselect AUDIO_SUPPORT\n";
                /display/ and $ret .= "\tselect DISPLAY_SUPPORT\n";
+               /dt/ and $ret .= "\tselect USES_DEVICETREE\n";
                /gpio/ and $ret .= "\tselect GPIO_SUPPORT\n";
                /pci/ and $ret .= "\tselect PCI_SUPPORT\n";
                /pcie/ and $ret .= "\tselect PCIE_SUPPORT\n";
@@ -372,6 +374,16 @@ EOF
                print "\tdefault \"".$target->{cflags}."\" if TARGET_".$target->{conf}."\n";
        }
        print "\tdefault \"-Os -pipe -funit-at-a-time\"\n";
+       print <<EOF;
+
+config CPU_TYPE
+       string
+EOF
+       foreach my $target (@target) {
+               next if @{$target->{subtargets}} > 0;
+               print "\tdefault \"".$target->{cputype}."\" if TARGET_".$target->{conf}."\n";
+       }
+       print "\tdefault \"\"\n";
 
        my %kver;
        foreach my $target (@target) {
@@ -662,14 +674,7 @@ sub gen_package_mk() {
 
                next if defined $pkg->{vdepends};
 
-               if ($ENV{SDK}) {
-                       $conf{$pkg->{src}} or do {
-                               $config = 'm';
-                               $conf{$pkg->{src}} = 1;
-                       };
-               } else {
-                       $config = "\$(CONFIG_PACKAGE_$name)"
-               }
+               $config = "\$(CONFIG_PACKAGE_$name)";
                if ($config) {
                        $pkg->{buildonly} and $config = "";
                        print "package-$config += $pkg->{subdir}$pkg->{src}\n";
@@ -769,9 +774,10 @@ sub gen_package_mk() {
                                } elsif (defined($srcpackage{$dep})) {
                                        $idx = $subdir{$dep}.$dep;
                                }
-                               $idx .= $suffix;
                                undef $idx if $idx eq 'base-files';
                                if ($idx) {
+                                       $idx .= $suffix;
+
                                        my $depline;
                                        next if $pkg->{src} eq $pkg_dep->{src}.$suffix;
                                        next if $dep{$condition.":".$pkg->{src}."->".$idx};