[vlc-commits] share: sort tar file list

[Bernhard M. Wiedemann]

vlc/vlc-3.0 | branch: master | Bernhard M. Wiedemann <bwiedemann at suse.de> | Thu Jan 23 09:39:51 2020 +0100| [e4232b2dda5e4393eb60776efd8c2c705c594ffc] | committer: Jean-Baptiste Kempf

share: sort tar file list

if available (in GNU tar >= 1.28)
and use ustar format to not have pax headers add nondetermistic bits
to make skins2/default.vlt reproducible.

See https://reproducible-builds.org/ for why this is good.

This patch was done while working on reproducible builds for openSUSE.

Signed-off-by: Bernhard M. Wiedemann <bwiedemann at suse.de>
Signed-off-by: Thomas Guillem <thomas at gllm.fr>
(cherry picked from commit 87ea3c0dfb7367b434f688d657f931c074bb34f4)
Signed-off-by: Jean-Baptiste Kempf <jb at videolan.org>

> http://git.videolan.org/gitweb.cgi/vlc/vlc-3.0.git/?a=commit;h=e4232b2dda5e4393eb60776efd8c2c705c594ffc
---

 share/Makefile.am | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/share/Makefile.am b/share/Makefile.am
index 6d8cd9dc2f..2e58f014b8 100644
--- a/share/Makefile.am
+++ b/share/Makefile.am
@@ -92,8 +92,11 @@ skins2_default_vlt_FILES = \
 skins2/default.vlt: $(skins2_default_vlt_FILES)
 	$(AM_V_at)mkdir -p skins2
 	$(AM_V_at)rm -f -- skins2/default.vlt.tmp
-	$(AM_V_GEN)GZIP=--no-name \
+	$(AM_V_GEN)tarsort= ; \
+	tar --help|grep -q sort=ORDER && tarsort=--sort=name ; \
+	GZIP=--no-name \
 	tar cvvzf skins2/default.vlt.tmp \
+		--format=ustar $$tarsort \
 		--owner=root --group=root --directory="$(srcdir)/skins2" \
 		default/
 	$(AM_V_at)mv -f -- skins2/default.vlt.tmp skins2/default.vlt