summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoey Hess2016-03-09 11:04:59 -0400
committerJoey Hess2016-03-09 11:04:59 -0400
commit05911e0db9369b99db2054dfbbfe9eb9a7236530 (patch)
treec240584e4887f5d3f01d6c1691130885d52ae019
parent29c6dcda77ee8348f7c8b292d61d363a6d699e26 (diff)
parentf045116b618e255c583376447be635c245d63909 (diff)
Merge branch 'joeyconfig'
-rw-r--r--Makefile2
-rw-r--r--debian/changelog31
-rw-r--r--joeyconfig.hs2
-rw-r--r--src/Propellor/Bootstrap.hs4
4 files changed, 21 insertions, 18 deletions
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
diff --git a/debian/changelog b/debian/changelog
index 462cad65..a8fb5ecc 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,28 +1,31 @@
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.
+ * Speed up propellor's build of itself, by asking cabal to only build
+ the propellor-config binary and not all the libraries.
-- Joey Hess <id@joeyh.name> Mon, 29 Feb 2016 17:58:08 -0400
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
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"