From 8760c6162aae4c67a90986eda732412974cfaf76 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Tue, 8 Mar 2016 23:59:04 -0400 Subject: test --- joeyconfig.hs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/joeyconfig.hs b/joeyconfig.hs index bab8f466..1d9798ea 100644 --- a/joeyconfig.hs +++ b/joeyconfig.hs @@ -45,7 +45,7 @@ main = defaultMain hosts -- / \___-=O`/|O`/__| (____.' hosts :: [Host] -- * \ | | '--------' hosts = -- (o) ` [ darkstar - , gnu + , gnu , clam , mayfly , oyster -- cgit v1.2.3 From cc7b21ec7749a6458c303caa5a9bec27f93565d4 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Wed, 9 Mar 2016 00:03:51 -0400 Subject: avoid error message when dpkg-parsechangelog is not installed --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index d1809458..a9ad2b84 100644 --- a/Makefile +++ b/Makefile @@ -1,5 +1,5 @@ CABAL?=cabal -DATE := $(shell dpkg-parsechangelog | grep Date | cut -d " " -f2-) +DATE := $(shell dpkg-parsechangelog 2>/dev/null | grep Date | cut -d " " -f2-) # this target is provided (and is first) to keep old versions of the # propellor cron job working, and will eventually be removed -- cgit v1.2.3 From 6355696b84b0d1a6d1e75fc871109ae6b5c3d85e Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Wed, 9 Mar 2016 00:20:28 -0400 Subject: reorder --- debian/changelog | 29 +++++++++++++++-------------- 1 file changed, 15 insertions(+), 14 deletions(-) diff --git a/debian/changelog b/debian/changelog index 462cad65..2dc562bf 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,28 +1,29 @@ propellor (2.17.0) UNRELEASED; urgency=medium - * Apt.upgrade: Run dpkg --configure -a first, to recover from - interrupted upgrades. - * Apt: Add safeupgrade. - * Avoid repeated re-building on systems such as FreeBSD where building - re-links the binary even when there are no changes. + * Added initial support for FreeBSD. + Thanks, Evan Cofsky. + * Added Propellor.Property.ZFS. + Thanks, Evan Cofsky. * Firewall: Reorganized Chain data type. (API change) Thanks, Félix Sipma. * Firewall: Separated Table and Target (API change) Thanks, Félix Sipma. + * Ssh: change type of listenPort from Int to Port (API change) + Thanks, Félix Sipma. * Firewall: add TCPFlag, Frequency, TCPSyn, ICMPTypeMatch, NatDestination Thanks, Félix Sipma. + * Network: Filter out characters not allowed in interfaces.d files. + Thanks, Félix Sipma. + * Apt.upgrade: Run dpkg --configure -a first, to recover from + interrupted upgrades. + * Apt: Add safeupgrade. + * Force ssh, scp, and git commands to be run in the foreground. + Should fix intermittent hangs of propellor --spin. + * Avoid repeated re-building on systems such as FreeBSD where building + re-links the binary even when there are no changes. * Locale.available: Run locale-gen, instead of dpkg-reconfigure locales, which modified the locale.gen file and sometimes caused the property to need to make changes every time. - * Force ssh, scp, and git commands to be run in the foreground. - * Network: Filter out characters not allowed in interfaces.d files. - Thanks, Félix Sipma. - * Ssh: hange type of listenPort from Int to Port (API change) - Thanks, Félix Sipma. - * Added initial support for FreeBSD. - Thanks, Evan Cofsky. - * Added Propellor.Property.ZFS. - Thanks, Evan Cofsky. -- Joey Hess Mon, 29 Feb 2016 17:58:08 -0400 -- cgit v1.2.3 From f045116b618e255c583376447be635c245d63909 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Wed, 9 Mar 2016 01:29:37 -0400 Subject: Speed up propellor's build of itself, by asking cabal to only build the propellor-config binary and not all the libraries. This is a super speedup! --- debian/changelog | 2 ++ src/Propellor/Bootstrap.hs | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 2dc562bf..a8fb5ecc 100644 --- a/debian/changelog +++ b/debian/changelog @@ -24,6 +24,8 @@ propellor (2.17.0) UNRELEASED; urgency=medium * Locale.available: Run locale-gen, instead of dpkg-reconfigure locales, which modified the locale.gen file and sometimes caused the property to need to make changes every time. + * Speed up propellor's build of itself, by asking cabal to only build + the propellor-config binary and not all the libraries. -- Joey Hess Mon, 29 Feb 2016 17:58:08 -0400 diff --git a/src/Propellor/Bootstrap.hs b/src/Propellor/Bootstrap.hs index 11e59e6f..69eee66c 100644 --- a/src/Propellor/Bootstrap.hs +++ b/src/Propellor/Bootstrap.hs @@ -34,7 +34,7 @@ checkBinaryCommand = "if test -x ./propellor && ! ./propellor --check; then " ++ buildCommand :: ShellCommand buildCommand = intercalate " && " [ "cabal configure" - , "cabal build" + , "cabal build propellor-config" , "ln -sf dist/build/propellor-config/propellor-config propellor" ] @@ -141,7 +141,7 @@ build :: IO Bool build = catchBoolIO $ do make "dist/setup-config" ["propellor.cabal"] $ cabal ["configure"] - unlessM (cabal ["build"]) $ do + unlessM (cabal ["build", "propellor-config"]) $ do void $ cabal ["configure"] unlessM (cabal ["build"]) $ error "cabal build failed" -- cgit v1.2.3