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

fix(guix-local-channel): preserve channel repo semantics during patching, readablity improvements(src_dir -> channel_repo)

Browse source
This commit is contained in:
vxtls 2026-04-06 15:50:34 -04:00
parent ff99ac99a0
commit ab64a31dd1
1 changed files with 9 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -123,6 +123,7 @@ prepare_local_channel_checkout() {
rendered_patch="/tmp/guix-bootstrap-local-seeds.patch" rendered_patch="/tmp/guix-bootstrap-local-seeds.patch"
rendered_mes_patch="/tmp/guix-bootstrap-local-mes-extra.patch" rendered_mes_patch="/tmp/guix-bootstrap-local-mes-extra.patch"
static_patch="" static_patch=""
channel_patch_link=""
if [ ! -x "${guix_seed_helper}" ]; then if [ ! -x "${guix_seed_helper}" ]; then
echo "Missing Guix seed helper: ${guix_seed_helper}" >&2 echo "Missing Guix seed helper: ${guix_seed_helper}" >&2
@ -161,12 +162,17 @@ prepare_local_channel_checkout() {
fi fi
( (
cd "${src_dir}" channel_patch_link="$(dirname "${channel_repo}")/guix-1.5.0"
trap 'rm -f "${channel_patch_link}"' EXIT HUP INT TERM
ln -s "$(basename "${channel_repo}")" "${channel_patch_link}"
cd "${channel_repo}"
for static_patch in "${guix_patch_dir}"/*.patch; do for static_patch in "${guix_patch_dir}"/*.patch; do
patch -d.. -Np0 < "${static_patch}" patch -d.. -Np0 < "${static_patch}"
done done
patch -p1 < "${rendered_patch}" patch -p1 < "${rendered_patch}"
patch -p1 < "${rendered_mes_patch}" patch -p1 < "${rendered_mes_patch}"
rm -f "${channel_patch_link}"
git init -q git init -q
git add -A git add -A
git -c user.name='guix-local' -c user.email='guix-local@example.invalid' commit -q -m 'local guix channel snapshot' git -c user.name='guix-local' -c user.email='guix-local@example.invalid' commit -q -m 'local guix channel snapshot'
@ -266,10 +272,10 @@ if [ -z "${src_dir}" ]; then
exit 1 exit 1
fi fi
prepare_local_channel_checkout
mv "${src_dir}" "${channel_repo}" mv "${src_dir}" "${channel_repo}"
prepare_local_channel_checkout
channel_commit="$(git -C "${channel_repo}" rev-parse HEAD)" channel_commit="$(git -C "${channel_repo}" rev-parse HEAD)"
channel_branch="$(git -C "${channel_repo}" symbolic-ref --quiet --short HEAD)" channel_branch="$(git -C "${channel_repo}" symbolic-ref --quiet --short HEAD)"
if [ -z "${channel_branch}" ]; then if [ -z "${channel_branch}" ]; then