From 54234525d1ab376699981ef0fca1db693a7e4c9d Mon Sep 17 00:00:00 2001 From: Sean Whitton Date: Sun, 17 Jan 2016 12:52:50 -0700 Subject: /usr/src/propellor/propellor.git date reproducible Take from last changelog entry. (cherry picked from commit ecb2811284c01caa9ed4470052f812bb8ba2471e) --- Makefile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index 733e718c..805bbd2b 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 @@ -23,7 +24,7 @@ install: && export GIT_COMMITTER_EMAIL=build@buildhost \ && cd dist/gittmp && git init \ && git add . \ - && git commit -q -m "distributed version of propellor" \ + && git commit --date="$(DATE)" -q -m "distributed version of propellor" \ && git bundle create $(DESTDIR)/usr/src/propellor/propellor.git master HEAD \ && git show-ref master --hash > $(DESTDIR)/usr/src/propellor/head rm -rf dist/gittmp -- cgit v1.2.3 From d4abec5bd37abab84923b3d91f50404512c09b74 Mon Sep 17 00:00:00 2001 From: Sean Whitton Date: Sun, 17 Jan 2016 13:18:32 -0700 Subject: reset mtime on files bundled by git (cherry picked from commit 6735b56eb8cdfd5cc2ddd3ae040fea4ae2b91c1e) --- Makefile | 2 ++ 1 file changed, 2 insertions(+) (limited to 'Makefile') diff --git a/Makefile b/Makefile index 805bbd2b..5621c7a7 100644 --- a/Makefile +++ b/Makefile @@ -18,6 +18,8 @@ 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_COMMITTER_NAME=build \ -- cgit v1.2.3 From 6e8f917f084eade3ac2adbe6b1350ab6c8ff3c82 Mon Sep 17 00:00:00 2001 From: Sean Whitton Date: Sun, 17 Jan 2016 14:01:45 -0700 Subject: set both author and committer date (cherry picked from commit 37b753ad62672488ad3fb4ac90316723ed27a1a7) --- Makefile | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index 5621c7a7..d1809458 100644 --- a/Makefile +++ b/Makefile @@ -22,11 +22,13 @@ install: 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 --date="$(DATE)" -q -m "distributed version of propellor" \ + && git commit -q -m "distributed version of propellor" \ && git bundle create $(DESTDIR)/usr/src/propellor/propellor.git master HEAD \ && git show-ref master --hash > $(DESTDIR)/usr/src/propellor/head rm -rf dist/gittmp -- cgit v1.2.3