X-Git-Url: http://git.archive.openwrt.org/?a=blobdiff_plain;f=scripts%2Fmetadata.pl;h=28ddefcd9c92c99ea2aaf5f4ab1110c130e77e7e;hb=e84c4d5b0a0a116bcd66cc154d35c7e9ad8ac2d8;hp=f26d8fa5e5db6cfb104f5f2ac29150d9b050bd4d;hpb=2df2035f9515cb779c56f1a31d20884fd8cfdf3f;p=15.05%2Fopenwrt.git

diff --git a/scripts/metadata.pl b/scripts/metadata.pl
index f26d8fa5e5..28ddefcd9c 100755
--- a/scripts/metadata.pl
+++ b/scripts/metadata.pl
@@ -177,6 +177,7 @@ sub target_config_features(@) {
 		/powerpc64/ and $ret .= "\tselect powerpc64\n";
 		/nommu/ and $ret .= "\tselect NOMMU\n";
 		/mips16/ and $ret .= "\tselect HAS_MIPS16\n";
+		/rfkill/ and $ret .= "\tselect RFKILL_SUPPORT\n";
 	}
 	return $ret;
 }
@@ -453,6 +454,7 @@ sub mconf_depends {
 
 		next if $condition eq $depend;
 		next if $seen->{"$parent_condition:$depend"};
+		next if $seen->{":$depend"};
 		$seen->{"$parent_condition:$depend"} = 1;
 		if ($depend =~ /^(.+):(.+)$/) {
 			if ($1 ne "PACKAGE_$pkgname") {
@@ -762,7 +764,7 @@ sub gen_package_mk() {
 					$idx = $subdir{$dep}.$dep;
 				}
 				$idx .= $suffix;
-				undef $idx if $idx =~ /^(kernel\/linux)|(base-files)$/;
+				undef $idx if $idx eq 'base-files';
 				if ($idx) {
 					my $depline;
 					next if $pkg->{src} eq $pkg_dep->{src}.$suffix;