diff options
| author | Sean Whitton <spwhitton@spwhitton.name> | 2016-08-24 20:56:17 -0700 |
|---|---|---|
| committer | Sean Whitton <spwhitton@spwhitton.name> | 2016-08-25 19:16:52 -0700 |
| commit | 578ab11e721f2f85658451d23f2f4978118b9254 (patch) | |
| tree | 6444e044c5270f2202ecb7a6026e7351646bfa1e /src | |
| parent | fecfefa7066ccc0ffd23526363c2ef5478d6ce1a (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.
Diffstat (limited to 'src')
| -rw-r--r-- | src/Propellor/Property/Sbuild.hs | 11 |
1 files changed, 7 insertions, 4 deletions
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 |