image.mk: introduce Image/Build/UbinizeImage make target

[openwrt/openwrt.git] / scripts / metadata.pl

diff --git a/scripts/metadata.pl b/scripts/metadata.pl
index 04fa827c647626efc41b5245ce3190f1475e13e1..e408beb507a695607a100586a2763530d7888853 100755 (executable)
--- a/scripts/metadata.pl
+++ b/scripts/metadata.pl
@@ -75,7 +75,10 @@ sub parse_target_metadata() {
        }
        close FILE;
        foreach my $target (@target) {
-               next if @{$target->{subtargets}} > 0;
+               if (@{$target->{subtargets}} > 0) {
+                       $target->{profiles} = [];
+                       next;
+               }
                @{$target->{profiles}} > 0 or $target->{profiles} = [
                        {
                                id => 'Default',
@@ -158,6 +161,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";
@@ -172,7 +176,6 @@ sub target_config_features(@) {
                /targz/ and $ret .= "\tselect USES_TARGZ\n";
                /cpiogz/ and $ret .= "\tselect USES_CPIOGZ\n";
                /ubifs/ and $ret .= "\tselect USES_UBIFS\n";
-               /fit/ and $ret .= "\tselect USES_FIT\n";
                /fpu/ and $ret .= "\tselect HAS_FPU\n";
                /spe_fpu/ and $ret .= "\tselect HAS_SPE_FPU\n";
                /ramdisk/ and $ret .= "\tselect USES_INITRAMFS\n";
@@ -180,6 +183,8 @@ sub target_config_features(@) {
                /nommu/ and $ret .= "\tselect NOMMU\n";
                /mips16/ and $ret .= "\tselect HAS_MIPS16\n";
                /rfkill/ and $ret .= "\tselect RFKILL_SUPPORT\n";
+               /low_mem/ and $ret .= "\tselect LOW_MEMORY_FOOTPRINT\n";
+               /nand/ and $ret .= "\tselect NAND_SUPPORT\n";
        }
        return $ret;
 }
@@ -499,7 +504,7 @@ sub mconf_depends {
                                        next if $depend eq $condition;
                                        $depend = "$depend if $condition";
                                } else {
-                                       $depend = "!($condition) || $depend";
+                                       $depend = "!($condition) || $depend" unless $dep->{$condition} eq 'select';
                                }
                        }
                }
@@ -674,14 +679,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";
@@ -781,9 +779,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};