From 5a45d14af14ad9a6547c06267c1356058985c3b8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20Pierret=20=28fepitre=29?= Date: Sat, 27 Feb 2021 16:16:58 +0100 Subject: [PATCH 1/2] spec: improve reproducibility when generating QT files --- Makefile | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Makefile b/Makefile index d063c736..924ca276 100644 --- a/Makefile +++ b/Makefile @@ -7,6 +7,8 @@ LRELEASE_QT5 ?= $(if $(wildcard /etc/debian_version),lrelease,lrelease-qt5) SETUPTOOLS_OPTS = SETUPTOOLS_OPTS += $(if $(wildcard /etc/debian_version),--install-layout=deb,) +export QT_HASH_SEED=0 + qubesmanager/ui_%.py: ui/%.ui pyuic5 --from-imports -o $@ $< From 340aa50063fe8f6eae89012ce86e811eb05e264b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20Pierret=20=28fepitre=29?= Date: Sat, 27 Feb 2021 16:17:19 +0100 Subject: [PATCH 2/2] Fix pyc unreproducibility Surprisingly, pyc does not have their modification time header respecting SDE but @marmarek found that was file time instead. --- Makefile | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Makefile b/Makefile index 924ca276..7341c5c1 100644 --- a/Makefile +++ b/Makefile @@ -8,14 +8,17 @@ SETUPTOOLS_OPTS = SETUPTOOLS_OPTS += $(if $(wildcard /etc/debian_version),--install-layout=deb,) export QT_HASH_SEED=0 +export PYTHONHASHSEED=0 qubesmanager/ui_%.py: ui/%.ui pyuic5 --from-imports -o $@ $< + touch --reference=$< $@ ui: $(patsubst ui/%.ui,qubesmanager/ui_%.py,$(wildcard ui/*.ui)) res: pyrcc5 -o qubesmanager/resources_rc.py resources.qrc + touch --reference=resources.qrc qubesmanager/resources_rc.py translations: $(LRELEASE_QT5) qubesmanager.pro