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): rebase bootstrap seed patches onto post-static baseline

Browse source
This commit is contained in:
vxtls 2026-04-13 18:46:18 -04:00
parent c1ba17c8af
commit 9df674d287
2 changed files with 18 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -36,18 +36,7 @@
("powerpc64le-linux" (string-append system "/20210106/" program))
("i586-gnu" (string-append system "/20200326/" program))
("x86_64-gnu" (string-append system "/20241122/" program))
@@ -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"))))
@@ -394,9 +398,9 @@
@@ -403,9 +400,9 @@
"Return the SHA256 hash of the Guile bootstrap tarball for SYSTEM."
(match system
("x86_64-linux"
@ -59,9 +48,9 @@
("mips64el-linux"
(base32 "0fzp93lvi0hn54acc0fpvhc7bvl0yc853k62l958cihk03q80ilr"))
("armhf-linux"
@@ -625,16 +626,16 @@
("riscv64-linux"
"/20210725/static-binaries.tar.xz")
@@ -634,16 +631,16 @@
("riscv64-linux"
"/20210725/static-binaries.tar.xz")
(_
- "/20131110/static-binaries.tar.xz")))
+ "/static-binaries-0-i686-linux.tar.xz")))
@ -79,7 +68,7 @@
("armhf-linux"
(base32
"0gf0fn2kbpxkjixkmx5f4z6hv6qpmgixl69zgg74dbsfdfj8jdv5"))
@@ -989,11 +1026,15 @@
@@ -998,12 +995,16 @@
;; own packages.
(match (%current-system)
((or "i686-linux" "x86_64-linux")
@ -96,6 +85,7 @@
+ ("mescc-tools" ,%bootstrap-mescc-tools)
;; In gnu-build-system.scm, we rely on the availability of Bash.
("bash" ,%bootstrap-coreutils&co)))))
--- a/guix/channels.scm
+++ b/guix/channels.scm
@@ -194,8 +194,8 @@

13
steps-guix/guix-1.5.0/patches/enforce-local-bootstrap-binaries-except-linux-headers.patch
View file

@ -23,7 +23,18 @@
(define (bootstrap-guile-url-path system)
"Return the URI for FILE."
(string-append "/" system
@@ -684,7 +689,7 @@
@@ -387,6 +392,10 @@
"/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"))))
@@ -684,7 +693,7 @@
(uri (map (cute string-append <>
"/i686-linux/20190815/"
"linux-libre-headers-stripped-4.14.67-i686-linux.tar.xz")