Skip to content

Commit 9ea6cbb

Browse files
committed
fix(guix-local-channel): apply all guix patches before renaming source dir
1 parent 5568202 commit 9ea6cbb

1 file changed

Lines changed: 7 additions & 4 deletions

File tree

steps-guix/improve/guix-daemon-and-pull.sh

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -122,6 +122,7 @@ verify_terminal_devices() {
122122
prepare_local_channel_checkout() {
123123
rendered_patch="/tmp/guix-bootstrap-local-seeds.patch"
124124
rendered_mes_patch="/tmp/guix-bootstrap-local-mes-extra.patch"
125+
static_patch=""
125126

126127
if [ ! -x "${guix_seed_helper}" ]; then
127128
echo "Missing Guix seed helper: ${guix_seed_helper}" >&2
@@ -160,8 +161,10 @@ prepare_local_channel_checkout() {
160161
fi
161162

162163
(
163-
cd "${channel_repo}"
164-
patch -p1 < "${guix_patch_dir}/enforce-local-bootstrap-binaries-except-linux-headers.patch"
164+
cd "${src_dir}"
165+
for static_patch in "${guix_patch_dir}"/*.patch; do
166+
patch -d.. -Np0 < "${static_patch}"
167+
done
165168
patch -p1 < "${rendered_patch}"
166169
patch -p1 < "${rendered_mes_patch}"
167170
git init -q
@@ -263,10 +266,10 @@ if [ -z "${src_dir}" ]; then
263266
exit 1
264267
fi
265268

266-
mv "${src_dir}" "${channel_repo}"
267-
268269
prepare_local_channel_checkout
269270

271+
mv "${src_dir}" "${channel_repo}"
272+
270273
channel_commit="$(git -C "${channel_repo}" rev-parse HEAD)"
271274
channel_branch="$(git -C "${channel_repo}" symbolic-ref --quiet --short HEAD)"
272275
if [ -z "${channel_branch}" ]; then

0 commit comments

Comments
 (0)