Fix location of base.cow

Because of the slightly crazy way the base.cow files are being managed
(per-OS as well as per-release and per-arch) the default location is no
longer appropriate.

This has the happy effect of making raspbian packages buildable again.

diff --git a/bin/build-package b/bin/build-package
index b57cc0daa6514caf2c71097a6e9a9a5e74ca9aaf..18902c31a323365f924a13a00dc45d297506f271 100755 (executable)
--- a/bin/build-package
+++ b/bin/build-package
@@ -24,14 +24,17 @@ my @cowpoke_opts = qw(--dpkg-opts='-sa');
 my @orig_compression_types = qw(bz2 gz lzma xz);
 
 my $buildhost = "wowbagger.internal.michaelhowe.org";
+my $basedir = "/var/cache/pbuilder";
 
 my @archs;   # = 'amd64';
 my @dists;   # = 'squeeze';
 my $dsc;     # optional; allows use of a dsc directly
+my $os = 'debian';
 
 GetOptions(
     "arch=s"    => \@archs,
     "dist=s"    => \@dists,
+    "os=s"      => \$os,
     "dsc=s"     => \$dsc,
 );
 
@@ -121,8 +124,14 @@ foreach my $arch ( @archs ){
     foreach my $dist ( @dists ){
         my $resdirname = "${arch}_${dist}_RESULT_DIR";
         $ENV{$resdirname} = "$remote_outputdir";
+        my $resbasepath = "$basedir/$os/$arch/$dist/base.cow";
+        my $resbasepathname = "${arch}_${dist}_BASE_PATH";
+        $ENV{$resbasepathname} = $resbasepath;
     }
 }
+
+$ENV{PBUILDER_BASE} = "/var/cache/pbuilder/$os";
+
 my $archcmds = "--arch=" . join( " ", @archs );
 my $distcmds = "--dist=" . join( " ", @dists );
 

diff --git a/debian/changelog b/debian/changelog
index 823265d2ae998fa317d4e885f33f0865d03c0ee7..373491bc7431671210f92b311bb8055fc4f767b0 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-mh-sysadmin-tools (1.6~test.0) UNRELEASED; urgency=low
+mh-sysadmin-tools (1.6~test.1) UNRELEASED; urgency=low
 
   * build-package: new script for package building via cowbuilder/pbuilder