Skip to content

Commit 1d8cb78

Browse files
committed
Merge bitcoin/bitcoin#34309: guix: stop passing depends sources to codesigning
d94d7b1 guix: stop passing depends sources to codesigning (fanquake) Pull request description: I think this is just a copy-pasta from the build container (which has existed since this file was introduced in 38eb91e). I don't see why we'd need the depends sources available when performing codesigning. ACKs for top commit: hebasto: ACK d94d7b1, I have reviewed the code and it looks OK. willcl-ark: ACK d94d7b1 sedited: tACK d94d7b1 Tree-SHA512: 972b15aa022b79602f40c198187a54d85ceeee0014fd2232ca967bb52e4624cbb85b3ef1cdeac3ccd8c7b337a13c3be9c90291141495c8136a8e72ad2cd4ec4a
2 parents 7041648 + d94d7b1 commit 1d8cb78

File tree

1 file changed

+0
-12
lines changed

1 file changed

+0
-12
lines changed

contrib/guix/guix-codesign

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -328,16 +328,6 @@ EOF
328328
# container so that we have something to build. '/bitcoin' was
329329
# chosen arbitrarily.
330330
#
331-
# ${SOURCES_PATH:+--share="$SOURCES_PATH"}
332-
#
333-
# make the downloaded depends sources path available
334-
# inside the isolated container
335-
#
336-
# The isolated container has no network access as it's in a
337-
# different network namespace from the main machine, so we have to
338-
# make the downloaded depends sources available to it. The sources
339-
# should have been downloaded prior to this invocation.
340-
#
341331
# ${SUBSTITUTE_URLS:+--substitute-urls="$SUBSTITUTE_URLS"}
342332
#
343333
# fetch substitute from SUBSTITUTE_URLS if they are
@@ -359,7 +349,6 @@ EOF
359349
--share="$DETACHED_SIGS_REPO"=/detached-sigs \
360350
--expose="$(git rev-parse --git-common-dir)" \
361351
--expose="$(git -C "$DETACHED_SIGS_REPO" rev-parse --git-common-dir)" \
362-
${SOURCES_PATH:+--share="$SOURCES_PATH"} \
363352
--cores="$JOBS" \
364353
--keep-failed \
365354
--fallback \
@@ -372,7 +361,6 @@ EOF
372361
JOBS="$JOBS" \
373362
SOURCE_DATE_EPOCH="${SOURCE_DATE_EPOCH:?unable to determine value}" \
374363
${V:+V=1} \
375-
${SOURCES_PATH:+SOURCES_PATH="$SOURCES_PATH"} \
376364
DISTSRC="$(DISTSRC_BASE=/distsrc-base && distsrc_for_host "$HOST")" \
377365
OUTDIR="$(OUTDIR_BASE=/outdir-base && outdir_for_host "$HOST" codesigned)" \
378366
DIST_ARCHIVE_BASE=/outdir-base/dist-archive \

0 commit comments

Comments
 (0)