kylekrein/live-bootstrap
1
0
Fork 0
mirror of https://github.com/fosslinux/live-bootstrap.git synced 2026-04-18 09:22:15 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix(guix): mirror boost unordered patch through local distfiles

Browse source
This commit is contained in:
vxtls 2026-04-08 18:53:49 -04:00
parent a8749e87ad
commit a98f0d1164
7 changed files with 99 additions and 53 deletions
Download patch file Download diff file Expand all files Collapse all files

54
steps-guix/improve/guix-daemon-and-pull.sh
View file

@ -5,6 +5,7 @@ set -e
. /steps/bootstrap.cfg
. /steps/env
. /steps-guix/improve/local-distfiles-http.sh
guix_localstate_dir="/var/guix"
daemon_socket="${guix_localstate_dir}/daemon-socket/socket"
@ -12,12 +13,6 @@ channel_root="/var/lib/guix/local-channels"
channel_repo="${channel_root}/guix"
channel_work="/tmp/guix-local-channel-work"
channels_file="/root/.config/guix/channels.scm"
distfiles="${DISTFILES:-/external/distfiles}"
distfiles_http_host="127.0.0.1"
distfiles_http_port="38445"
distfiles_http_base_url="http://${distfiles_http_host}:${distfiles_http_port}"
distfiles_http_pid=""
distfiles_http_log="/tmp/distfiles-httpd.log"
guix_seed_helper="/steps-guix/improve/guix-1.5.0.sh"
guix_patch_dir="/steps-guix/guix-1.5.0/patches"
PATH="/usr/sbin:/sbin:${PATH}"
@ -37,53 +32,6 @@ export GUILE_SYSTEM_COMPILED_PATH="${guile_site_ccache}:${guile_core_ccache}"
export GUILE_EXTENSIONS_PATH="${guile_ext_path}"
export GNUTLS_GUILE_EXTENSION_DIR="${guile_ext_path}"
stop_distfiles_http_server() {
if [ -n "${distfiles_http_pid}" ] && kill -0 "${distfiles_http_pid}" >/dev/null 2>&1; then
kill "${distfiles_http_pid}" >/dev/null 2>&1 || true
wait "${distfiles_http_pid}" >/dev/null 2>&1 || true
fi
}
start_distfiles_http_server() {
if [ ! -d "${distfiles}" ]; then
echo "Distfiles directory is missing: ${distfiles}" >&2
exit 1
fi
if ! command -v python3 >/dev/null 2>&1; then
echo "python3 is required to serve local distfiles over HTTP." >&2
exit 1
fi
rm -f "${distfiles_http_log}"
echo "Starting local distfiles HTTP server at ${distfiles_http_base_url}"
python3 -m http.server "${distfiles_http_port}" \
--bind "${distfiles_http_host}" \
--directory "${distfiles}" \
>"${distfiles_http_log}" 2>&1 &
distfiles_http_pid="$!"
retry=0
while [ "${retry}" -lt 30 ]; do
if ! kill -0 "${distfiles_http_pid}" >/dev/null 2>&1; then
echo "Local distfiles HTTP server exited unexpectedly." >&2
cat "${distfiles_http_log}" >&2 || true
exit 1
fi
if python3 -c "import urllib.request; urllib.request.urlopen('${distfiles_http_base_url}/', timeout=2).read(1)" \
>/dev/null 2>&1; then
return
fi
retry=$((retry + 1))
sleep 1
done
echo "Timed out waiting for local distfiles HTTP server: ${distfiles_http_base_url}" >&2
cat "${distfiles_http_log}" >&2 || true
exit 1
}
trap stop_distfiles_http_server EXIT INT TERM HUP
have_group() {