summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSean Whitton2017-12-22 18:10:26 +0000
committerJoey Hess2017-12-23 14:39:18 -0400
commitc25050935839006d5f3d21acba0d2480d547443f (patch)
treeee50e3ae526428a04f46c87b8125c7a8055029bc
parentcd345cc5f9bda32f253cfa2f729da64c07eaaa1b (diff)
Sbuild: add notes about Debian jessie hosts and backports
Signed-off-by: Sean Whitton <spwhitton@spwhitton.name>
-rw-r--r--debian/changelog5
-rw-r--r--src/Propellor/Property/Sbuild.hs15
2 files changed, 20 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog
index c1694108..c9d86e1a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,6 @@
propellor (5.2.0) UNRELEASED; urgency=medium
+ [ Joey Hess ]
* bootstrappedFrom: Set up local privdata file.
* Parted: Fix names used for FAT and VFAT partitions.
* Parted: Add an Alignment parameter. (API change)
@@ -15,6 +16,10 @@ propellor (5.2.0) UNRELEASED; urgency=medium
fail.
* Grub.boots, Grub.bootsMounted: Pass --target to grub-install.
+ [ Sean Whitton ]
+ * Sbuild: add notes about Debian jessie hosts and backports of sbuild and
+ autopkgtest.
+
-- Joey Hess <id@joeyh.name> Wed, 29 Nov 2017 11:45:08 -0400
propellor (5.1.0) unstable; urgency=medium
diff --git a/src/Propellor/Property/Sbuild.hs b/src/Propellor/Property/Sbuild.hs
index d323ee67..8cc2e3be 100644
--- a/src/Propellor/Property/Sbuild.hs
+++ b/src/Propellor/Property/Sbuild.hs
@@ -48,6 +48,14 @@ To take advantage of the piuparts and autopkgtest support, add to your
>
> $autopkgtest_root_args = "";
> $autopkgtest_opts = ["--", "schroot", "%r-%a-sbuild"];
+
+On Debian jessie hosts, you should ensure that sbuild and autopkgtest come from
+the same suite. This is because the autopkgtest binary changed its name between
+jessie and stretch. If you have not installed backports of sbuild or
+autopkgtest, you don't need to do anything. But if you have installed either
+package from jessie-backports (with Propellor or otherwise), you should install
+the other from jessie-backports, too.
+
-}
module Propellor.Property.Sbuild (
@@ -376,6 +384,13 @@ ccachePrepared = propertyList "sbuild group ccache configured" $ props
--
-- You probably want a custom ~/.sbuildrc on your workstation, but
-- this property is handy for quickly setting up build boxes.
+--
+-- On Debian jessie hosts, you should ensure that sbuild and autopkgtest come
+-- from the same suite. This is because the autopkgtest binary changed its name
+-- between jessie and stretch. If you have not installed backports of sbuild or
+-- autopkgtest, you don't need to do anything. But if you have installed either
+-- package from jessie-backports (with Propellor or otherwise), you should
+-- install the other from jessie-backports, too.
userConfig :: User -> Property DebianLike
userConfig user@(User u) = go
`requires` usableBy user