From cf9e354619f07d200b804393d5fb0b9ce5aa8370 Mon Sep 17 00:00:00 2001 From: Sean Whitton Date: Mon, 5 Sep 2016 11:15:26 -0700 Subject: fix sbuild haddock formatting --- debian/changelog | 6 ++++++ src/Propellor/Property/Sbuild.hs | 4 ++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 1f46b487..9ee8f6e7 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +propellor (3.1.3) UNRELEASED; urgency=medium + + * Fix Sbuild.hs haddock formatting error. + + -- Sean Whitton Mon, 05 Sep 2016 11:14:52 -0700 + propellor (3.1.2) unstable; urgency=medium [ Joey Hess ] diff --git a/src/Propellor/Property/Sbuild.hs b/src/Propellor/Property/Sbuild.hs index b55b6e8c..d385b2a6 100644 --- a/src/Propellor/Property/Sbuild.hs +++ b/src/Propellor/Property/Sbuild.hs @@ -12,8 +12,8 @@ eatmydata. This means we have to make several assumptions: 1. you want to build for a Debian release strictly newer than squeeze, or for a Buntish release newer than or equal to trusty -2. if you want to build for Debian stretch or newer, you have sbuild -0.70.0 or newer (there is a backport to jessie) +2. if you want to build for Debian stretch or newer, you have sbuild 0.70.0 or +newer (there is a backport to jessie) The latter is due to the migration from GnuPG v1 to GnuPG v2.1 in Debian stretch, which older sbuild can't handle. -- cgit v1.2.3 From 172a5c2003001e81d101904df465d65bde9357c8 Mon Sep 17 00:00:00 2001 From: Sean Whitton Date: Mon, 5 Sep 2016 11:17:10 -0700 Subject: typo --- src/Propellor/Property/Debootstrap.hs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Propellor/Property/Debootstrap.hs b/src/Propellor/Property/Debootstrap.hs index 69ac036a..c0226b7e 100644 --- a/src/Propellor/Property/Debootstrap.hs +++ b/src/Propellor/Property/Debootstrap.hs @@ -168,7 +168,7 @@ sourceInstall' = withTmpDir "debootstrap" $ \tmpd -> do makeDevicesTarball makeWrapperScript (localInstallDir subdir) return MadeChange - _ -> errorMessage "debootstrap tar file did not contain exactly one dirctory" + _ -> errorMessage "debootstrap tar file did not contain exactly one directory" sourceRemove :: Property Linux sourceRemove = property "debootstrap not installed from source" $ liftIO $ -- cgit v1.2.3 From 695f3f1aa70468671dc09894324d92f23d5283ae Mon Sep 17 00:00:00 2001 From: Sean Whitton Date: Mon, 5 Sep 2016 11:27:41 -0700 Subject: schroot config additions now ensured on each spin Previously, they were only ensured when first building the schroot. --- src/Propellor/Property/Sbuild.hs | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/src/Propellor/Property/Sbuild.hs b/src/Propellor/Property/Sbuild.hs index d385b2a6..c05f47e7 100644 --- a/src/Propellor/Property/Sbuild.hs +++ b/src/Propellor/Property/Sbuild.hs @@ -136,7 +136,7 @@ builtFor sys = go deleted -- | Build and configure a schroot for use with sbuild built :: SbuildSchroot -> Apt.Url -> RevertableProperty DebianLike UnixLike built s@(SbuildSchroot suite arch) mirror = - (go + ((go `before` enhancedConf) `requires` ccachePrepared `requires` installed `requires` overlaysKernel) @@ -157,10 +157,7 @@ built s@(SbuildSchroot suite arch) mirror = ] ifM (liftIO $ boolSystemEnv "sbuild-createchroot" params (Just de)) - ( ensureProperty w $ - fixConfFile s - `before` aliasesLine - `before` commandPrefix + ( ensureProperty w $ fixConfFile s , return FailedChange ) -- TODO we should kill any sessions still using the chroot @@ -172,6 +169,16 @@ built s@(SbuildSchroot suite arch) mirror = ("/etc/sbuild/chroot" show s ++ "-sbuild") makeChange $ nukeFile (schrootConf s) + enhancedConf = + combineProperties ("enhanced schroot conf for " ++ show s) $ props + & aliasesLine + -- enable ccache and eatmydata for speed + & ConfFile.containsIniSetting (schrootConf s) + [ show s ++ "-sbuild" + , "command-prefix" + , "/var/cache/ccache-sbuild/sbuild-setup,eatmydata" + ] + -- if we're building a sid chroot, add useful aliases -- In order to avoid more than one schroot getting the same aliases, we -- only do this if the arch of the chroot equals the host arch. @@ -186,10 +193,6 @@ built s@(SbuildSchroot suite arch) mirror = schrootConf s `File.containsLine` aliases else return NoChange - -- enable ccache and eatmydata for speed - commandPrefix = File.containsLine (schrootConf s) - "command-prefix=/var/cache/ccache-sbuild/sbuild-setup,eatmydata" - -- If the user has indicated that this host should use -- union-type=overlay schroots, we need to ensure that we have rebooted -- to a kernel supporting OverlayFS before we execute -- cgit v1.2.3 From 25547675038708e6925849c8caf7ad208d35a4ee Mon Sep 17 00:00:00 2001 From: Sean Whitton Date: Mon, 5 Sep 2016 11:37:17 -0700 Subject: update Sbuild.piupartsConf docstring --- src/Propellor/Property/Sbuild.hs | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/Propellor/Property/Sbuild.hs b/src/Propellor/Property/Sbuild.hs index c05f47e7..102f5387 100644 --- a/src/Propellor/Property/Sbuild.hs +++ b/src/Propellor/Property/Sbuild.hs @@ -174,10 +174,10 @@ built s@(SbuildSchroot suite arch) mirror = & aliasesLine -- enable ccache and eatmydata for speed & ConfFile.containsIniSetting (schrootConf s) - [ show s ++ "-sbuild" + ( show s ++ "-sbuild" , "command-prefix" , "/var/cache/ccache-sbuild/sbuild-setup,eatmydata" - ] + ) -- if we're building a sid chroot, add useful aliases -- In order to avoid more than one schroot getting the same aliases, we @@ -294,12 +294,12 @@ piupartsConfFor sys = property' ("piuparts schroot conf for " ++ show sys) $ -- piuparts in their @~/.sbuildrc@, which is inconvenient. -- -- To make use of this new schroot config, you can put something like this in --- your ~/.sbuildrc: +-- your ~/.sbuildrc (sbuild 0.71.0 or newer): -- -- > $run_piuparts = 1; -- > $piuparts_opts = [ -- > '--schroot', --- > 'unstable-i386-piuparts', +-- > '%r-%a-piuparts', -- > '--fail-if-inadequate', -- > '--fail-on-broken-symlinks', -- > ]; -- cgit v1.2.3 From 25ba5821b4ad0d747701dd5efa70f151238b7f75 Mon Sep 17 00:00:00 2001 From: Sean Whitton Date: Mon, 5 Sep 2016 11:54:52 -0700 Subject: add UNRELEASED-arch-sbuild alias for dgit --- debian/changelog | 2 ++ src/Propellor/Property/Sbuild.hs | 23 +++++++++++++++++++++-- 2 files changed, 23 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 9ee8f6e7..423d98da 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,5 +1,7 @@ propellor (3.1.3) UNRELEASED; urgency=medium + * Sbuild.built: add an additional alias to sid chroots for compatibility with + dgit * Fix Sbuild.hs haddock formatting error. -- Sean Whitton Mon, 05 Sep 2016 11:14:52 -0700 diff --git a/src/Propellor/Property/Sbuild.hs b/src/Propellor/Property/Sbuild.hs index 102f5387..55e764f9 100644 --- a/src/Propellor/Property/Sbuild.hs +++ b/src/Propellor/Property/Sbuild.hs @@ -190,7 +190,12 @@ built s@(SbuildSchroot suite arch) mirror = Just (System _ hostArch) -> if suite == "unstable" && hostArch == arch then ensureProperty w $ - schrootConf s `File.containsLine` aliases + ConfFile.containsIniSetting + (schrootConf s) + ( show s ++ "-sbuild" + , "aliases" + , aliases + ) else return NoChange -- If the user has indicated that this host should use @@ -217,7 +222,21 @@ built s@(SbuildSchroot suite arch) mirror = , return False ) - aliases = "aliases=UNRELEASED,sid,rc-buggy,experimental" + aliases = intercalate "," + [ "sid" + -- if the user wants to build for experimental, they would use + -- their sid chroot and sbuild's --extra-repository option to + -- enable experimental + , "rc-buggy" + , "experimental" + -- we assume that building for UNRELEASED means building for + -- unstable + , "UNRELEASED" + -- the following is for dgit compatibility: + , "UNRELEASED-" + ++ architectureToDebianArchString arch + ++ "-sbuild" + ] -- | Ensure that an sbuild schroot's packages and apt indexes are updated -- -- cgit v1.2.3 From 889ece4ab70023908c57505ada560d44989bbecd Mon Sep 17 00:00:00 2001 From: Sean Whitton Date: Mon, 5 Sep 2016 13:40:07 -0700 Subject: factor out code to check host arch --- src/Propellor/Property/Sbuild.hs | 41 ++++++++++++++++++++++++++-------------- 1 file changed, 27 insertions(+), 14 deletions(-) diff --git a/src/Propellor/Property/Sbuild.hs b/src/Propellor/Property/Sbuild.hs index 55e764f9..4768bd7d 100644 --- a/src/Propellor/Property/Sbuild.hs +++ b/src/Propellor/Property/Sbuild.hs @@ -183,20 +183,17 @@ built s@(SbuildSchroot suite arch) mirror = -- In order to avoid more than one schroot getting the same aliases, we -- only do this if the arch of the chroot equals the host arch. aliasesLine :: Property UnixLike - aliasesLine = property' "maybe set aliases line" $ \w -> do - maybeOS <- getOS - case maybeOS of - Nothing -> return NoChange - Just (System _ hostArch) -> - if suite == "unstable" && hostArch == arch - then ensureProperty w $ - ConfFile.containsIniSetting - (schrootConf s) - ( show s ++ "-sbuild" - , "aliases" - , aliases - ) - else return NoChange + aliasesLine = property' "maybe set aliases line" $ \w -> + sidHostArchSchroot s >>= \isSidHostArchSchroot -> + if isSidHostArchSchroot + then ensureProperty w $ + ConfFile.containsIniSetting + (schrootConf s) + ( show s ++ "-sbuild" + , "aliases" + , aliases + ) + else return NoChange -- If the user has indicated that this host should use -- union-type=overlay schroots, we need to ensure that we have rebooted @@ -490,3 +487,19 @@ schrootConf (SbuildSchroot s a) = schrootPiupartsConf :: SbuildSchroot -> FilePath schrootPiupartsConf (SbuildSchroot s a) = "/etc/schroot/chroot.d" s ++ "-" ++ architectureToDebianArchString a ++ "-piuparts-propellor" + +-- Determine whether a schroot is +-- +-- (i) Debian sid, and +-- (ii) the same architecture as the host. +-- +-- This is the "sid host arch schroot". It is considered the default schroot +-- for sbuild builds, so we add useful aliases that work well with the suggested +-- ~/.sbuildrc given in the haddock +sidHostArchSchroot :: SbuildSchroot -> Propellor Bool +sidHostArchSchroot (SbuildSchroot suite arch) = do + maybeOS <- getOS + case maybeOS of + Nothing -> return False + Just (System _ hostArch) -> + return $ suite == "unstable" && hostArch == arch -- cgit v1.2.3 From 9283e091041d002d83dfd711d0776fa31288d5ec Mon Sep 17 00:00:00 2001 From: Sean Whitton Date: Mon, 5 Sep 2016 13:48:24 -0700 Subject: add UNRELEASED-arch-piuparts alias for dgit --- debian/changelog | 4 ++-- src/Propellor/Property/Sbuild.hs | 51 +++++++++++++++++++++++----------------- 2 files changed, 31 insertions(+), 24 deletions(-) diff --git a/debian/changelog b/debian/changelog index 423d98da..81684955 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,7 +1,7 @@ propellor (3.1.3) UNRELEASED; urgency=medium - * Sbuild.built: add an additional alias to sid chroots for compatibility with - dgit + * Sbuild.built & Sbuild.piupartsConf: add an additional alias to sid chroots + This is for compatibility with `dgit sbuild`. * Fix Sbuild.hs haddock formatting error. -- Sean Whitton Mon, 05 Sep 2016 11:14:52 -0700 diff --git a/src/Propellor/Property/Sbuild.hs b/src/Propellor/Property/Sbuild.hs index 4768bd7d..909aae65 100644 --- a/src/Propellor/Property/Sbuild.hs +++ b/src/Propellor/Property/Sbuild.hs @@ -320,37 +320,44 @@ piupartsConfFor sys = property' ("piuparts schroot conf for " ++ show sys) $ -- > '--fail-on-broken-symlinks', -- > ]; piupartsConf :: SbuildSchroot -> Apt.Url -> Property DebianLike -piupartsConf s u = go +piupartsConf s@(SbuildSchroot _ arch) u = go `requires` (setupRevertableProperty $ built s u) - `describe` ("piuparts schroot conf for " ++ show s) where go :: Property DebianLike - go = tightenTargets $ - check (not <$> doesFileExist f) - (File.basedOn f (schrootConf s, map munge)) - `before` - ConfFile.containsIniSetting f (sec, "profile", "piuparts") - `before` - ConfFile.containsIniSetting f (sec, "aliases", "") - `before` - ConfFile.containsIniSetting f (sec, "command-prefix", "") - `before` - File.dirExists dir - `before` - File.isSymlinkedTo (dir "copyfiles") - (File.LinkTarget $ orig "copyfiles") - `before` - File.isSymlinkedTo (dir "nssdatabases") - (File.LinkTarget $ orig "nssdatabases") - `before` - File.basedOn (dir "fstab") - (orig "fstab", filter (/= aptCacheLine)) + go = property' desc $ \w -> do + aliases <- aliasesLine + ensureProperty w $ combineProperties desc $ props + & check (not <$> doesFileExist f) + (File.basedOn f (schrootConf s, map munge)) + & ConfFile.containsIniSetting f + (sec, "profile", "piuparts") + & ConfFile.containsIniSetting f + (sec, "aliases", aliases) + & ConfFile.containsIniSetting f + (sec, "command-prefix", "") + & File.dirExists dir + & File.isSymlinkedTo (dir "copyfiles") + (File.LinkTarget $ orig "copyfiles") + & File.isSymlinkedTo (dir "nssdatabases") + (File.LinkTarget $ orig "nssdatabases") + & File.basedOn (dir "fstab") + (orig "fstab", filter (/= aptCacheLine)) orig = "/etc/schroot/sbuild" dir = "/etc/schroot/piuparts" sec = show s ++ "-piuparts" f = schrootPiupartsConf s munge = replace "-sbuild]" "-piuparts]" + desc = "piuparts schroot conf for " ++ show s + + -- normally the piuparts schroot conf has no aliases, but we have to add + -- one, for dgit compatibility, if this is the default sid chroot + aliasesLine = sidHostArchSchroot s >>= \isSidHostArchSchroot -> + return $ if isSidHostArchSchroot + then "UNRELEASED-" + ++ architectureToDebianArchString arch + ++ "-piuparts" + else "" -- | Bind-mount /var/cache/apt/archives in all sbuild chroots so that the host -- system and the chroot share the apt cache -- cgit v1.2.3 From 5558632f37eb036c80e541b04128ad5eb6b5f4e9 Mon Sep 17 00:00:00 2001 From: Sean Whitton Date: Mon, 5 Sep 2016 14:15:16 -0700 Subject: piupartsConf{,For} doesn't require Sbuild.built Instead, do nothing if the corresponding schroot config does not yet exist. This change is needed because I intend to introduce an additional parameter to Sbuild.built{,For} in a subsequent commit, and it would overcomplicate things to make that an item of Info. --- debian/changelog | 8 ++++++-- src/Propellor/Property/Sbuild.hs | 15 +++++++++------ 2 files changed, 15 insertions(+), 8 deletions(-) diff --git a/debian/changelog b/debian/changelog index 81684955..c2078f6f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,12 @@ -propellor (3.1.3) UNRELEASED; urgency=medium +propellor (3.2.0) UNRELEASED; urgency=medium * Sbuild.built & Sbuild.piupartsConf: add an additional alias to sid chroots This is for compatibility with `dgit sbuild`. - * Fix Sbuild.hs haddock formatting error. + * Sbuild.piupartsConf: no longer takes an Apt.Url. (API Change) + * Sbuild.piupartsConf & Sbuild.piupartsConfFor: does nothing if corresponding + schroot not built. + Previously, this property built the schroot if it was missing. + * Further improvements to Sbuild.hs haddock. -- Sean Whitton Mon, 05 Sep 2016 11:14:52 -0700 diff --git a/src/Propellor/Property/Sbuild.hs b/src/Propellor/Property/Sbuild.hs index 909aae65..35b73ec6 100644 --- a/src/Propellor/Property/Sbuild.hs +++ b/src/Propellor/Property/Sbuild.hs @@ -292,9 +292,8 @@ fixConfFile s@(SbuildSchroot suite arch) = -- documentation for why you might want to use this property, and sample config. piupartsConfFor :: System -> Property DebianLike piupartsConfFor sys = property' ("piuparts schroot conf for " ++ show sys) $ - \w -> case (schrootFromSystem sys, stdMirror sys) of - (Just s, Just u) -> ensureProperty w $ - piupartsConf s u + \w -> case schrootFromSystem sys of + Just s -> ensureProperty w $ piupartsConf s _ -> errorMessage ("don't know how to debootstrap " ++ show sys) @@ -319,9 +318,13 @@ piupartsConfFor sys = property' ("piuparts schroot conf for " ++ show sys) $ -- > '--fail-if-inadequate', -- > '--fail-on-broken-symlinks', -- > ]; -piupartsConf :: SbuildSchroot -> Apt.Url -> Property DebianLike -piupartsConf s@(SbuildSchroot _ arch) u = go - `requires` (setupRevertableProperty $ built s u) +-- +-- This property has no effect if the corresponding sbuild schroot does not +-- exist (i.e. you also need 'Sbuild.built' or 'Sbuild.builtFor'). +piupartsConf :: SbuildSchroot -> Property DebianLike +piupartsConf s@(SbuildSchroot _ arch) = + check (doesFileExist (schrootConf s)) go + `requires` installed where go :: Property DebianLike go = property' desc $ \w -> do -- cgit v1.2.3 From 33a2aef1f0968289c65dc019592c3360383a94cf Mon Sep 17 00:00:00 2001 From: Sean Whitton Date: Mon, 5 Sep 2016 14:37:49 -0700 Subject: Sbuild.built: ccache usage now toggleable --- debian/changelog | 2 ++ src/Propellor/Property/Sbuild.hs | 36 +++++++++++++++++++++++++++--------- 2 files changed, 29 insertions(+), 9 deletions(-) diff --git a/debian/changelog b/debian/changelog index c2078f6f..eabadf95 100644 --- a/debian/changelog +++ b/debian/changelog @@ -6,6 +6,8 @@ propellor (3.2.0) UNRELEASED; urgency=medium * Sbuild.piupartsConf & Sbuild.piupartsConfFor: does nothing if corresponding schroot not built. Previously, this property built the schroot if it was missing. + * Using ccache with Sbuild.built & Sbuild.builtFor is now toggleable: these + properties now take a parameter of type Sbuild.UseCcache. (API Change) * Further improvements to Sbuild.hs haddock. -- Sean Whitton Mon, 05 Sep 2016 11:14:52 -0700 diff --git a/src/Propellor/Property/Sbuild.hs b/src/Propellor/Property/Sbuild.hs index 35b73ec6..c3e55bbf 100644 --- a/src/Propellor/Property/Sbuild.hs +++ b/src/Propellor/Property/Sbuild.hs @@ -21,7 +21,7 @@ Debian stretch, which older sbuild can't handle. Suggested usage in @config.hs@: > & Apt.installed ["piuparts", "autopkgtest"] -> & Sbuild.builtFor (System (Debian Linux Unstable) X86_32) +> & Sbuild.builtFor (System (Debian Linux Unstable) X86_32) Sbuild.UseCcache > & Sbuild.piupartsConfFor (System (Debian Linux Unstable) X86_32) > & Sbuild.updatedFor (System (Debian Linux Unstable) X86_32) `period` Weekly 1 > & Sbuild.usableBy (User "spwhitton") @@ -71,6 +71,7 @@ cacher. In that case you can do something like this in @config.hs@: module Propellor.Property.Sbuild ( -- * Creating and updating sbuild schroots SbuildSchroot(..), + UseCcache(..), built, updated, piupartsConf, @@ -113,31 +114,37 @@ data SbuildSchroot = SbuildSchroot Suite Architecture instance Show SbuildSchroot where show (SbuildSchroot suite arch) = suite ++ "-" ++ architectureToDebianArchString arch +-- | Whether an sbuild schroot should use ccache during builds +-- +-- ccache is generally useful but it breaks building some packages. This data +-- types allows you to toggle it on and off for particular schroots. +data UseCcache = UseCcache | NoCcache + -- | Build and configure a schroot for use with sbuild using a distribution's -- standard mirror -- -- This function is a convenience wrapper around 'built', allowing the user to -- identify the schroot and distribution using the 'System' type -builtFor :: System -> RevertableProperty DebianLike UnixLike -builtFor sys = go deleted +builtFor :: System -> UseCcache -> RevertableProperty DebianLike UnixLike +builtFor sys cc = go deleted where go = property' ("sbuild schroot for " ++ show sys) $ \w -> case (schrootFromSystem sys, stdMirror sys) of (Just s, Just u) -> ensureProperty w $ - setupRevertableProperty $ built s u + setupRevertableProperty $ built s u cc _ -> errorMessage ("don't know how to debootstrap " ++ show sys) deleted = property' ("no sbuild schroot for " ++ show sys) $ \w -> case schrootFromSystem sys of Just s -> ensureProperty w $ - undoRevertableProperty $ built s "dummy" + undoRevertableProperty $ built s "dummy" cc Nothing -> noChange -- | Build and configure a schroot for use with sbuild -built :: SbuildSchroot -> Apt.Url -> RevertableProperty DebianLike UnixLike -built s@(SbuildSchroot suite arch) mirror = +built :: SbuildSchroot -> Apt.Url -> UseCcache -> RevertableProperty DebianLike UnixLike +built s@(SbuildSchroot suite arch) mirror cc = ((go `before` enhancedConf) - `requires` ccachePrepared + `requires` ccacheMaybePrepared cc `requires` installed `requires` overlaysKernel) deleted @@ -176,7 +183,7 @@ built s@(SbuildSchroot suite arch) mirror = & ConfFile.containsIniSetting (schrootConf s) ( show s ++ "-sbuild" , "command-prefix" - , "/var/cache/ccache-sbuild/sbuild-setup,eatmydata" + , intercalate "," commandPrefix ) -- if we're building a sid chroot, add useful aliases @@ -235,6 +242,12 @@ built s@(SbuildSchroot suite arch) mirror = ++ "-sbuild" ] + commandPrefix = case cc of + UseCcache -> "/var/cache/ccache-sbuild/sbuild-setup":base + _ -> base + where + base = ["eatmydata"] + -- | Ensure that an sbuild schroot's packages and apt indexes are updated -- -- This function is a convenience wrapper around 'updated', allowing the user to @@ -438,6 +451,11 @@ keypairInsecurelyGenerated = check (not <$> doesFileExist secKeyFile) go ["kill $(cat /var/run/rngd.pid)"] `assume` MadeChange +ccacheMaybePrepared :: UseCcache -> Property DebianLike +ccacheMaybePrepared cc = case cc of + UseCcache -> ccachePrepared + NoCcache -> doNothing + -- another script from wiki.d.o/sbuild ccachePrepared :: Property DebianLike ccachePrepared = propertyList "sbuild group ccache configured" $ props -- cgit v1.2.3 From 3bb1fb8434c49ee80ea231be2d2ce6b687a8190f Mon Sep 17 00:00:00 2001 From: Sean Whitton Date: Mon, 5 Sep 2016 17:19:35 -0700 Subject: changelog tweaks --- debian/changelog | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/debian/changelog b/debian/changelog index eabadf95..8f5ae80b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,13 +1,13 @@ propellor (3.2.0) UNRELEASED; urgency=medium - * Sbuild.built & Sbuild.piupartsConf: add an additional alias to sid chroots - This is for compatibility with `dgit sbuild`. + * Using ccache with Sbuild.built & Sbuild.builtFor is now toggleable: these + properties now take a parameter of type Sbuild.UseCcache. (API Change) * Sbuild.piupartsConf: no longer takes an Apt.Url. (API Change) * Sbuild.piupartsConf & Sbuild.piupartsConfFor: does nothing if corresponding schroot not built. - Previously, this property built the schroot if it was missing. - * Using ccache with Sbuild.built & Sbuild.builtFor is now toggleable: these - properties now take a parameter of type Sbuild.UseCcache. (API Change) + Previously, these properties built the schroot if it was missing. + * Sbuild.built & Sbuild.piupartsConf: add an additional alias to sid chroots. + This is for compatibility with `dgit sbuild`. * Further improvements to Sbuild.hs haddock. -- Sean Whitton Mon, 05 Sep 2016 11:14:52 -0700 -- cgit v1.2.3