X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/7e8f0bc28dcf77eb881b9455332da32027f2b228..6bdf3c928948b7a7d213544213ff394daad37e14:/scripts/metadata.pl

diff --git a/scripts/metadata.pl b/scripts/metadata.pl
index e05cc92c4..54ac06390 100755
--- a/scripts/metadata.pl
+++ b/scripts/metadata.pl
@@ -52,6 +52,7 @@ sub parse_target_metadata() {
 		/^Target-Features:\s*(.+)\s*$/ and $target->{features} = [ split(/\s+/, $1) ];
 		/^Target-Depends:\s*(.+)\s*$/ and $target->{depends} = [ split(/\s+/, $1) ];
 		/^Target-Description:/ and $target->{desc} = get_multiline(*FILE);
+		/^Target-Optimization:\s*(.+)\s*$/ and $target->{cflags} = $1;
 		/^Linux-Version:\s*(.+)\s*$/ and $target->{version} = $1;
 		/^Linux-Release:\s*(.+)\s*$/ and $target->{release} = $1;
 		/^Linux-Kernel-Arch:\s*(.+)\s*$/ and $target->{karch} = $1;
@@ -154,6 +155,7 @@ sub target_config_features(@) {
 		/display/ and $ret .= "\tselect DISPLAY_SUPPORT\n";
 		/gpio/ and $ret .= "\tselect GPIO_SUPPORT\n";
 		/pci/ and $ret .= "\tselect PCI_SUPPORT\n";
+		/pcie/ and $ret .= "\tselect PCIE_SUPPORT\n";
 		/usb/ and $ret .= "\tselect USB_SUPPORT\n";
 		/pcmcia/ and $ret .= "\tselect PCMCIA_SUPPORT\n";
 		/squashfs/ and $ret .= "\tselect USES_SQUASHFS\n";
@@ -162,6 +164,9 @@ sub target_config_features(@) {
 		/tgz/ and $ret .= "\tselect USES_TGZ\n";
 		/cpiogz/ and $ret .= "\tselect USES_CPIOGZ\n";
 		/fpu/ and $ret .= "\tselect HAS_FPU\n";
+		/ramdisk/ and $ret .= "\tselect USES_INITRAMFS\n";
+		/powerpc64/ and $ret .= "\tselect powerpc64\n";
+		/nommu/ and $ret .= "\tselect NOMMU\n";
 	}
 	return $ret;
 }
@@ -201,42 +206,52 @@ sub print_target($) {
 	}
 
 	my $v = kver($target->{version});
+	if (@{$target->{subtargets}} == 0) {
 	$confstr = <<EOF;
 config TARGET_$target->{conf}
 	bool "$target->{name}"
 	select LINUX_$kernel
 	select LINUX_$v
 EOF
+	}
+	else {
+		$confstr = <<EOF;
+config TARGET_$target->{conf}
+	bool "$target->{name}"
+EOF
+	}
 	if ($target->{subtarget}) {
 		$confstr .= "\tdepends TARGET_$target->{boardconf}\n";
 	}
 	if (@{$target->{subtargets}} > 0) {
 		$confstr .= "\tselect HAS_SUBTARGETS\n";
-	} else {
-		$confstr .= "\tselect $target->{arch}\n";
-		foreach my $dep (@{$target->{depends}}) {
-			my $mode = "depends";
-			my $flags;
-			my $name;
-
-			$dep =~ /^([@\+\-]+)(.+)$/;
-			$flags = $1;
-			$name = $2;
-
-			next if $name =~ /:/;
-			$flags =~ /-/ and $mode = "deselect";
-			$flags =~ /\+/ and $mode = "select";
-			$flags =~ /@/ and $confstr .= "\t$mode $name\n";
-		}
-		$confstr .= $features;
 	}
 
+	if ($target->{arch} =~ /\w/) {
+		$confstr .= "\tselect $target->{arch}\n";
+	}
+	foreach my $dep (@{$target->{depends}}) {
+		my $mode = "depends";
+		my $flags;
+		my $name;
+
+		$dep =~ /^([@\+\-]+)(.+)$/;
+		$flags = $1;
+		$name = $2;
+
+		next if $name =~ /:/;
+		$flags =~ /-/ and $mode = "deselect";
+		$flags =~ /\+/ and $mode = "select";
+		$flags =~ /@/ and $confstr .= "\t$mode $name\n";
+	}
+	$confstr .= $features;
 	$confstr .= "$help\n\n";
 	print $confstr;
 }
 
 sub gen_target_config() {
 	my @target = parse_target_metadata();
+	my %defaults;
 
 	my @target_sort = sort {
 		target_name($a) cmp target_name($b);
@@ -290,8 +305,16 @@ EOF
 			my @pkglist = merge_package_lists($target->{packages}, $profile->{packages});
 			foreach my $pkg (@pkglist) {
 				print "\tselect DEFAULT_$pkg\n";
+				$defaults{$pkg} = 1;
 			}
-			print "\n";
+			my $help = $profile->{desc};
+			if ($help =~ /\w+/) {
+				$help =~ s/^\s*/\t  /mg;
+				$help = "\thelp\n$help";
+			} else {
+				undef $help;
+			}
+			print "$help\n";
 		}
 	}
 
