summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorSean Whitton2019-04-03 07:49:06 -0700
committerJoey Hess2019-04-03 12:11:52 -0400
commitba24883b54da8084ee0699a8218281c495a8176a (patch)
tree3b0cbae960080d83fe3819df395ce7cba1d6daa8 /src
parent5bc19af29effa14804588fdb062b65ee8fd75bcd (diff)
Sbuild.built applies Localdir.removed to schroots
Signed-off-by: Sean Whitton <spwhitton@spwhitton.name>
Diffstat (limited to 'src')
-rw-r--r--src/Propellor/Property/Sbuild.hs7
1 files changed, 6 insertions, 1 deletions
diff --git a/src/Propellor/Property/Sbuild.hs b/src/Propellor/Property/Sbuild.hs
index b54f8170..3de82af3 100644
--- a/src/Propellor/Property/Sbuild.hs
+++ b/src/Propellor/Property/Sbuild.hs
@@ -88,6 +88,7 @@ import qualified Propellor.Property.File as File
-- import qualified Propellor.Property.Firewall as Firewall
import qualified Propellor.Property.Schroot as Schroot
import qualified Propellor.Property.Reboot as Reboot
+import qualified Propellor.Property.Localdir as Localdir
import qualified Propellor.Property.User as User
import Data.List
@@ -223,7 +224,11 @@ built' cc (Props ps) suite arch = provisioned <!> deleted
schroot = Chroot.debootstrapped Debootstrap.BuilddD
schrootRoot (Props schrootProps)
schrootProps =
- ps ++ [toChildProperty $ Apt.installed ["eatmydata", "ccache"]]
+ ps ++ [toChildProperty $ Apt.installed ["eatmydata", "ccache"]
+ -- Drop /usr/local/propellor since build chroots should be
+ -- clean. Note that propellor does not have to install its
+ -- build-deps into the chroot, so this is sufficient cleanup
+ , toChildProperty $ Localdir.removed]
-- static values
suiteArch = suite ++ "-" ++ arch