X-Git-Url: http://git.rohieb.name/openwrt.git/blobdiff_plain/ab6e4426b0223ddb405fbda66653c7642ffba1d2..70df49d54155019d53d864cd7341e97681afbc2e:/scripts/metadata.pl

diff --git a/scripts/metadata.pl b/scripts/metadata.pl
index 2e9025727..7c60efbf4 100755
--- a/scripts/metadata.pl
+++ b/scripts/metadata.pl
@@ -163,11 +163,12 @@ sub target_config_features(@) {
 		/pcmcia/ and $ret .= "\tselect PCMCIA_SUPPORT\n";
 		/squashfs/ and $ret .= "\tselect USES_SQUASHFS\n";
 		/jffs2/ and $ret .= "\tselect USES_JFFS2\n";
-		/ext2/ and $ret .= "\tselect USES_EXT2\n";
+		/ext4/ and $ret .= "\tselect USES_EXT4\n";
 		/targz/ and $ret .= "\tselect USES_TARGZ\n";
 		/cpiogz/ and $ret .= "\tselect USES_CPIOGZ\n";
 		/ubifs/ and $ret .= "\tselect USES_UBIFS\n";
 		/fpu/ and $ret .= "\tselect HAS_FPU\n";
+		/spe_fpu/ and $ret .= "\tselect HAS_SPE_FPU\n";
 		/ramdisk/ and $ret .= "\tselect USES_INITRAMFS\n";
 		/powerpc64/ and $ret .= "\tselect powerpc64\n";
 		/nommu/ and $ret .= "\tselect NOMMU\n";
@@ -196,9 +197,7 @@ sub print_target($) {
 	my $target = shift;
 	my $features = target_config_features(@{$target->{features}});
 	my $help = $target->{desc};
-	my $kernel = $target->{kernel};
 	my $confstr;
-	$kernel =~ tr/./_/;
 
 	chomp $features;
 	$features .= "\n";
@@ -214,7 +213,6 @@ sub print_target($) {
 	$confstr = <<EOF;
 config TARGET_$target->{conf}
 	bool "$target->{name}"
-	select LINUX_$kernel
 	select LINUX_$v
 EOF
 	}
@@ -640,6 +638,9 @@ sub gen_package_mk() {
 			$pkg->{buildonly} and $config = "";
 			print "package-$config += $pkg->{subdir}$pkg->{src}\n";
 			if ($pkg->{variant}) {
+				if (!defined($done{$pkg->{src}})) {
+					print "\$(curdir)/$pkg->{subdir}$pkg->{src}/default-variant := $pkg->{variant}\n";
+				}
 				print "\$(curdir)/$pkg->{subdir}$pkg->{src}/variants += \$(if $config,$pkg->{variant})\n"
 			}
 			$pkg->{prereq} and print "prereq-$config += $pkg->{subdir}$pkg->{src}\n";
@@ -737,7 +738,7 @@ sub gen_package_mk() {
 				if ($idx) {
 					my $depline;
 					next if $pkg->{src} eq $pkg_dep->{src}.$suffix;
-					next if $dep{$pkg->{src}."->".$idx};
+					next if $dep{$condition.":".$pkg->{src}."->".$idx};
 					next if $dep{$pkg->{src}."->($dep)".$idx} and $pkg_dep->{vdepends};
 					my $depstr;