Skip to content

Commit 56f06a9

Browse files
committed
Merge #21271: guix: Explicitly set umask in build container
d98f459 guix: Explicitly set umask in build container (Carl Dong) Pull request description: Opened as a separate PR to fix non-reproducibility found through testing here: bitcoin/bitcoin#21089 (comment) Many thanks to everyone who helped find this! ACKs for top commit: laanwj: ACK d98f459 fanquake: ACK d98f459 - I'm seeing matching hashes. Tree-SHA512: ea339c3902f2f4dea32e8ef5cc675a1df0679530881260ae999aaaf7339d5b12c46e01e58677cbb079f33e573ad105e2b443a835f3e944ef8e943a25f83027f1
2 parents b54a10e + d98f459 commit 56f06a9

File tree

1 file changed

+10
-0
lines changed

1 file changed

+10
-0
lines changed

contrib/guix/libexec/build.sh

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,16 @@ export LC_ALL=C
33
set -e -o pipefail
44
export TZ=UTC
55

6+
# Althought Guix _does_ set umask when building its own packages (in our case,
7+
# this is all packages in manifest.scm), it does not set it for `guix
8+
# environment`. It does make sense for at least `guix environment --container`
9+
# to set umask, so if that change gets merged upstream and we bump the
10+
# time-machine to a commit which includes the aforementioned change, we can
11+
# remove this line.
12+
#
13+
# This line should be placed before any commands which creates files.
14+
umask 0022
15+
616
if [ -n "$V" ]; then
717
# Print both unexpanded (-v) and expanded (-x) forms of commands as they are
818
# read from this file.

0 commit comments

Comments
 (0)