highperfocused/bitcoin
1
0
Fork 0
mirror of https://github.com/bitcoin/bitcoin.git synced 2026-06-02 09:15:04 +02:00
Code Issues Packages Projects Releases Wiki Activity

guix, refactor: Add BASE argument to *_for_host functions

Browse Source
This commit is contained in:
Hennadii Stepanov
2026-04-29 11:45:43 +01:00
parent 5d46429e32
commit 62cf7bc53f
3 changed files with 24 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
contrib/guix/guix-build
View File

@@ -321,7 +321,6 @@ for host in $HOSTS; do
# for the particular $HOST we're building for
export HOST="$host"
# shellcheck disable=SC2030
cat << EOF
INFO: Building ${VERSION:?not set} for platform triple ${HOST:?not set}:
...using reference timestamp: ${SOURCE_DATE_EPOCH:?not set}
@@ -329,9 +328,9 @@ INFO: Building ${VERSION:?not set} for platform triple ${HOST:?not set}:
...from worktree directory: '${PWD}'
...bind-mounted in container to: '/bitcoin'
...in build directory: '$(distsrc_for_host "$HOST")'
...bind-mounted in container to: '$(DISTSRC_BASE=/distsrc-base && distsrc_for_host "$HOST")'
...bind-mounted in container to: '$(distsrc_for_host "$HOST" "" /distsrc-base)'
...outputting in: '$(outdir_for_host "$HOST")'
...bind-mounted in container to: '$(OUTDIR_BASE=/outdir-base && outdir_for_host "$HOST")'
...bind-mounted in container to: '$(outdir_for_host "$HOST" "" /outdir-base)'
ADDITIONAL FLAGS (if set)
ADDITIONAL_GUIX_COMMON_FLAGS: ${ADDITIONAL_GUIX_COMMON_FLAGS}
ADDITIONAL_GUIX_ENVIRONMENT_FLAGS: ${ADDITIONAL_GUIX_ENVIRONMENT_FLAGS}
@@ -405,7 +404,7 @@ EOF
# Please read the README.md in the same directory as this file for
# more information.
#
# shellcheck disable=SC2086,SC2031
# shellcheck disable=SC2086
time-machine shell --manifest="${PWD}/contrib/guix/manifest_build.scm" \
--container \
--writable-root \
@@ -433,8 +432,8 @@ EOF
${SOURCES_PATH:+SOURCES_PATH="$SOURCES_PATH"} \
${BASE_CACHE:+BASE_CACHE="$BASE_CACHE"} \
${SDK_PATH:+SDK_PATH="$SDK_PATH"} \
DISTSRC="$(DISTSRC_BASE=/distsrc-base && distsrc_for_host "$HOST")" \
OUTDIR="$(OUTDIR_BASE=/outdir-base && outdir_for_host "$HOST")" \
DISTSRC="$(distsrc_for_host "$HOST" "" /distsrc-base)" \
OUTDIR="$(outdir_for_host "$HOST" "" /outdir-base)" \
DIST_ARCHIVE_BASE=/outdir-base/dist-archive \
bash -c "cd /bitcoin && bash contrib/guix/libexec/build.sh"
)

22
contrib/guix/guix-codesign
View File

