X-Git-Url: http://git.openwrt.org/?p=openwrt%2Fopenwrt.git;a=blobdiff_plain;f=scripts%2Fmetadata.pl;h=f3d04dba2dd7e0d433bedc3ee4e8eda03557124d;hp=ddcf50bf32a3b9a1e0ab4770b4a97443787e109e;hb=50f9d27da8266c9c9e612574a73684758aae5507;hpb=e0189ccef433f01304b97f89ffd52d1c3b48498b

diff --git a/scripts/metadata.pl b/scripts/metadata.pl
index ddcf50bf32..f3d04dba2d 100755
--- 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";
@@ -179,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;
 }
@@ -498,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';
 				}
 			}
 		}
@@ -516,6 +522,18 @@ sub mconf_depends {
 	return $res;
 }
 
+sub mconf_conflicts {
+	my $pkgname = shift;
+	my $depends = shift;
+	my $res = "";
+
+	foreach my $depend (@$depends) {
+		next unless $package{$depend};
+		$res .= "\t\tdepends on m || (PACKAGE_$depend != y)\n";
+	}
+	return $res;
+}
+
 sub print_package_config_category($) {
 	my $cat = shift;
 	my %menus;
@@ -577,6 +595,7 @@ sub print_package_config_category($) {
 			}
 			print mconf_depends($pkg->{name}, $pkg->{depends}, 0);
 			print mconf_depends($pkg->{name}, $pkg->{mdepends}, 0);
+			print mconf_conflicts($pkg->{name}, $pkg->{conflicts});
 			print "\t\thelp\n";
 			print $pkg->{description};
 			print "\n";
@@ -673,19 +692,12 @@ 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";
 			if ($pkg->{variant}) {
-				if (!defined($done{$pkg->{src}})) {
+				if (!defined($done{$pkg->{src}}) or $pkg->{variant_default}) {
 					print "\$(curdir)/$pkg->{subdir}$pkg->{src}/default-variant := $pkg->{variant}\n";
 				}
 				print "\$(curdir)/$pkg->{subdir}$pkg->{src}/variants += \$(if $config,$pkg->{variant})\n"
@@ -780,9 +792,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};
@@ -848,6 +861,38 @@ sub gen_package_source() {
 	}
 }
 
+sub gen_package_feeds() {
+	parse_package_metadata($ARGV[0]) or exit 1;
+	foreach my $name (sort {uc($a) cmp uc($b)} keys %package) {
+		my $pkg = $package{$name};
+		if ($pkg->{name} && $pkg->{feed}) {
+			print "Package/$name/feed = $pkg->{feed}\n";
+		}
+	}
+}
+
+sub gen_package_license($) {
+	my $level = shift;
+	parse_package_metadata($ARGV[0]) or exit 1;
+	foreach my $name (sort {uc($a) cmp uc($b)} keys %package) {
+		my $pkg = $package{$name};
+		if ($pkg->{name}) {
+			if ($pkg->{license}) {
+				print "$pkg->{name}: ";
+				print "$pkg->{license}\n";
+				if ($pkg->{licensefiles} && $level == 0) {
+					print "\tFiles: $pkg->{licensefiles}\n";
+				}
+			} else {
+				if ($level == 1) {
+					print "$pkg->{name}: Missing license! ";
+					print "Please fix $pkg->{makefile}\n";
+				}
+			}
+		}
+	}
+}
+
 sub parse_command() {
 	my $cmd = shift @ARGV;
 	for ($cmd) {
@@ -856,6 +901,9 @@ sub parse_command() {
 		/^package_config$/ and return gen_package_config();
 		/^kconfig/ and return gen_kconfig_overrides();
 		/^package_source$/ and return gen_package_source();
+		/^package_feeds$/ and return gen_package_feeds();
+		/^package_license$/ and return gen_package_license(0);
+		/^package_licensefull$/ and return gen_package_license(1);
 	}
 	print <<EOF
 Available Commands:
@@ -864,6 +912,9 @@ Available Commands:
 	$0 package_config [file] 	Package metadata in Kconfig format
 	$0 kconfig [file] [config]	Kernel config overrides
 	$0 package_source [file] 	Package source file information
+	$0 package_feeds [file]		Package feed information in makefile format
+	$0 package_license [file] 	Package license information
+	$0 package_licensefull [file] 	Package license information (full list)
 
 EOF
 }