kylekrein/live-bootstrap
1
0
Fork 0
mirror of https://github.com/fosslinux/live-bootstrap.git synced 2026-03-23 11:36:32 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

refactor(guix-1.5.0): drop redundant post-sed and post-patch grep checks in pass1.sh

Browse source
This commit is contained in:
vxtls 2026-03-19 09:29:58 -04:00
parent 4f66a58b7a
commit 8c41939c5c
1 changed files with 1 additions and 43 deletions
Download patch file Download diff file Expand all files Collapse all files

44
steps-guix/guix-1.5.0/pass1.sh
View file

@ -3,7 +3,7 @@
: "${KERNEL_SYSROOT:=/kernel-toolchain}"
src_prepare() {
local bootstrap_scm patch_template rendered_patch
local patch_template rendered_patch
local mes_patch_template rendered_mes_patch
default
@ -18,21 +18,11 @@ src_prepare() {
fi
. /tmp/guix-bootstrap-seeds.env
bootstrap_scm="gnu/packages/bootstrap.scm"
patch_template="${base_dir}/patches/bootstrap-local-seeds.patch.in"
rendered_patch="/tmp/guix-bootstrap-local-seeds.patch"
mes_patch_template="${base_dir}/patches/bootstrap-local-mes-extra.patch.in"
rendered_mes_patch="/tmp/guix-bootstrap-local-mes-extra.patch"
if [ ! -f "${patch_template}" ]; then
echo "Missing patch template: ${patch_template}" >&2
false
fi
if [ ! -f "${mes_patch_template}" ]; then
echo "Missing patch template: ${mes_patch_template}" >&2
false
fi
sed \
-e "s|@EXEC_BASH_HASH@|${EXEC_BASH_HASH}|g" \
-e "s|@EXEC_MKDIR_HASH@|${EXEC_MKDIR_HASH}|g" \
@ -48,41 +38,9 @@ src_prepare() {
-e "s|@MESCC_TOOLS_SEED_HASH@|${MESCC_TOOLS_SEED_HASH}|g" \
"${mes_patch_template}" > "${rendered_mes_patch}"
if grep -Eq '@[A-Z0-9_]+@' "${rendered_patch}"; then
echo "Unexpanded placeholder found in ${rendered_patch}" >&2
false
fi
if grep -Eq '@[A-Z0-9_]+@' "${rendered_mes_patch}"; then
echo "Unexpanded placeholder found in ${rendered_mes_patch}" >&2
false
fi
patch --dry-run -p1 < "${rendered_patch}"
patch -p1 < "${rendered_patch}"
patch --dry-run -p1 < "${rendered_mes_patch}"
patch -p1 < "${rendered_mes_patch}"
grep -q '127.0.0.1:38445' "${bootstrap_scm}"
grep -q "${EXEC_BASH_HASH}" "${bootstrap_scm}"
grep -q "${STATIC_BINARIES_SEED_HASH}" "${bootstrap_scm}"
grep -q "${GUILE_SEED_HASH}" "${bootstrap_scm}"
grep -q "${MES_MINIMAL_SEED_HASH}" "${bootstrap_scm}"
grep -q "${MESCC_TOOLS_SEED_HASH}" "${bootstrap_scm}"
grep -q "All bootstrap binaries must come from the local bootstrap mirror." "${bootstrap_scm}"
grep -q "%bootstrap-linux-headers-base-urls" "${bootstrap_scm}"
grep -q '^(define (bootstrap-mes-minimal-origin system)' "${bootstrap_scm}"
grep -q '^(define %bootstrap-mescc-tools' "${bootstrap_scm}"
grep -q "mes-minimal-stripped-0.19-i686-linux.tar.xz" "${bootstrap_scm}"
grep -q "mescc-tools-static-stripped-0.5.2-i686-linux.tar.xz" "${bootstrap_scm}"
grep -q '("mes-minimal" ,%bootstrap-mes-minimal)' "${bootstrap_scm}"
grep -q '("mescc-tools" ,%bootstrap-mescc-tools)' "${bootstrap_scm}"
grep -q "Offline bootstrap environment: require explicit channels." guix/channels.scm
# Regenerate autotools files with tool names available in this environment.
ACLOCAL=aclocal \
AUTOCONF=autoconf \
AUTOHEADER=autoheader \
AUTOMAKE=automake \
AUTOPOINT=true \
autoreconf -fi
}