summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Makefile5
-rw-r--r--debian/changelog8
2 files changed, 13 insertions, 0 deletions
diff --git a/Makefile b/Makefile
index 733e718c..d1809458 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,5 @@
CABAL?=cabal
+DATE := $(shell dpkg-parsechangelog | 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
@@ -17,10 +18,14 @@ install:
cat dist/propellor-*.tar.gz | (cd dist/gittmp && tar zx --strip-components=1)
# cabal sdist does not preserve symlinks, so copy over file
cd dist/gittmp && for f in $$(find -type f); do rm -f $$f; cp -a ../../$$f $$f; done
+ # reset mtime on files in git bundle so bundle is reproducible
+ find dist/gittmp -print0 | xargs -0r touch --no-dereference --date="$(DATE)"
export GIT_AUTHOR_NAME=build \
&& export GIT_AUTHOR_EMAIL=build@buildhost \
+ && export GIT_AUTHOR_DATE="$(DATE)" \
&& export GIT_COMMITTER_NAME=build \
&& export GIT_COMMITTER_EMAIL=build@buildhost \
+ && export GIT_COMMITTER_DATE="$(DATE)" \
&& cd dist/gittmp && git init \
&& git add . \
&& git commit -q -m "distributed version of propellor" \
diff --git a/debian/changelog b/debian/changelog
index 72145793..eadf65d2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+propellor (2.15.4) UNRELEASED; urgency=medium
+
+ * Build /usr/src/propellor/propellor.git reproducibly,
+ which makes the whole Debian package build reproducibly.
+ Thanks, Sean Whitton.
+
+ -- Joey Hess <id@joeyh.name> Mon, 18 Jan 2016 13:15:30 -0400
+
propellor (2.15.3) unstable; urgency=medium
* Added Git.bareRepoDefaultBranch property