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): apply all guix patches before renaming source dir

Browse source
This commit is contained in:
vxtls 2026-04-06 15:40:54 -04:00
parent 5568202427
commit 9ea6cbb8fa
1 changed files with 7 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -122,6 +122,7 @@ verify_terminal_devices() {
prepare_local_channel_checkout() { 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=""
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
@ -160,8 +161,10 @@ prepare_local_channel_checkout() {
fi fi
( (
cd "${channel_repo}" cd "${src_dir}"
patch -p1 < "${guix_patch_dir}/enforce-local-bootstrap-binaries-except-linux-headers.patch" for static_patch in "${guix_patch_dir}"/*.patch; do
patch -d.. -Np0 < "${static_patch}"
done
patch -p1 < "${rendered_patch}" patch -p1 < "${rendered_patch}"
patch -p1 < "${rendered_mes_patch}" patch -p1 < "${rendered_mes_patch}"
git init -q git init -q
@ -263,10 +266,10 @@ if [ -z "${src_dir}" ]; then
exit 1 exit 1
fi fi
mv "${src_dir}" "${channel_repo}"
prepare_local_channel_checkout prepare_local_channel_checkout
mv "${src_dir}" "${channel_repo}"
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