Commit 6a9c3899 authored by intrigeri's avatar intrigeri

Repair build reproducibility (refs: #14459).

In most cases, $BUILD_BASENAME contains a timestamp, so when building twice in
a row from the same commit, we could not have got the same ISO anymore.
parent 7396e42e
......@@ -5,7 +5,7 @@ set -x
. "$(dirname $0)/scripts/utils.sh"
# get $BUILD_BASENAME
. config/chroot_local-includes/usr/share/amnesia/build/variables
. tmp/build_environment
umask 022
......
......@@ -60,8 +60,8 @@ if [ "${TAILS_MERGE_BASE_BRANCH}" = 1 ] && \
fi
# save variables that lb build needs
echo "BUILD_BASENAME='${BUILD_BASENAME}'" \
>> config/chroot_local-includes/usr/share/amnesia/build/variables
mkdir -p tmp
echo "BUILD_BASENAME='${BUILD_BASENAME}'" > tmp/build_environment
# sanity checks
if grep -qs -E '^Pin:\s+release\s+.*a=' config/chroot_apt/preferences ; then
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment