X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/1026eedd0523c00b0ac1c0f4d999e82b71cc0351..542d043d67e72f8944ceaee7fbd83c7fbb82373e:/scripts/metadata.pl?ds=sidebyside

diff --git a/scripts/metadata.pl b/scripts/metadata.pl
index e86178d42..9cb846539 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";
@@ -529,6 +530,7 @@ sub print_package_config_category($) {
 				print "\t\tdefault $default\n";
 			}
 			print mconf_depends($pkg->{name}, $pkg->{depends}, 0);
+			print mconf_depends($pkg->{name}, $pkg->{mdepends}, 0);
 			print "\t\thelp\n";
 			print $pkg->{description};
 			print "\n";
@@ -737,7 +739,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;