summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSean Whitton2016-08-24 20:56:17 -0700
committerSean Whitton2016-08-25 19:16:52 -0700
commit578ab11e721f2f85658451d23f2f4978118b9254 (patch)
tree6444e044c5270f2202ecb7a6026e7351646bfa1e
parentfecfefa7066ccc0ffd23526363c2ef5478d6ce1a (diff)
don't require Sbuild.keypairGenerated
This is only needed for building a chroot for squeeze or older, but the code in Sbuild.built fails to configure a squeeze chroot: eatmydata is not available, and there are probably other assumptions that break.
-rw-r--r--debian/changelog6
-rw-r--r--src/Propellor/Property/Sbuild.hs11
2 files changed, 11 insertions, 6 deletions
diff --git a/debian/changelog b/debian/changelog
index 990dbe2e..1c90a9be 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,9 +9,11 @@ propellor (3.1.2) UNRELEASED; urgency=medium
[ Sean Whitton ]
* Pass --allow-unrelated-histories to git merge when run with git 2.9 or
newer. This fixes the /usr/bin/propellor wrapper with this version of git.
+ * Don't force Sbuild.keygen{Insecurely,}Generated.
+ Only required with sbuild << 0.70.0
* Update Sbuild.hs haddock for sbuild 0.71.0
- * Add instructions to Sbuild.hs haddock for customising the chroot
- with propellor.
+ * Add instructions to Sbuild.hs haddock for customising the chroot with
+ propellor.
* Don't add deb-src lines when creating sbuild chroots.
Speeds up updating the chroot with sbuild-update.
diff --git a/src/Propellor/Property/Sbuild.hs b/src/Propellor/Property/Sbuild.hs
index 42eba357..da801ed0 100644
--- a/src/Propellor/Property/Sbuild.hs
+++ b/src/Propellor/Property/Sbuild.hs
@@ -4,8 +4,13 @@
{-|
Maintainer: Sean Whitton <spwhitton@spwhitton.name>
-Build and maintain schroots for use with sbuild. Assumes that the
-version of sbuild available is at least 0.71.0.
+Build and maintain schroots for use with sbuild.
+
+For convenience we set up several enhancements, such as ccache and
+eatmydata. This means we have to assume that the version of sbuild
+available is at least 0.71.0, and that you want to build packages for
+a Debian release strictly newer than squeeze, or for Ubuntu releases
+newer than or equal to trusty.
Suggested usage in @config.hs@:
@@ -122,7 +127,6 @@ builtFor sys = go <!> deleted
built :: SbuildSchroot -> Apt.Url -> RevertableProperty DebianLike UnixLike
built s@(SbuildSchroot suite arch) mirror =
(go
- `requires` keypairGenerated
`requires` ccachePrepared
`requires` installed
`requires` overlaysKernel)
@@ -218,7 +222,6 @@ updated :: SbuildSchroot -> Property DebianLike
updated s@(SbuildSchroot suite arch) =
check (doesDirectoryExist (schrootRoot s)) $ go
`describe` ("updated schroot for " ++ show s)
- `requires` keypairGenerated
`requires` installed
where
go :: Property DebianLike