X-Git-Url: http://git.openwrt.org/?a=blobdiff_plain;f=scripts%2Fmetadata.pl;h=580e29ea0ba02a589ff776ad3cf2241cf9284352;hb=e2e8d55dcceef88f4c6e366ee690e7ab4beed14b;hp=b5ee31a49a43b3f89c8bb9f41d9bef16bad263f8;hpb=d14f611eb1f7dc25905f639366e2604444aa1804;p=openwrt%2Fopenwrt.git

diff --git a/scripts/metadata.pl b/scripts/metadata.pl
index b5ee31a49a..580e29ea0b 100755
--- a/scripts/metadata.pl
+++ b/scripts/metadata.pl
@@ -1,36 +1,47 @@
 #!/usr/bin/perl
+use FindBin;
+use lib "$FindBin::Bin";
 use strict;
-my %package;
-my %category;
+use metadata;
+
+my %board;
+
+sub confstr($) {
+	my $conf = shift;
+	$conf =~ tr#/\.\-/#___#;
+	return $conf;
+}
 
 sub parse_target_metadata() {
-	my ($target, @target, $profile);	
-	while (<>) {
+	my $file = shift @ARGV;
+	my ($target, @target, $profile);
+	open FILE, "<$file" or do {
+		warn "Can't open file '$file': $!\n";
+		return;
+	};
+	while (<FILE>) {
 		chomp;
-		/^Target:\s*((.+)-(\d+\.\d+))\s*$/ and do {
-			my $conf = uc $3.'_'.$2;
-			$conf =~ tr/\.-/__/;
+		/^Target:\s*(.+)\s*$/ and do {
 			$target = {
 				id => $1,
-				conf => $conf,
-				board => $2,
-				kernel => $3,
-				profiles => []
+				conf => confstr($1),
+				profiles => [],
+				features => [],
+				depends => []
 			};
 			push @target, $target;
 		};
+		/^Target-Board:\s*(.+)\s*$/ and do {
+			$target->{board} = $1;
+			$target->{boardconf} = confstr($1);
+		};
+		/^Target-Kernel:\s*(\d+\.\d+)\s*$/ and $target->{kernel} = $1;
 		/^Target-Name:\s*(.+)\s*$/ and $target->{name} = $1;
 		/^Target-Path:\s*(.+)\s*$/ and $target->{path} = $1;
 		/^Target-Arch:\s*(.+)\s*$/ and $target->{arch} = $1;
 		/^Target-Features:\s*(.+)\s*$/ and $target->{features} = [ split(/\s+/, $1) ];
-		/^Target-Description:/ and do {
-			my $desc;
-			while (<>) {
-				last if /^@@/;
-				$desc .= $_;
-			}
-			$target->{desc} = $desc;
-		};
+		/^Target-Depends:\s*(.+)\s*$/ and $target->{depends} = [ split(/\s+/, $1) ];
+		/^Target-Description:/ and $target->{desc} = get_multiline(*FILE);
 		/^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;
@@ -45,16 +56,11 @@ sub parse_target_metadata() {
 		};
 		/^Target-Profile-Name:\s*(.+)\s*$/ and $profile->{name} = $1;
 		/^Target-Profile-Packages:\s*(.*)\s*$/ and $profile->{packages} = [ split(/\s+/, $1) ];
-		/^Target-Profile-Description:/ and do {
-			my $desc;
-			while (<>) {
-				last if /^@@/;
-				$desc .= $_;
-			}
-			$profile->{desc} = $desc;
-		};
+		/^Target-Profile-Description:\s*(.*)\s*/ and $profile->{desc} = get_multiline(*FILE);
+		/^Target-Profile-Config:/ and $profile->{config} = get_multiline(*FILE, "\t");
 		/^Target-Profile-Kconfig:/ and $profile->{kconfig} = 1;
 	}
+	close FILE;
 	foreach my $target (@target) {
 		@{$target->{profiles}} > 0 or $target->{profiles} = [
 			{
@@ -67,110 +73,66 @@ sub parse_target_metadata() {
 	return @target;
 }
 
-sub parse_package_metadata() {
-	my $pkg;
-	my $makefile;
-	my $src;
-	while (<>) {
-		chomp;
-		/^Source-Makefile: \s*(.+\/([^\/]+)\/Makefile)\s*$/ and do {
-			$makefile = $1;
-			$src = $2;
-			undef $pkg;
-		};
-		/^Package: \s*(.+)\s*$/ and do {
-			$pkg = {};
-			$pkg->{src} = $src;
-			$pkg->{makefile} = $makefile;
-			$pkg->{name} = $1;
-			$pkg->{default} = "m if ALL";
-			$package{$1} = $pkg;
-		};
-		/^Version: \s*(.+)\s*$/ and $pkg->{version} = $1;
-		/^Title: \s*(.+)\s*$/ and $pkg->{title} = $1;
-		/^Menu: \s*(.+)\s*$/ and $pkg->{menu} = $1;
-		/^Submenu: \s*(.+)\s*$/ and $pkg->{submenu} = $1;
-		/^Submenu-Depends: \s*(.+)\s*$/ and $pkg->{submenudep} = $1;
-		/^Default: \s*(.+)\s*$/ and $pkg->{default} = $1;
-		/^Provides: \s*(.+)\s*$/ and do {
-			my @vpkg = split /\s+/, $1;
-			foreach my $vpkg (@vpkg) {
-				$package{$vpkg} or $package{$vpkg} = { vdepends => [] };
-				push @{$package{$vpkg}->{vdepends}}, $pkg->{name};
-			}
-		};
-		/^Depends: \s*(.+)\s*$/ and do {
-			my @dep = split /\s+/, $1;
-			$pkg->{depends} = \@dep;
-		};
-		/^Category: \s*(.+)\s*$/ and do {
-			$pkg->{category} = $1;
-			defined $category{$1} or $category{$1} = {};
-			defined $category{$1}->{$src} or $category{$1}->{$src} = [];
-			push @{$category{$1}->{$src}}, $pkg;
-		};
-		/^Description: \s*(.*)\s*$/ and do {
-			my $desc = "\t\t$1\n\n";
-			my $line;
-			while ($line = <>) {
-				last if $line =~ /^@@/;
-				$desc .= "\t\t$line";
+sub gen_kconfig_overrides() {
+	my %config;
+	my %kconfig;
+	my $package;
+	my $pkginfo = shift @ARGV;
+	my $cfgfile = shift @ARGV;
+
+	# parameter 2: build system config
+	open FILE, "<$cfgfile" or return;
+	while (<FILE>) {
+		/^(CONFIG_.+?)=(.+)$/ and $config{$1} = 1;
+	}
+	close FILE;
+
+	# parameter 1: package metadata
+	open FILE, "<$pkginfo" or return;
+	while (<FILE>) {
+		/^Package:\s*(.+?)\s*$/ and $package = $1;
+		/^Kernel-Config:\s*(.+?)\s*$/ and do {
+			my @config = split /\s+/, $1;
+			foreach my $config (@config) {
+				my $val = 'm';
+				my $override;
+				if ($config =~ /^(.+?)=(.+)$/) {
+					$config = $1;
+					$override = 1;
+					$val = $2;
+				}
+				if ($config{"CONFIG_PACKAGE_$package"} and ($config ne 'n')) {
+					$kconfig{$config} = $val;
+				} elsif (!$override) {
+					$kconfig{$config} or $kconfig{$config} = 'n';
+				}
 			}
-			$pkg->{description} = $desc;
 		};
-		/^Config: \s*(.*)\s*$/ and do {
-			my $conf = "$1\n";
-			my $line;
-			while ($line = <>) {
-				last if $line =~ /^@@/;
-				$conf .= "$line";
-			}
-			$pkg->{config} = $conf;
+	};
+	close FILE;
+
+	foreach my $kconfig (sort keys %kconfig) {
+		if ($kconfig{$kconfig} eq 'n') {
+			print "# $kconfig is not set\n";
+		} else {
+			print "$kconfig=$kconfig{$kconfig}\n";
 		}
 	}
-	return %category;
 }
 
+sub merge_package_lists($$) {
+	my $list1 = shift;
+	my $list2 = shift;
+	my @l = ();
+	my %pkgs;
 
-sub gen_target_mk() {
-	my @target = parse_target_metadata();
-	
-	@target = sort {
-		$a->{id} cmp $b->{id}
-	} @target;
-	
-	foreach my $target (@target) {
-		my ($profiles_def, $profiles_eval);
-		my $conf = uc $target->{kernel}.'_'.$target->{board};
-		$conf =~ tr/\.-/__/;
-		
-		foreach my $profile (@{$target->{profiles}}) {
-			$profiles_def .= "
-  define Profile/$conf\_$profile->{id}
-    ID:=$profile->{id}
-    NAME:=$profile->{name}
-    PACKAGES:=".join(" ", @{$profile->{packages}})."\n";
-			$profile->{kconfig} and $profiles_def .= "    KCONFIG:=1\n";
-			$profiles_def .= "  endef";
-			$profiles_eval .= "
-\$(eval \$(call AddProfile,$conf\_$profile->{id}))"
-		}
-		print "
-ifeq (\$(CONFIG_LINUX_$conf),y)
-  define Target
-    KERNEL:=$target->{kernel}
-    BOARD:=$target->{board}
-    BOARDNAME:=$target->{name}
-    LINUX_VERSION:=$target->{version}
-    LINUX_RELEASE:=$target->{release}
-    LINUX_KARCH:=$target->{karch}
-    DEFAULT_PACKAGES:=".join(" ", @{$target->{packages}})."
-  endef$profiles_def
-endif$profiles_eval
-
-"
+	foreach my $pkg (@$list1, @$list2) {
+		$pkgs{$pkg} = 1;
+	}
+	foreach my $pkg (keys %pkgs) {
+		push @l, $pkg unless ($pkg =~ /^-/ or $pkgs{"-$pkg"});
 	}
-	print "\$(eval \$(call Target))\n";
+	return sort(@l);
 }
 
 sub target_config_features(@) {
@@ -180,12 +142,11 @@ sub target_config_features(@) {
 		/broken/ and $ret .= "\tdepends BROKEN\n";
 		/pci/ and $ret .= "\tselect PCI_SUPPORT\n";
 		/usb/ and $ret .= "\tselect USB_SUPPORT\n";
-		/atm/ and $ret .= "\tselect ATM_SUPPORT\n";
 		/pcmcia/ and $ret .= "\tselect PCMCIA_SUPPORT\n";
-		/video/ and $ret .= "\tselect VIDEO_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";
 	}
 	return $ret;
 }
@@ -202,7 +163,7 @@ sub gen_target_config() {
 	print <<EOF;
 choice
 	prompt "Target System"
-	default LINUX_2_4_BRCM
+	default TARGET_brcm_2_4
 	reset if !DEVEL
 	
 EOF
@@ -222,70 +183,51 @@ EOF
 			undef $help;
 		}
 	
-		print <<EOF
-config LINUX_$target->{conf}
+		print <<EOF;
+config TARGET_$target->{conf}
 	bool "$target->{name}"
 	select $target->{arch}
 	select LINUX_$kernel
-$features$help
-
 EOF
+		if ($target->{id} ne $target->{board}) {
+			print "\tselect TARGET_".$target->{boardconf}."\n";
+		}
+		foreach my $dep (@{$target->{depends}}) {
+			my $mode = "depends";
+			my $flags;
+			my $name;
+
+			$dep =~ /^([@\+\-]+)(.+)$/;
+			$flags = $1;
+			$name = $2;
+
+			$flags =~ /-/ and $mode = "deselect";
+			$flags =~ /\+/ and $mode = "select";
+			$flags =~ /@/ and print "\t$mode $name\n";
+		}
+		
+		print "$features$help\n\n"
 	}
 
 	print <<EOF;
-if DEVEL
-
-config LINUX_2_6_ARM
-	bool "UNSUPPORTED little-endian arm platform"
-	depends BROKEN
-	select LINUX_2_6
-	select arm
-
-config LINUX_2_6_CRIS
-	bool "UNSUPPORTED cris platform"
-	depends BROKEN
-	select LINUX_2_6
-	select cris
-
-config LINUX_2_6_M68K
-	bool "UNSUPPORTED m68k platform"
-	depends BROKEN
-	select LINUX_2_6
-	select m68k
-
-config LINUX_2_6_SH3
-	bool "UNSUPPORTED little-endian sh3 platform"
-	depends BROKEN
-	select LINUX_2_6
-	select sh3
-
-config LINUX_2_6_SH3EB
-	bool "UNSUPPORTED big-endian sh3 platform"
-	depends BROKEN
-	select LINUX_2_6
-	select sh3eb
-
-config LINUX_2_6_SH4
-	bool "UNSUPPORTED little-endian sh4 platform"
-	depends BROKEN
-	select LINUX_2_6
-	select sh4
-
-config LINUX_2_6_SH4EB
-	bool "UNSUPPORTED big-endian sh4 platform"
-	depends BROKEN
-	select LINUX_2_6
-	select sh4eb
-
-config LINUX_2_6_SPARC
-	bool "UNSUPPORTED sparc platform"
-	depends BROKEN
-	select LINUX_2_6
-	select sparc
+endchoice
 
-endif
+config TARGET_BOARD
+	string
+EOF
+	foreach my $target (@target) {
+		print "\t\tdefault \"".$target->{board}."\" if TARGET_".$target->{conf}."\n";
+	}
 
-endchoice
+	# add hidden target config options 
+	foreach my $target (@target) {
+		next if $board{$target->{board}};
+		if ($target->{id} ne $target->{board}) {
+			print "\nconfig TARGET_".$target->{boardconf}."\n\tbool\n";
+			$board{$target->{board}} = 1;
+		}
+	}
+	print <<EOF;
 
 choice
 	prompt "Target Profile"
@@ -297,17 +239,15 @@ EOF
 		
 		foreach my $profile (@$profiles) {
 			print <<EOF;
-config LINUX_$target->{conf}_$profile->{id}
+config TARGET_$target->{conf}_$profile->{id}
 	bool "$profile->{name}"
-	depends LINUX_$target->{conf}
+	depends TARGET_$target->{conf}
+$profile->{config}
 EOF
 			$profile->{kconfig} and print "\tselect PROFILE_KCONFIG\n";
-			my %pkgs;
-			foreach my $pkg (@{$target->{packages}}, @{$profile->{packages}}) {
-				$pkgs{$pkg} = 1;
-			}
-			foreach my $pkg (keys %pkgs) {
-				print "\tselect DEFAULT_$pkg\n" unless ($pkg =~ /^-/ or $pkgs{"-$pkg"});
+			my @pkglist = merge_package_lists($target->{packages}, $profile->{packages});
+			foreach my $pkg (@pkglist) {
+				print "\tselect DEFAULT_$pkg\n";
 			}
 			print "\n";
 		}
@@ -316,19 +256,31 @@ EOF
 	print "endchoice\n";
 }
 
-sub find_package_dep($$) {
+my %dep_check;
+sub __find_package_dep($$) {
 	my $pkg = shift;
 	my $name = shift;
 	my $deps = ($pkg->{vdepends} or $pkg->{depends});
 
 	return 0 unless defined $deps;
 	foreach my $dep (@{$deps}) {
+		next if $dep_check{$dep};
+		$dep_check{$dep} = 1;
 		return 1 if $dep eq $name;
-		return 1 if ($package{$dep} and (find_package_dep($package{$dep},$name) == 1));
+		return 1 if ($package{$dep} and (__find_package_dep($package{$dep},$name) == 1));
 	}
 	return 0;
 }
 
+# wrapper to avoid infinite recursion
+sub find_package_dep($$) {
+	my $pkg = shift;
+	my $name = shift;
+
+	%dep_check = ();
+	return __find_package_dep($pkg, $name);
+}
+
 sub package_depends($$) {
 	my $a = shift;
 	my $b = shift;
@@ -426,7 +378,7 @@ sub print_package_config_category($) {
 			print "\t";
 			$pkg->{menu} and print "menu";
 			print "config PACKAGE_".$pkg->{name}."\n";
-			print "\t\ttristate \"$title\"\n";
+			print "\t\t".($pkg->{tristate} ? 'tristate' : 'bool')." \"$title\"\n";
 			print "\t\tdefault y if DEFAULT_".$pkg->{name}."\n";
 			foreach my $default (split /\s*,\s*/, $pkg->{default}) {
 				print "\t\tdefault $default\n";
@@ -449,25 +401,118 @@ sub print_package_config_category($) {
 }
 
 sub gen_package_config() {
-	parse_package_metadata();
+	parse_package_metadata($ARGV[0]) or exit 1;
+	print "menuconfig UCI_PRECONFIG\n\tbool \"Image configuration\"\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
+		depends PACKAGE_$preconfig
+		default "$preconfig{$preconfig}->{$cfg}->{default}"
+
+EOF
+		}
+	}
 	print_package_config_category 'Base system';
 	foreach my $cat (keys %category) {
 		print_package_config_category $cat;
 	}
 }
 
+sub gen_package_mk() {
+	my %conf;
+	my %dep;
+	my $line;
+
+	parse_package_metadata($ARGV[0]) or exit 1;
+	foreach my $name (sort {uc($a) cmp uc($b)} keys %package) {
+		my $config;
+		my $pkg = $package{$name};
+		
+		next if defined $pkg->{vdepends};
+		if ($ENV{SDK}) {
+			$conf{$pkg->{src}} or do {
+				$config = 'm';
+				$conf{$pkg->{src}} = 1;
+			};
+		} else {
+			$config = "\$(CONFIG_PACKAGE_$name)"
+		}
+		if ($config) {
+			print "package-$config += $pkg->{subdir}$pkg->{src}\n";
+			$pkg->{prereq} and print "prereq-$config += $pkg->{subdir}$pkg->{src}\n";
+		}
+	
+		my $hasdeps = 0;
+		my $depline = "";
+		foreach my $dep (@{$pkg->{depends}}, @{$pkg->{builddepends}}) {
+			next if $dep =~ /@/;
+			$dep =~ s/\+//;
+			my $idx;
+			my $pkg_dep = $package{$dep};
+			next if defined $pkg_dep->{vdepends};
+
+			if (defined $pkg_dep->{src}) {
+				($pkg->{src} ne $pkg_dep->{src}) and $idx = $pkg_dep->{subdir}.$pkg_dep->{src};
+			} elsif (defined($srcpackage{$dep})) {
+				$idx = $subdir{$dep}.$dep;
+			}
+			undef $idx if $idx =~ /^(kernel)|(base-files)$/;
+			if ($idx) {
+				next if $dep{$pkg->{src}."->".$idx};
+				$depline .= " \$(curdir)/$idx/compile";
+				$dep{$pkg->{src}."->".$idx} = 1;
+			}
+		}
+		if ($depline) {
+			$line .= "\$(curdir)/".$pkg->{subdir}."$pkg->{src}/compile += $depline\n";
+		}
+	}
+	
+	if ($line ne "") {
+		print "\n$line";
+	}
+	foreach my $preconfig (keys %preconfig) {
+		my $cmds;
+		foreach my $cfg (keys %{$preconfig{$preconfig}}) {
+			my $conf = $preconfig{$preconfig}->{$cfg}->{id};
+			$conf =~ tr/\.-/__/;
+			$cmds .= "\techo \"uci set '$preconfig{$preconfig}->{$cfg}->{id}=\$(subst \",,\$(CONFIG_UCI_PRECONFIG_$conf))'\"; \\\n";
+		}
+		next unless $cmds;
+		print <<EOF
+
+\$(TARGET_DIR)/etc/uci-defaults/$preconfig: FORCE
+	( \\
+$cmds \\
+	) > \$@
+	
+ifneq (\$(UCI_PRECONFIG)\$(CONFIG_UCI_PRECONFIG),)
+  package/preconfig: \$(TARGET_DIR)/etc/uci-defaults/$preconfig
+endif
+EOF
+	}
+}
+
+
 sub parse_command() {
 	my $cmd = shift @ARGV;
 	for ($cmd) {
-		/^target_mk$/ and return gen_target_mk();
 		/^target_config$/ and return gen_target_config();
+		/^package_mk$/ and return gen_package_mk();
 		/^package_config$/ and return gen_package_config();
+		/^kconfig/ and return gen_kconfig_overrides();
 	}
 	print <<EOF
 Available Commands:
-	$0 target_mk [file] 		Target metadata in makefile format
 	$0 target_config [file] 	Target metadata in Kconfig 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
+
 EOF
 }