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-bootstrap): split x86_64 and i686 bootstrap guile seeds

Browse source
This commit is contained in:
vxtls 2026-04-12 23:11:28 -04:00
parent a98f0d1164
commit c1ba17c8af
4 changed files with 65 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

3
steps-guix/guix-1.5.0/pass2.sh
View file

@ -25,7 +25,8 @@ src_prepare() {
-e "s|@EXEC_TAR_HASH@|${EXEC_TAR_HASH}|g" \
-e "s|@EXEC_XZ_HASH@|${EXEC_XZ_HASH}|g" \
-e "s|@STATIC_BINARIES_SEED_HASH@|${STATIC_BINARIES_SEED_HASH}|g" \
-e "s|@GUILE_SEED_HASH@|${GUILE_SEED_HASH}|g" \
-e "s|@GUILE_I686_SEED_HASH@|${GUILE_I686_SEED_HASH}|g" \
-e "s|@GUILE_X86_64_SEED_HASH@|${GUILE_X86_64_SEED_HASH}|g" \
-e "s|@MES_MINIMAL_SEED_HASH@|${MES_MINIMAL_SEED_HASH}|g" \
-e "s|@MESCC_TOOLS_SEED_HASH@|${MESCC_TOOLS_SEED_HASH}|g" \
"${patch_template}" > "${rendered_patch}"

22
steps-guix/guix-1.5.0/patches/bootstrap-local-seeds.patch.in
View file

@ -36,26 +36,30 @@
("powerpc64le-linux" (string-append system "/20210106/" program))
("i586-gnu" (string-append system "/20200326/" program))
("x86_64-gnu" (string-append system "/20241122/" program))
@@ -388,15 +385,15 @@
@@ -387,6 +387,10 @@
("powerpc64le-linux"
"/20210106/guile-static-stripped-2.0.14-powerpc64le-linux-gnu.tar.xz")
("riscv64-linux"
"/20210725/guile-3.0.2.tar.xz")
+ ("x86_64-linux"
+ "/guile-static-stripped-2.0.9-x86_64-linux.tar.xz")
+ ("i686-linux"
+ "/guile-static-stripped-2.0.9-i686-linux.tar.xz")
(_
- "/20131110/guile-2.0.9.tar.xz"))))
+ "/guile-static-stripped-2.0.9-i686-linux.tar.xz"))))
(define (bootstrap-guile-hash system)
"/20131110/guile-2.0.9.tar.xz"))))
@@ -394,9 +398,9 @@
"Return the SHA256 hash of the Guile bootstrap tarball for SYSTEM."
(match system
("x86_64-linux"
- (base32 "1w2p5zyrglzzniqgvyn1b55vprfzhgk8vzbzkkbdgl5248si0yq3"))
+ (base32 "@GUILE_SEED_HASH@"))
+ (base32 "@GUILE_X86_64_SEED_HASH@"))
("i686-linux"
- (base32 "0im800m30abgh7msh331pcbjvb4n02smz5cfzf1srv0kpx3csmxp"))
+ (base32 "@GUILE_SEED_HASH@"))
+ (base32 "@GUILE_I686_SEED_HASH@"))
("mips64el-linux"
(base32 "0fzp93lvi0hn54acc0fpvhc7bvl0yc853k62l958cihk03q80ilr"))
("armhf-linux"
@@ -625,16 +622,16 @@
@@ -625,16 +626,16 @@
("riscv64-linux"
"/20210725/static-binaries.tar.xz")
(_
@ -75,7 +79,7 @@
("armhf-linux"
(base32
"0gf0fn2kbpxkjixkmx5f4z6hv6qpmgixl69zgg74dbsfdfj8jdv5"))
@@ -989,11 +1022,15 @@
@@ -989,11 +1026,15 @@
;; own packages.
(match (%current-system)
((or "i686-linux" "x86_64-linux")