summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJérémy Bobbio <lunar@debian.org>2014-12-28 11:52:01 (GMT)
committerCyril Brulebois <kibi@debian.org>2014-12-29 14:17:37 (GMT)
commit99f4a6062255b3622afc810fd6d69a51bfe2eda1 (patch)
tree2a6e499b0f096e6946b1106766d169d29c46116e
parent66c759fdb16f09a5da52b074e1980e623ce05ec1 (diff)
downloaddebootstrap-99f4a6062255b3622afc810fd6d69a51bfe2eda1.zip
debootstrap-99f4a6062255b3622afc810fd6d69a51bfe2eda1.tar.gz
debootstrap-99f4a6062255b3622afc810fd6d69a51bfe2eda1.tar.bz2
Use debian/changelog timestamp as mtime for devices.tar members (Closes: #774069)
We also remove the timestamp in gzip header. This enables debootstap to be built reproducibly. Signed-off-by: Cyril Brulebois <kibi@debian.org>
-rw-r--r--Makefile3
-rw-r--r--debian/changelog8
2 files changed, 10 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index 6f70f35..c2d93aa 100644
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,6 @@
# avoid dpkg-dev dependency; fish out the version with sed
VERSION := $(shell sed 's/.*(\(.*\)).*/\1/; q' debian/changelog)
+DATE := $(shell sed -n '/^ -- /{s/.*> \(.*\)/\1/p;q}' debian/changelog)
MAKEDEV := /sbin/MAKEDEV
@@ -35,7 +36,7 @@ devices.tar.gz:
chown 0:0 dev
chmod 755 dev
(cd dev && $(MAKEDEV) std ptmx fd consoleonly)
- tar cf - dev | gzip -9 >devices.tar.gz
+ tar --mtime="$(DATE)" -cf - dev | gzip -9n >devices.tar.gz
@if [ "$$(tar tvf devices.tar.gz | wc -l)" -lt 2 ]; then \
echo " ** devices.tar.gz is empty!" >&2; \
exit 1; \
diff --git a/debian/changelog b/debian/changelog
index 6095d86..925c8c6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+debootstrap (1.0.67) UNRELEASED; urgency=medium
+
+ * Apply patch by Jérémy Bobbio to support reproducible builds: specify
+ a modification time on the tar side, and add the -n option to gzip
+ (Closes: #774069). Thanks, Jérémy!
+
+ -- Cyril Brulebois <kibi@debian.org> Mon, 29 Dec 2014 15:01:57 +0100
+
debootstrap (1.0.66) unstable; urgency=low
[ Cyril Brulebois ]