X-Git-Url: https://git.enpas.org/?a=blobdiff_plain;f=scripts%2Fmetadata.pl;h=f075525e1dadea8256844edede19a3a0f12afc22;hb=33dc8138952b6f8ac0f90d778bb015b0cc7effe2;hp=ddcf50bf32a3b9a1e0ab4770b4a97443787e109e;hpb=4511c244aab731c598d9d6ddbd214db14da535a0;p=openwrt.git

diff --git a/scripts/metadata.pl b/scripts/metadata.pl
index ddcf50bf32..f075525e1d 100755
--- a/scripts/metadata.pl
+++ b/scripts/metadata.pl
@@ -158,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";
@@ -673,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";
@@ -780,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};