@@ -138,13 +138,18 @@ fi
# Codesigning tarballs SHOULD exist
################
# Usage: codesigning_tarball_for_host HOST [BASE]
#
# HOST: The current platform triple we're building for
# BASE: Optional. If provided, replaces ${OUTDIR_BASE}
#
codesigning_tarball_for_host() {
case "$1" in
*mingw*)
echo "$(outdir_for_host "$1")/${DISTNAME}-win64-codesigning.tar.gz"
echo "$(outdir_for_host "$1" "" "$2")/${DISTNAME}-win64-codesigning.tar.gz"
;;
*darwin*)
echo "$(outdir_for_host "$1")/${DISTNAME}-${1}-codesigning.tar.gz"
echo "$(outdir_for_host "$1" "" "$2")/${DISTNAME}-${1}-codesigning.tar.gz"
;;
*)
exit 1
@@ -249,16 +254,15 @@ for host in $HOSTS; do
# for the particular $HOST we're building for
export HOST="$host"
# shellcheck disable=SC2030
cat << EOF
INFO: Codesigning ${VERSION:?not set} for platform triple ${HOST:?not set}:
...using reference timestamp: ${SOURCE_DATE_EPOCH:?not set}
...from worktree directory: '${PWD}'
...bind-mounted in container to: '/bitcoin'
...in build directory: '$(distsrc_for_host "$HOST" codesigned)'
...bind-mounted in container to: '$(DISTSRC_BASE=/distsrc-base && distsrc_for_host "$HOST" codesigned)'
...bind-mounted in container to: '$(distsrc_for_host "$HOST" codesigned /distsrc-base)'
...outputting in: '$(outdir_for_host "$HOST" codesigned)'
...bind-mounted in container to: '$(OUTDIR_BASE=/outdir-base && outdir_for_host "$HOST" codesigned)'
...bind-mounted in container to: '$(outdir_for_host "$HOST" codesigned /outdir-base)'
...using detached signatures in: '${DETACHED_SIGS_REPO:?not set}'
...bind-mounted in container to: '/detached-sigs'
EOF
@@ -315,7 +319,7 @@ EOF
# Please read the README.md in the same directory as this file for
# more information.
#
# shellcheck disable=SC2086,SC2031
# shellcheck disable=SC2086
time-machine shell --manifest="${PWD}/contrib/guix/manifest_codesign.scm" \
--container \
--writable-root \
@@ -339,11 +343,11 @@ EOF
JOBS="$JOBS" \
SOURCE_DATE_EPOCH="${SOURCE_DATE_EPOCH:?unable to determine value}" \
${V:+V=1} \
DISTSRC="$(DISTSRC_BASE=/distsrc-base && distsrc_for_host "$HOST" codesigned)" \
OUTDIR="$(OUTDIR_BASE=/outdir-base && outdir_for_host "$HOST" codesigned)" \
DISTSRC="$(distsrc_for_host "$HOST" codesigned /distsrc-base)" \
OUTDIR="$(outdir_for_host "$HOST" codesigned /outdir-base)" \
DIST_ARCHIVE_BASE=/outdir-base/dist-archive \
DETACHED_SIGS_REPO=/detached-sigs \
CODESIGNING_TARBALL="$(OUTDIR_BASE=/outdir-base && codesigning_tarball_for_host "$HOST")" \
CODESIGNING_TARBALL="$(codesigning_tarball_for_host "$HOST" /outdir-base)" \
bash -c "cd /bitcoin && bash contrib/guix/libexec/codesign.sh"
)

10
contrib/guix/libexec/prelude.bash
View File

@@ -80,22 +80,24 @@ time-machine() {
-- "$@"
}
# Usage: distsrc_for_host HOST [SUFFIX]
# Usage: distsrc_for_host HOST [SUFFIX] [BASE]
#
# HOST: The current platform triple we're building for
# SUFFIX: Optional. If provided, appended to the directory name as "-SUFFIX"
# BASE: Optional. If provided, replaces ${DISTSRC_BASE}
#
distsrc_for_host() {
echo "${DISTSRC_BASE}/distsrc-${VERSION}-${1}${2:+-${2}}"
echo "${3:-${DISTSRC_BASE}}/distsrc-${VERSION}-${1}${2:+-${2}}"
}
# Usage: outdir_for_host HOST [SUFFIX]
# Usage: outdir_for_host HOST [SUFFIX] [BASE]
#
# HOST: The current platform triple we're building for
# SUFFIX: Optional. If provided, appended to the directory name as "-SUFFIX"
# BASE: Optional. If provided, replaces ${OUTDIR_BASE}
#
outdir_for_host() {
echo "${OUTDIR_BASE}/${1}${2:+-${2}}"
echo "${3:-${OUTDIR_BASE}}/${1}${2:+-${2}}"
}
# Usage: profiledir_for_host HOST [SUFFIX]