summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorintrigeri <intrigeri@boum.org>2018-03-16 16:58:34 +0000
committerintrigeri <intrigeri@boum.org>2018-03-16 16:58:34 +0000
commit158b83c284d8a2489efd993527eec5eff3360348 (patch)
treef53823a9a83822fbc1cd68bf94f04ac4de855846
parent821bb4c5711efdd3c49894ccbfa63961b35f9d0e (diff)
parenta867dfd898275d60c935c739a676e6ddb99e2847 (diff)
Merge branch 'bugfix/15400-python-lib-breaks-reproducibility' into stable (Fix-committed: #15400)
-rwxr-xr-xconfig/chroot_local-hooks/00-install-tailslib9
1 files changed, 8 insertions, 1 deletions
diff --git a/config/chroot_local-hooks/00-install-tailslib b/config/chroot_local-hooks/00-install-tailslib
index 4be37e0..00f15d0 100755
--- a/config/chroot_local-hooks/00-install-tailslib
+++ b/config/chroot_local-hooks/00-install-tailslib
@@ -5,7 +5,7 @@ set -u
echo "Installing the tailslib python library"
-# Import ensure_hook_dependency_is_installed()
+# Import ensure_hook_dependency_is_installed() and strip_nondeterminism_wrapper()
. /usr/local/lib/tails-shell-library/build.sh
ensure_hook_dependency_is_installed python3-setuptools
@@ -14,5 +14,12 @@ ensure_hook_dependency_is_installed python3-setuptools
cd /tmp/pythonlib
python3 setup.py clean
python3 setup.py install
+
+ package_glob_pattern="/usr/local/lib/python3.*/dist-packages/Tailslib*.egg"
+ if [ ! -f ${package_glob_pattern} ]; then
+ echo "Cannot find Tailslib Python package \"${package_glob_pattern}\"" >&2
+ exit 1
+ fi
+ strip_nondeterminism_wrapper --type zip "$(realpath ${package_glob_pattern})" 2>/dev/null
)
rm -rf /tmp/pythonlib