X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/31800c29b03fe4268985b9761b4ccdabfad7a041..d9f49b62b28ebd245587854efa484974d90debbf:/scripts/metadata.pl?ds=inline

diff --git a/scripts/metadata.pl b/scripts/metadata.pl
index 9c10f9554..dc6eada12 100755
--- a/scripts/metadata.pl
+++ b/scripts/metadata.pl
@@ -237,6 +237,7 @@ EOF
 
 sub gen_target_config() {
 	my @target = parse_target_metadata();
+	my %defaults;
 
 	my @target_sort = sort {
 		target_name($a) cmp target_name($b);
@@ -290,6 +291,7 @@ EOF
 			my @pkglist = merge_package_lists($target->{packages}, $profile->{packages});
 			foreach my $pkg (@pkglist) {
 				print "\tselect DEFAULT_$pkg\n";
+				$defaults{$pkg} = 1;
 			}
 			print "\n";
 		}
@@ -319,6 +321,10 @@ config LINUX_$v
 	bool
 EOF
 	}
+	foreach my $def (sort keys %defaults) {
+		print "\tconfig DEFAULT_".$def."\n";
+		print "\t\tbool\n\n";
+	}
 }
 
 my %dep_check;
@@ -368,6 +374,7 @@ sub mconf_depends($$) {
 	my $res;
 	my $dep = shift;
 	my $seen = shift;
+	my $condition = shift;
 	$dep or $dep = {};
 	$seen or $seen = {};
 
@@ -377,11 +384,10 @@ sub mconf_depends($$) {
 		my $m = "depends";
 		$depend =~ s/^([@\+]+)//;
 		my $flags = $1;
-		my $condition;
 		my $vdep;
 
 		if ($depend =~ /^(.+):(.+)$/) {
-			$condition = $1;
+			$condition and $condition = "$condition && $1" or $condition = $1;
 			$depend = $2;
 		}
 		next if $seen->{$depend};
@@ -394,13 +400,13 @@ sub mconf_depends($$) {
 				# thus if FOO depends on other config options, these dependencies
 				# will not be checked. To fix this, we simply emit all of FOO's
 				# depends here as well.
-				$package{$depend} and mconf_depends($package{$depend}->{depends}, 1, $dep, $seen);
+				$package{$depend} and mconf_depends($package{$depend}->{depends}, 1, $dep, $seen, $condition);
 
 				$m = "select";
 				next if $only_dep;
 			};
 			$flags =~ /@/ or $depend = "PACKAGE_$depend";
-			$condition and $depend = "$depend if $condition";
+			$condition and ($m =~ /select/ and $depend = "$depend if $condition" or $depend = "!($condition) || $depend");
 		}
 		$dep->{$depend} =~ /select/ or $dep->{$depend} = $m;
 	}
@@ -431,8 +437,6 @@ sub print_package_config_category($) {
 			}
 			$menus{$menu} or $menus{$menu} = [];
 			push @{$menus{$menu}}, $pkg;
-			print "\tconfig DEFAULT_".$pkg->{name}."\n";
-			print "\t\tbool\n\n";
 		}
 	}
 	my @menus = sort {
@@ -584,7 +588,11 @@ sub gen_package_mk() {
 						$dep{$pkg->{src}."->".$idx} = 1;
 					}
 					if ($condition) {
-						$depline .= " \$(if \$(CONFIG_$condition),$depstr)";
+						if ($condition =~ /^!(.+)/) {
+							$depline .= " \$(if \$(CONFIG_$1),,$depstr)";
+						} else {
+							$depline .= " \$(if \$(CONFIG_$condition),$depstr)";
+						}
 					} else {
 						$depline .= " $depstr";
 					}
@@ -633,7 +641,7 @@ sub parse_command() {
 	print <<EOF
 Available Commands:
 	$0 target_config [file] 	Target metadata in Kconfig format
-	$0 package_mk [file]    	Package metadata in makefile format
+	$0 package_mk [file]		Package metadata in makefile format
 	$0 package_config [file] 	Package metadata in Kconfig format
 	$0 kconfig [file] [config]	Kernel config overrides