From ba24883b54da8084ee0699a8218281c495a8176a Mon Sep 17 00:00:00 2001 From: Sean Whitton Date: Wed, 3 Apr 2019 07:49:06 -0700 Subject: Sbuild.built applies Localdir.removed to schroots Signed-off-by: Sean Whitton --- src/Propellor/Property/Sbuild.hs | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'src/Propellor/Property') 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 -- cgit v1.2.3