X-Git-Url: http://git.rohieb.name/openwrt.git/blobdiff_plain/02cdebbb91a33d8e24da1c94a9d93ac39be168a7..7bc91f44e59f71af5d442742e0be4be1cd8614ee:/scripts/gen_deps.pl

diff --git a/scripts/gen_deps.pl b/scripts/gen_deps.pl
index 0cdcc97a1..af206f004 100755
--- a/scripts/gen_deps.pl
+++ b/scripts/gen_deps.pl
@@ -13,6 +13,7 @@ my $src;
 my $makefile;
 my %conf;
 my %pkg;
+my %prereq;
 my %dep;
 my %options;
 my $opt;
@@ -33,6 +34,15 @@ while ($line = <>) {
 		defined $pkg{$name} or $pkg{$name} = {};
 		$pkg{$name}->{src} = $src;
 	};
+	$line =~ /^Provides: \s*(.+)\s*$/ and do {
+		foreach my $vpkg (split /\s+/, $1) {
+			defined $pkg{$vpkg} or $pkg{$vpkg} = {};
+			$pkg{$vpkg}->{virtual} = 1;
+		}
+	};
+	$line =~ /^Prereq-Check:/ and !defined $prereq{$src} and do {
+		$pkg{$name}->{prereq} = 1;
+	};
 	$line =~ /^(Build-)?Depends: \s*(.+)\s*$/ and do {
 		$pkg{$name}->{depends} ||= [];
 		foreach my $v (split /\s+/, $2) {
@@ -46,22 +56,33 @@ while ($line = <>) {
 $line="";
 
 foreach $name (sort {uc($a) cmp uc($b)} keys %pkg) {
+	my $config;
+	
+	next if defined $pkg{$name}->{virtual};
 	if ($options{SDK}) {
-		$conf{$pkg{$name}->{src}} or print "package-m += $pkg{$name}->{src}\n";
-		$conf{$pkg{$name}->{src}} = 1;
+		$conf{$pkg{$name}->{src}} or do {
+			$config = 'm';
+			$conf{$pkg{$name}->{src}} = 1;
+		};
 	} else {
-		print "package-\$(CONFIG_PACKAGE_$name) += $pkg{$name}->{src}\n";
+		$config = "\$(CONFIG_PACKAGE_$name)"
+	}
+	if ($config) {
+		print "package-$config += $pkg{$name}->{src}\n";
+		$pkg{$name}->{prereq} and print "prereq-$config += $pkg{$name}->{src}\n";
 	}
 
 	my $hasdeps = 0;
 	my $depline = "";
 	foreach my $dep (@{$pkg{$name}->{depends}}) {
 		my $idx;
+		next if defined $pkg{$dep}->{virtual};
 		if (defined $pkg{$dep}->{src}) {
 			($pkg{$name}->{src} ne $pkg{$dep}->{src}) and $idx = $pkg{$dep}->{src};
 		} elsif (defined($pkg{$dep}) && !$options{SDK}) {
 			$idx = $dep;
 		}
+		undef $idx if $idx =~ /^(kernel)|(base-files)$/;
 		if ($idx) {
 			next if $dep{$pkg{$name}->{src}."->".$idx};
 			$depline .= " $idx\-compile";