@@ -308,6 +331,16 @@ EOF
 	foreach my $target (@target) {
 		$target->{subtarget} or	print "\t\tdefault \"".$target->{board}."\" if TARGET_".$target->{conf}."\n";
 	}
+	print <<EOF;
+
+config DEFAULT_TARGET_OPTIMIZATION
+	string
+EOF
+	foreach my $target (@target) {
+		next if @{$target->{subtargets}} > 0;
+		print "\tdefault \"".$target->{cflags}."\" if TARGET_".$target->{conf}."\n";
+	}
+	print "\tdefault \"-Os -pipe -funit-at-a-time\"\n";
 
 	my %kver;
 	foreach my $target (@target) {
@@ -315,10 +348,16 @@ EOF
 		next if $kver{$v};
 		$kver{$v} = 1;
 		print <<EOF;
+
 config LINUX_$v
 	bool
+
 EOF
 	}
+	foreach my $def (sort keys %defaults) {
+		print "\tconfig DEFAULT_".$def."\n";
+		print "\t\tbool\n\n";
+	}
 }
 
 my %dep_check;
@@ -362,26 +401,39 @@ sub package_depends($$) {
 	return $ret;
 }
 
-sub mconf_depends($$) {
+sub mconf_depends {
+	my $pkgname = shift;
 	my $depends = shift;
 	my $only_dep = shift;
 	my $res;
 	my $dep = shift;
+	my $seen = shift;
+	my $parent_condition = shift;
 	$dep or $dep = {};
+	$seen or $seen = {};
 
 	$depends or return;
 	my @depends = @$depends;
 	foreach my $depend (@depends) {
 		my $m = "depends";
-		$depend =~ s/^([@\+]+)//;
-		my $flags = $1;
-		my $condition;
+		my $flags = "";
+		$depend =~ s/^([@\+]+)// and $flags = $1;
 		my $vdep;
+		my $condition = $parent_condition;
 
 		if ($depend =~ /^(.+):(.+)$/) {
-			$condition = $1;
+			if ($1 ne "PACKAGE_$pkgname") {
+				if ($condition) {
+					$condition = "$condition && $1";
+				} else {
+					$condition = $1;
+				}
+			}
 			$depend = $2;
 		}
+		next if $seen->{$depend};
+		next if $package{$depend} and $package{$depend}->{buildonly};
+		$seen->{$depend} = 1;
 		if ($vdep = $package{$depend}->{vdepends}) {
 			$depend = join("||", map { "PACKAGE_".$_ } @$vdep);
 		} else {
@@ -390,13 +442,19 @@ 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);
+				$package{$depend} and mconf_depends($pkgname, $package{$depend}->{depends}, 1, $dep, $seen, $condition);
 
 				$m = "select";
 				next if $only_dep;
 			};
 			$flags =~ /@/ or $depend = "PACKAGE_$depend";
-			$condition and $depend = "$depend if $condition";
+			if ($condition) {
+				if ($m =~ /select/) {
+					$depend = "$depend if $condition";
+				} else {
+					$depend = "!($condition) || $depend";
+				}
+			}
 		}
 		$dep->{$depend} =~ /select/ or $dep->{$depend} = $m;
 	}
