[26480] in Source-Commits
/svn/athena r25587 - trunk/debathena/scripts/build-server/build-all
daemon@ATHENA.MIT.EDU (Jonathan D Reed)
Thu Jun 28 13:01:13 2012
Date: Thu, 28 Jun 2012 13:01:11 -0400
From: Jonathan D Reed <jdreed@MIT.EDU>
Message-Id: <201206281701.q5SH1BLr008309@drugstore.mit.edu>
To: source-commits@MIT.EDU
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Author: jdreed
Date: 2012-06-28 13:01:11 -0400 (Thu, 28 Jun 2012)
New Revision: 25587
Modified:
trunk/debathena/scripts/build-server/build-all/gen-build-deps
Log:
Include another layer of dependencies (Trac: #1089)
Modified: trunk/debathena/scripts/build-server/build-all/gen-build-deps
===================================================================
--- trunk/debathena/scripts/build-server/build-all/gen-build-deps 2012-06-28 16:51:08 UTC (rev 25586)
+++ trunk/debathena/scripts/build-server/build-all/gen-build-deps 2012-06-28 17:01:11 UTC (rev 25587)
@@ -18,6 +18,7 @@
return @a;
}
+# For each source package, add its build-deps to the list
open(DPKG, '-|', "zcat $ENV{DEBATHENA_APT}/dists/$psuite/*/source/Sources.gz | dpkg-awk -f - -- Package Build-Depends") or die;
my %src_deps = ();
while (<DPKG>) {
@@ -34,25 +35,35 @@
}
}
close DPKG;
-open(DPKG, '-|', "zcat $ENV{DEBATHENA_APT}/dists/$psuite/debathena/binary-amd64/Packages.gz | dpkg-awk -f - -- Package Source Provides") or die;
+
+# For each binary package, add itself as a source and provider. If
+# there are actually different Sources and Provides for the package,
+# use them instead. Note: This will fail miserably if we ever build
+# packages only for one architecture.
+open(DPKG, '-|', "zcat $ENV{DEBATHENA_APT}/dists/$psuite/debathena/binary-amd64/Packages.gz | dpkg-awk -f - -- Package Source Provides Depends") or die;
my %pkg_src = ();
my %pkg_provider = ();
+my %pkg_deps=();
while (<DPKG>) {
last if /^$/;
my ($package) = /^Package: (.*)$/ or die;
$pkg_src{$package} = $package;
$pkg_provider{$package} = $package;
+ @{$pkg_deps{$package}} = ();
while (<DPKG>) {
last if ($_ eq "\n");
if (my ($source) = /^Source: (.*)$/) {
$pkg_src{$package} = $source;
} elsif (my ($provides) = /^Provides: (.*)$/) {
$pkg_provider{$_} = $package for (list($provides));
+ } elsif (my ($depends) = /^Depends: (.*)$/) {
+ push @{$pkg_deps{$package}}, $_ for (list($depends));
} else {
die;
}
}
}
+
for my $source (keys %src_deps) {
print "build-all: \$(call package,$source)\n";
if ($source ne "debathena-build-depends") {
@@ -60,5 +71,8 @@
}
for (@{$src_deps{$source}}) {
print "\$(call package,$source): \$(call package,$pkg_src{$pkg_provider{$_}})\n" if (defined $pkg_provider{$_});
+ foreach my $dep (@{$pkg_deps{$_}}) {
+ print "\$(call package,$source): \$(call package,$pkg_src{$dep})\n" if (defined $pkg_provider{$dep});
+ }
}
}
