X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/5b6977f54e7aa62bee8851fc8df40bf631f10c2d..c6537133132fa5acf0bdd024e6793ff095d8284f:/scripts/metadata.pl

diff --git a/scripts/metadata.pl b/scripts/metadata.pl
index 2da885117..336605f7b 100755
--- a/scripts/metadata.pl
+++ b/scripts/metadata.pl
@@ -152,17 +152,20 @@ sub target_config_features(@) {
 
 	while ($_ = shift @_) {
 		/broken/ and $ret .= "\tdepends BROKEN\n";
+		/audio/ and $ret .= "\tselect AUDIO_SUPPORT\n";
 		/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";
+		/usbgadget/ and $ret .= "\tselect USB_GADGET_SUPPORT\n";
 		/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";
-		/tgz/ and $ret .= "\tselect USES_TGZ\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";
 		/ramdisk/ and $ret .= "\tselect USES_INITRAMFS\n";
 		/powerpc64/ and $ret .= "\tselect powerpc64\n";
@@ -225,25 +228,26 @@ EOF
 	}
 	if (@{$target->{subtargets}} > 0) {
 		$confstr .= "\tselect HAS_SUBTARGETS\n";
-	} else {
+	}
+
+	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;
 	}
+	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;
 }
@@ -260,7 +264,7 @@ sub gen_target_config() {
 	print <<EOF;
 choice
 	prompt "Target System"
-	default TARGET_brcm_2_4
+	default TARGET_brcm47xx
 	reset if !DEVEL
 	
 EOF
@@ -420,6 +424,9 @@ sub mconf_depends {
 		my $vdep;
 		my $condition = $parent_condition;
 
+		next if $condition eq $depend;
+		next if $seen->{"$parent_condition:$depend"};
+		$seen->{"$parent_condition:$depend"} = 1;
 		if ($depend =~ /^(.+):(.+)$/) {
 			if ($1 ne "PACKAGE_$pkgname") {
 				if ($condition) {
@@ -430,9 +437,7 @@ sub mconf_depends {
 			}
 			$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 {
@@ -548,9 +553,10 @@ EOF
 			print <<EOF;
 	config FEATURE_$feature->{name}
 		bool "$feature->{title}"
-		help
-$feature->{description}
 EOF
+			$feature->{description} =~ /\w/ and do {
+				print "\t\thelp\n".$feature->{description}."\n";
+			};
 		}
 		print "endchoice\n"
 	}
@@ -559,20 +565,24 @@ EOF
 
 sub gen_package_config() {
 	parse_package_metadata($ARGV[0]) or exit 1;
-	print "menuconfig UCI_PRECONFIG\n\tbool \"Image configuration\"\n" if %preconfig;
+	print "menuconfig IMAGEOPT\n\tbool \"Image configuration\"\n\tdefault n\n";
 	foreach my $preconfig (keys %preconfig) {
 		foreach my $cfg (keys %{$preconfig{$preconfig}}) {
 			my $conf = $preconfig{$preconfig}->{$cfg}->{id};
 			$conf =~ tr/\.-/__/;
 			print <<EOF
 	config UCI_PRECONFIG_$conf
-		string "$preconfig{$preconfig}->{$cfg}->{label}" if UCI_PRECONFIG
+		string "$preconfig{$preconfig}->{$cfg}->{label}" if IMAGEOPT
 		depends PACKAGE_$preconfig
 		default "$preconfig{$preconfig}->{$cfg}->{default}"
 
 EOF
 		}
 	}
+	print "source \"package/*/image-config.in\"\n";
+	if (scalar glob "package/feeds/*/*/image-config.in") {
+	    print "source \"package/feeds/*/*/image-config.in\"\n";
+	}
 	print_package_features();
 	print_package_config_category 'Base system';
 	foreach my $cat (keys %category) {
@@ -619,6 +629,9 @@ sub gen_package_mk() {
 		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";
 		}
 
@@ -654,14 +667,15 @@ sub gen_package_mk() {
 					$dep = $1;
 					$suffix = $2;
 				}
-				my $pkg_dep = $package{$dep};
-				next unless $pkg_dep;
 
 				my $idx = "";
-				if (defined $pkg_dep->{src}) {
+				my $pkg_dep = $package{$dep};
+				if (defined($pkg_dep) && defined($pkg_dep->{src})) {
 					$idx = $pkg_dep->{subdir}.$pkg_dep->{src};
 				} elsif (defined($srcpackage{$dep})) {
 					$idx = $subdir{$dep}.$dep;
+				} else {
+					next;
 				}
 				my $depstr = "\$(curdir)/$idx$suffix/compile";
 				my $depline = get_conditional_dep($condition, $depstr);
@@ -750,14 +764,17 @@ sub gen_package_mk() {
 		next unless $cmds;
 		print <<EOF
 
+ifndef DUMP_TARGET_DB
 \$(TARGET_DIR)/etc/uci-defaults/$preconfig: FORCE
 	( \\
 $cmds \\
 	) > \$@
 	
-ifneq (\$(UCI_PRECONFIG)\$(CONFIG_UCI_PRECONFIG),)
+ifneq (\$(IMAGEOPT)\$(CONFIG_IMAGEOPT),)
   package/preconfig: \$(TARGET_DIR)/etc/uci-defaults/$preconfig
 endif
+endif
+
 EOF
 	}
 }