@@ -419,6 +477,7 @@ sub print_package_config_category($) {
 
 	foreach my $spkg (sort {uc($a) cmp uc($b)} keys %spkg) {
 		foreach my $pkg (@{$spkg{$spkg}}) {
+			next if $pkg->{buildonly};
 			my $menu = $pkg->{submenu};
 			if ($menu) {
 				$menu_dep{$menu} or $menu_dep{$menu} = $pkg->{submenudep};
@@ -427,8 +486,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 {
@@ -460,7 +517,7 @@ sub print_package_config_category($) {
 			foreach my $default (split /\s*,\s*/, $pkg->{default}) {
 				print "\t\tdefault $default\n";
 			}
-			print mconf_depends($pkg->{depends}, 0);
+			print mconf_depends($pkg->{name}, $pkg->{depends}, 0);
 			print "\t\thelp\n";
 			print $pkg->{description};
 			print "\n";
@@ -477,6 +534,31 @@ sub print_package_config_category($) {
 	undef $category{$cat};
 }
 
+sub print_package_features() {
+	keys %features > 0 or return;
+	print "menu \"Package features\"\n";
+	foreach my $n (keys %features) {
+		my @features = sort { $b->{priority} <=> $a->{priority} or $a->{title} cmp $b->{title} } @{$features{$n}};
+		print <<EOF;
+choice
+	prompt "$features[0]->{target_title}"
+	default FEATURE_$features[0]->{name}
+EOF
+
+		foreach my $feature (@features) {
+			print <<EOF;
+	config FEATURE_$feature->{name}
+		bool "$feature->{title}"
+EOF
+			$feature->{description} =~ /\w/ and do {
+				print "\t\thelp\n".$feature->{description}."\n";
+			};
+		}
+		print "endchoice\n"
+	}
+	print "endmenu\n\n";
+}
+
 sub gen_package_config() {
 	parse_package_metadata($ARGV[0]) or exit 1;
 	print "menuconfig UCI_PRECONFIG\n\tbool \"Image configuration\"\n" if %preconfig;
@@ -493,12 +575,27 @@ sub gen_package_config() {
 EOF
 		}
 	}
+	print_package_features();
 	print_package_config_category 'Base system';
 	foreach my $cat (keys %category) {
 		print_package_config_category $cat;
 	}
 }
 
+sub get_conditional_dep($$) {
+	my $condition = shift;
+	my $depstr = shift;
+	if ($condition) {
+		if ($condition =~ /^!(.+)/) {
+			return "\$(if \$(CONFIG_$1),,$depstr)";
+		} else {
+			return "\$(if \$(CONFIG_$condition),$depstr)";
+		}
+	} else {
+		return $depstr;
+	}
+}
+
 sub gen_package_mk() {
 	my %conf;
 	my %dep;
@@ -522,13 +619,21 @@ sub gen_package_mk() {
 			$config = "\$(CONFIG_PACKAGE_$name)"
 		}
 		if ($config) {
+			$pkg->{buildonly} and $config = "";
 			print "package-$config += $pkg->{subdir}$pkg->{src}\n";
+			if ($pkg->{variant}) {
+				print "\$(curdir)/$pkg->{subdir}$pkg->{src}/variants += \$(if $config,$pkg->{variant})\n"
+			}
 			$pkg->{prereq} and print "prereq-$config += $pkg->{subdir}$pkg->{src}\n";
 		}
 
 		next if $done{$pkg->{src}};
 		$done{$pkg->{src}} = 1;
 
+		if (@{$pkg->{buildtypes}} > 0) {
+			print "buildtypes-$pkg->{subdir}$pkg->{src} = ".join(' ', @{$pkg->{buildtypes}})."\n";
+		}
+
 		foreach my $spkg (@{$srcpackage{$pkg->{src}}}) {
 			foreach my $dep (@{$spkg->{depends}}, @{$spkg->{builddepends}}) {
 				$dep =~ /@/ or do {
@@ -537,17 +642,60 @@ sub gen_package_mk() {
 				};
 			}
 		}
+		foreach my $type (@{$pkg->{buildtypes}}) {
+			my @extra_deps;
+			my %deplines;
+
+			next unless $pkg->{"builddepends/$type"};
+			foreach my $dep (@{$pkg->{"builddepends/$type"}}) {
+				my $suffix = "";
+				my $condition;
+
+				if ($dep =~ /^(.+):(.+)/) {
+					$condition = $1;
+					$dep = $2;
+				}
+				if ($dep =~ /^(.+)(\/.+)/) {
+					$dep = $1;
+					$suffix = $2;
+				}
+				my $pkg_dep = $package{$dep};
+				next unless $pkg_dep;
+
+				my $idx = "";
+				if (defined $pkg_dep->{src}) {
+					$idx = $pkg_dep->{subdir}.$pkg_dep->{src};
+				} elsif (defined($srcpackage{$dep})) {
+					$idx = $subdir{$dep}.$dep;
+				}
+				my $depstr = "\$(curdir)/$idx$suffix/compile";
+				my $depline = get_conditional_dep($condition, $depstr);
+				if ($depline) {
+					$deplines{$dep} = $depline;
+				}
+			}
+			my $depline = join(" ", values %deplines);
+			if ($depline) {
+				$line .= "\$(curdir)/".$pkg->{subdir}."$pkg->{src}/$type/compile += $depline\n";
+			}
+		}
 
 		my $hasdeps = 0;
-		my $depline = "";
+		my %deplines;
 		foreach my $deps (@srcdeps) {
 			my $idx;
 			my $condition;
+			my $prefix = "";
+			my $suffix = "";
 
 			if ($deps =~ /^(.+):(.+)/) {
 				$condition = $1;
 				$deps = $2;
 			}
+			if ($deps =~ /^(.+)(\/.+)/) {
+				$deps = $1;
+				$suffix = $2;
+			}
 
 			my $pkg_dep = $package{$deps};
 			my @deps;
@@ -561,15 +709,17 @@ sub gen_package_mk() {
 			foreach my $dep (@deps) {
 				$pkg_dep = $package{$deps};
 				if (defined $pkg_dep->{src}) {
-					($pkg->{src} ne $pkg_dep->{src}) and $idx = $pkg_dep->{subdir}.$pkg_dep->{src};
+					($pkg->{src} ne $pkg_dep->{src}.$suffix) and $idx = $pkg_dep->{subdir}.$pkg_dep->{src};
 				} elsif (defined($srcpackage{$dep})) {
 					$idx = $subdir{$dep}.$dep;
 				}
+				$idx .= $suffix;
 				undef $idx if $idx =~ /^(kernel)|(base-files)$/;
 				if ($idx) {
-					next if $pkg->{src} eq $pkg_dep->{src};
+					my $depline;
+					next if $pkg->{src} eq $pkg_dep->{src}.$suffix;
 					next if $dep{$pkg->{src}."->".$idx};
-					next if $dep{$pkg->{src}."->($dep)".$idx};
+					next if $dep{$pkg->{src}."->($dep)".$idx} and $pkg_dep->{vdepends};
 					my $depstr;
 
 					if ($pkg_dep->{vdepends}) {
@@ -579,14 +729,14 @@ sub gen_package_mk() {
 						$depstr = "\$(curdir)/$idx/compile";
 						$dep{$pkg->{src}."->".$idx} = 1;
 					}
-					if ($condition) {
-						$depline .= " \$(if \$(CONFIG_$condition),$depstr)";
-					} else {
-						$depline .= " $depstr";
+					$depline = get_conditional_dep($condition, $depstr);
+					if ($depline) {
+						$deplines{$idx.$dep} = $depline;
 					}
 				}
 			}
 		}
+		my $depline = join(" ", values %deplines);
 		if ($depline) {
 			$line .= "\$(curdir)/".$pkg->{subdir}."$pkg->{src}/compile += $depline\n";
 		}
@@ -617,6 +767,16 @@ EOF
 	}
 }
 
+sub gen_package_source() {
+	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->{source}) {
+			print "$pkg->{name}: ";
+			print "$pkg->{source}\n";
+		}
+	}
+}
 
 sub parse_command() {
 	my $cmd = shift @ARGV;
@@ -625,13 +785,15 @@ sub parse_command() {
 		/^package_mk$/ and return gen_package_mk();
 		/^package_config$/ and return gen_package_config();
 		/^kconfig/ and return gen_kconfig_overrides();
+		/^package_source$/ and return gen_package_source();
 	}
 	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
+	$0 package_source [file] 	Package source file information
 
 EOF
 }