Source: west-chamber
Severity: normal
Tags: patch
User: reproducible-bui...@lists.alioth.debian.org
Usertags: fileordering
X-Debbugs-Cc: reproducible-b...@lists.alioth.debian.org

The /usr/src/west-chamber.tar.bz2 tarball sometimes has variable
ordering of included files:

  
https://tests.reproducible-builds.org/debian/rb-pkg/unstable/i386/diffoscope-results/west-chamber.html

For some reason it does not appear to be triggered on the amd64 or arm64
architecture, but currently both i386 and armhf show this issue.


The attached patch fixes this by passing options to the tar command to
ensure consistent sort order, uid, gid, and pax headers:

  https://reproducible-builds.org/docs/archives/


Thanks for maintaining west-chamber!


live well,
  vagrant
From 235a50e55ae79837aee32b3fa681ae81b40abda7 Mon Sep 17 00:00:00 2001
From: Vagrant Cascadian <vagr...@reproducible-builds.org>
Date: Fri, 11 Dec 2020 22:41:57 +0000
Subject: [PATCH 1/2] debian/rules: Pass options to tar command to ensure
 consistent sort order, uid, gid, and pax headers.

https://reproducible-builds.org/docs/archives/
---
 debian/rules | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/debian/rules b/debian/rules
index 31b0123..9b4cf78 100755
--- a/debian/rules
+++ b/debian/rules
@@ -64,7 +64,11 @@ override_dh_auto_install:
 	        debian/$(psource)/usr/src/modules/$(sname)/debian/
 	cp debian/rules.modules \
 	        debian/$(psource)/usr/src/modules/$(sname)/debian/rules
-	cd debian/$(psource)/usr/src && tar c --mtime="$(BUILD_DATE)" modules | bzip2 -9 > $(sname).tar.bz2 && rm -rf modules
+	cd debian/$(psource)/usr/src && tar c --mtime="$(BUILD_DATE)" \
+		--sort=name \
+		--owner=0 --group=0 --numeric-owner \
+		--pax-option=exthdr.name=%d/PaxHeaders/%f,delete=atime,delete=ctime \
+		modules | bzip2 -9 > $(sname).tar.bz2 && rm -rf modules
 
 	# DKMS
 	# DKMS: Create the directories to install the source into
-- 
2.29.2

Attachment: signature.asc
Description: PGP signature

Reply via email to