mirror of
https://github.com/bitcoin/bitcoin.git
synced 2025-03-15 04:11:02 +01:00
guix: Record precious directories and add guix-clean
Many users have reported problems that stem from having an unclean working tree. To that end, I've written a guix-clean script which should help reset the working tree while respecting user-specified precious directories. Precious directories, such as: - SOURCES_PATH - BASE_CACHE - SDK_PATH - OUTDIR Should be preserved when cleaning the working tree, and are thus recorded in ./contrib/guix/var/precious_dirs. The ./contrib/guix/guix-clean script is able to parse that file and make sure to avoid them when cleaning out the working tree.
This commit is contained in:
parent
84912d4b24
commit
44f6d4f56b
3 changed files with 146 additions and 12 deletions
|
@ -178,12 +178,6 @@ host_to_commonname() {
|
||||||
esac
|
esac
|
||||||
}
|
}
|
||||||
|
|
||||||
# Download the depends sources now as we won't have internet access in the build
|
|
||||||
# container
|
|
||||||
for host in $HOSTS; do
|
|
||||||
make -C "${PWD}/depends" -j"$JOBS" download-"$(host_to_commonname "$host")" ${V:+V=1} ${SOURCES_PATH:+SOURCES_PATH="$SOURCES_PATH"}
|
|
||||||
done
|
|
||||||
|
|
||||||
# Determine the reference time used for determinism (overridable by environment)
|
# Determine the reference time used for determinism (overridable by environment)
|
||||||
SOURCE_DATE_EPOCH="${SOURCE_DATE_EPOCH:-$(git log --format=%at -1)}"
|
SOURCE_DATE_EPOCH="${SOURCE_DATE_EPOCH:-$(git log --format=%at -1)}"
|
||||||
|
|
||||||
|
@ -201,10 +195,70 @@ time-machine() {
|
||||||
-- "$@"
|
-- "$@"
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
# Precious directories are those which should not be cleaned between successive
|
||||||
|
# guix builds
|
||||||
|
depends_precious_dir_names='SOURCES_PATH BASE_CACHE SDK_PATH'
|
||||||
|
precious_dir_names="${depends_precious_dir_names} OUTDIR_BASE"
|
||||||
|
|
||||||
|
# Usage: contains IFS-SEPARATED-LIST ITEM
|
||||||
|
contains() {
|
||||||
|
for i in ${1}; do
|
||||||
|
if [ "$i" = "${2}" ]; then
|
||||||
|
return 0 # Found!
|
||||||
|
fi
|
||||||
|
done
|
||||||
|
return 1
|
||||||
|
}
|
||||||
|
|
||||||
|
# If the user explicitly specified a precious directory, create it so we
|
||||||
|
# can map it into the container
|
||||||
|
for precious_dir_name in $precious_dir_names; do
|
||||||
|
precious_dir_path="${!precious_dir_name}"
|
||||||
|
if [ -n "$precious_dir_path" ]; then
|
||||||
|
if [ ! -e "$precious_dir_path" ]; then
|
||||||
|
mkdir -p "$precious_dir_path"
|
||||||
|
elif [ -L "$precious_dir_path" ]; then
|
||||||
|
echo "ERR: ${precious_dir_name} cannot be a symbolic link"
|
||||||
|
exit 1
|
||||||
|
elif [ ! -d "$precious_dir_path" ]; then
|
||||||
|
echo "ERR: ${precious_dir_name} must be a directory"
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
fi
|
||||||
|
done
|
||||||
|
|
||||||
|
mkdir -p "$VAR_BASE"
|
||||||
|
|
||||||
|
# Record the _effective_ values of precious directories such that guix-clean can
|
||||||
|
# avoid clobbering them if appropriate.
|
||||||
|
#
|
||||||
|
# shellcheck disable=SC2046,SC2086
|
||||||
|
{
|
||||||
|
# Get depends precious dir definitions from depends
|
||||||
|
make -C "${PWD}/depends" \
|
||||||
|
--no-print-directory \
|
||||||
|
-- $(printf "print-%s\n" $depends_precious_dir_names)
|
||||||
|
|
||||||
|
# Get remaining precious dir definitions from the environment
|
||||||
|
for precious_dir_name in $precious_dir_names; do
|
||||||
|
precious_dir_path="${!precious_dir_name}"
|
||||||
|
if ! contains "$depends_precious_dir_names" "$precious_dir_name"; then
|
||||||
|
echo "${precious_dir_name}=${precious_dir_path}"
|
||||||
|
fi
|
||||||
|
done
|
||||||
|
} > "${VAR_BASE}/precious_dirs"
|
||||||
|
|
||||||
# Make sure an output directory exists for our builds
|
# Make sure an output directory exists for our builds
|
||||||
OUTDIR_BASE="${OUTDIR_BASE:-${VERSION_BASE}/output}"
|
OUTDIR_BASE="${OUTDIR_BASE:-${VERSION_BASE}/output}"
|
||||||
mkdir -p "$OUTDIR_BASE"
|
mkdir -p "$OUTDIR_BASE"
|
||||||
|
|
||||||
|
# Download the depends sources now as we won't have internet access in the build
|
||||||
|
# container
|
||||||
|
for host in $HOSTS; do
|
||||||
|
make -C "${PWD}/depends" -j"$JOBS" download-"$(host_to_commonname "$host")" ${V:+V=1} ${SOURCES_PATH:+SOURCES_PATH="$SOURCES_PATH"}
|
||||||
|
done
|
||||||
|
|
||||||
# Usage: outdir_for_host HOST
|
# Usage: outdir_for_host HOST
|
||||||
#
|
#
|
||||||
# HOST: The current platform triple we're building for
|
# HOST: The current platform triple we're building for
|
||||||
|
@ -235,12 +289,6 @@ and untracked files and directories will be wiped, allowing you to start anew.
|
||||||
EOF
|
EOF
|
||||||
}
|
}
|
||||||
|
|
||||||
# Create SOURCES_PATH, BASE_CACHE, and SDK_PATH if they are non-empty so that we
|
|
||||||
# can map them into the container
|
|
||||||
[ -z "$SOURCES_PATH" ] || mkdir -p "$SOURCES_PATH"
|
|
||||||
[ -z "$BASE_CACHE" ] || mkdir -p "$BASE_CACHE"
|
|
||||||
[ -z "$SDK_PATH" ] || mkdir -p "$SDK_PATH"
|
|
||||||
|
|
||||||
# Deterministically build Bitcoin Core
|
# Deterministically build Bitcoin Core
|
||||||
# shellcheck disable=SC2153
|
# shellcheck disable=SC2153
|
||||||
for host in $HOSTS; do
|
for host in $HOSTS; do
|
||||||
|
|
83
contrib/guix/guix-clean
Executable file
83
contrib/guix/guix-clean
Executable file
|
@ -0,0 +1,83 @@
|
||||||
|
#!/usr/bin/env bash
|
||||||
|
export LC_ALL=C
|
||||||
|
set -e -o pipefail
|
||||||
|
|
||||||
|
# Source the common prelude, which:
|
||||||
|
# 1. Checks if we're at the top directory of the Bitcoin Core repository
|
||||||
|
# 2. Defines a few common functions and variables
|
||||||
|
#
|
||||||
|
# shellcheck source=libexec/prelude.bash
|
||||||
|
source "$(dirname "${BASH_SOURCE[0]}")/libexec/prelude.bash"
|
||||||
|
|
||||||
|
|
||||||
|
###################
|
||||||
|
## Sanity Checks ##
|
||||||
|
###################
|
||||||
|
|
||||||
|
################
|
||||||
|
# Required non-builtin commands should be invokable
|
||||||
|
################
|
||||||
|
|
||||||
|
check_tools cat mkdir make git guix
|
||||||
|
|
||||||
|
|
||||||
|
#############
|
||||||
|
## Clean ##
|
||||||
|
#############
|
||||||
|
|
||||||
|
# Usage: under_dir MAYBE_PARENT MAYBE_CHILD
|
||||||
|
#
|
||||||
|
# If MAYBE_CHILD is a subdirectory of MAYBE_PARENT, print the relative path
|
||||||
|
# from MAYBE_PARENT to MAYBE_CHILD. Otherwise, return 1 as the error code.
|
||||||
|
#
|
||||||
|
# NOTE: This does not perform any symlink-resolving or path canonicalization.
|
||||||
|
#
|
||||||
|
under_dir() {
|
||||||
|
local path_residue
|
||||||
|
path_residue="${2##${1}}"
|
||||||
|
if [ -z "$path_residue" ] || [ "$path_residue" = "$2" ]; then
|
||||||
|
return 1
|
||||||
|
else
|
||||||
|
echo "$path_residue"
|
||||||
|
fi
|
||||||
|
}
|
||||||
|
|
||||||
|
# Usage: dir_under_git_root MAYBE_CHILD
|
||||||
|
#
|
||||||
|
# If MAYBE_CHILD is under the current git repository and exists, print the
|
||||||
|
# relative path from the git repository's top-level directory to MAYBE_CHILD,
|
||||||
|
# otherwise, exit with an error code.
|
||||||
|
#
|
||||||
|
dir_under_git_root() {
|
||||||
|
local rv
|
||||||
|
rv="$(under_dir "$(git_root)" "$1")"
|
||||||
|
[ -n "$rv" ] && echo "$rv"
|
||||||
|
}
|
||||||
|
|
||||||
|
shopt -s nullglob
|
||||||
|
found_precious_dirs_files=( "${version_base_prefix}"*/"${var_base_basename}/precious_dirs" ) # This expands to an array of directories...
|
||||||
|
shopt -u nullglob
|
||||||
|
|
||||||
|
exclude_flags=()
|
||||||
|
|
||||||
|
for precious_dirs_file in "${found_precious_dirs_files[@]}"; do
|
||||||
|
# Make sure the precious directories (e.g. SOURCES_PATH, BASE_CACHE, SDK_PATH)
|
||||||
|
# are excluded from git-clean
|
||||||
|
echo "Found precious_dirs file: '${precious_dirs_file}'"
|
||||||
|
|
||||||
|
# Exclude the precious_dirs file itself
|
||||||
|
if dirs_file_exclude_fragment=$(dir_under_git_root "$(dirname "$precious_dirs_file")"); then
|
||||||
|
exclude_flags+=( --exclude="${dirs_file_exclude_fragment}/precious_dirs" )
|
||||||
|
fi
|
||||||
|
|
||||||
|
# Read each 'name=dir' pair from the precious_dirs file
|
||||||
|
while IFS='=' read -r name dir; do
|
||||||
|
# Add an exclusion flag if the precious directory is under the git root.
|
||||||
|
if under=$(dir_under_git_root "$dir"); then
|
||||||
|
echo "Avoiding ${name}: ${under}"
|
||||||
|
exclude_flags+=( --exclude="$under" )
|
||||||
|
fi
|
||||||
|
done < "$precious_dirs_file"
|
||||||
|
done
|
||||||
|
|
||||||
|
git clean -xdff "${exclude_flags[@]}"
|
|
@ -58,3 +58,6 @@ VERSION_BASE="${version_base_prefix}${VERSION}" # TOP
|
||||||
DISTSRC_BASE="${DISTSRC_BASE:-${VERSION_BASE}}"
|
DISTSRC_BASE="${DISTSRC_BASE:-${VERSION_BASE}}"
|
||||||
|
|
||||||
OUTDIR_BASE="${OUTDIR_BASE:-${VERSION_BASE}/output}"
|
OUTDIR_BASE="${OUTDIR_BASE:-${VERSION_BASE}/output}"
|
||||||
|
|
||||||
|
var_base_basename="var"
|
||||||
|
VAR_BASE="${VAR_BASE:-${VERSION_BASE}/${var_base_basename}}"
|
||||||
|
|
Loading…
Add table
Reference in a new issue