kylekrein/live-bootstrap
1
0
Fork 0
mirror of https://github.com/fosslinux/live-bootstrap.git synced 2026-03-25 04:26:31 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix(guix-1.5.0): split unstable mes hunks into dedicated patch and remove heuristic fallback logic

Browse source
This commit is contained in:
vxtls 2026-03-04 22:36:54 -05:00
parent 4abc97da82
commit 5cea0ba08a
3 changed files with 78 additions and 54 deletions
Download patch file Download diff file Expand all files Collapse all files

57
steps-guix/guix-1.5.0/patches/bootstrap-local-mes-extra.patch.in Normal file
View file

@ -0,0 +1,57 @@
--- a/gnu/packages/bootstrap.scm
+++ b/gnu/packages/bootstrap.scm
@@ -676,7 +676,45 @@
(substitute* '("bin/egrep" "bin/fgrep")
(("^exec grep") (string-append (getcwd) "/bin/grep"))))
(chmod "bin" #o555))))
+
+
+(define (bootstrap-mes-minimal-origin system)
+ (origin
+ (method url-fetch)
+ (uri (map (cut string-append <>
+ "/mes-minimal-stripped-0.19-i686-linux.tar.xz")
+ %bootstrap-base-urls))
+ (sha256
+ (match system
+ ((or "i686-linux" "x86_64-linux")
+ (base32 "@MES_MINIMAL_SEED_HASH@"))
+ (_
+ (base32 "@MES_MINIMAL_SEED_HASH@"))))))
+
+(define %bootstrap-mes-minimal
+ (package-from-tarball "mes-minimal-bootstrap"
+ bootstrap-mes-minimal-origin
+ "mes"
+ "Bootstrap Mes minimal binary seed"))
+
+(define (bootstrap-mescc-tools-origin system)
+ (origin
+ (method url-fetch)
+ (uri (map (cut string-append <>
+ "/mescc-tools-static-stripped-0.5.2-i686-linux.tar.xz")
+ %bootstrap-base-urls))
+ (sha256
+ (match system
+ ((or "i686-linux" "x86_64-linux")
+ (base32 "@MESCC_TOOLS_SEED_HASH@"))
+ (_
+ (base32 "@MESCC_TOOLS_SEED_HASH@"))))))
+(define %bootstrap-mescc-tools
+ (package-from-tarball "mescc-tools-bootstrap"
+ bootstrap-mescc-tools-origin
+ "M2-Planet"
+ "Bootstrap MesCC tools binary seed"))
(define-public %bootstrap-linux-libre-headers
(package-from-tarball
"linux-libre-headers-bootstrap"
@@ -1012,6 +1050,8 @@
("gcc" ,%bootstrap-gcc)
("binutils" ,%bootstrap-binutils)
("coreutils&co" ,%bootstrap-coreutils&co)
+ ("mes-minimal" ,%bootstrap-mes-minimal)
+ ("mescc-tools" ,%bootstrap-mescc-tools)
("bash" ,%bootstrap-coreutils&co)))
;;; bootstrap.scm ends here

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

@ -97,51 +97,6 @@
("armhf-linux"
(base32
"0gf0fn2kbpxkjixkmx5f4z6hv6qpmgixl69zgg74dbsfdfj8jdv5"))
@@ -675,6 +672,44 @@
(if (not (elf-file? "bin/egrep"))
(substitute* '("bin/egrep" "bin/fgrep")
(("^exec grep") (string-append (getcwd) "/bin/grep"))))
(chmod "bin" #o555))))
+
+(define (bootstrap-mes-minimal-origin system)
+ (origin
+ (method url-fetch)
+ (uri (map (cut string-append <>
+ "/mes-minimal-stripped-0.19-i686-linux.tar.xz")
+ %bootstrap-base-urls))
+ (sha256
+ (match system
+ ((or "i686-linux" "x86_64-linux")
+ (base32 "@MES_MINIMAL_SEED_HASH@"))
+ (_
+ (base32 "@MES_MINIMAL_SEED_HASH@"))))))
+
+(define %bootstrap-mes-minimal
+ (package-from-tarball "mes-minimal-bootstrap"
+ bootstrap-mes-minimal-origin
+ "mes"
+ "Bootstrap Mes minimal binary seed"))
+
+(define (bootstrap-mescc-tools-origin system)
+ (origin
+ (method url-fetch)
+ (uri (map (cut string-append <>
+ "/mescc-tools-static-stripped-0.5.2-i686-linux.tar.xz")
+ %bootstrap-base-urls))
+ (sha256
+ (match system
+ ((or "i686-linux" "x86_64-linux")
+ (base32 "@MESCC_TOOLS_SEED_HASH@"))
+ (_
+ (base32 "@MESCC_TOOLS_SEED_HASH@"))))))
+
+(define %bootstrap-mescc-tools
+ (package-from-tarball "mescc-tools-bootstrap"
+ bootstrap-mescc-tools-origin
+ "M2-Planet"
+ "Bootstrap MesCC tools binary seed"))
(define-public %bootstrap-linux-libre-headers
(package-from-tarball
@@ -989,11 +1022,15 @@
;; own packages.
(match (%current-system)
@ -159,14 +114,6 @@
+ ("mescc-tools" ,%bootstrap-mescc-tools)
;; In gnu-build-system.scm, we rely on the availability of Bash.
("bash" ,%bootstrap-coreutils&co)))))
@@ -1005,5 +1042,7 @@
`(("libc" ,%bootstrap-glibc)
("gcc" ,%bootstrap-gcc)
("binutils" ,%bootstrap-binutils)
("coreutils&co" ,%bootstrap-coreutils&co)
+ ("mes-minimal" ,%bootstrap-mes-minimal)
+ ("mescc-tools" ,%bootstrap-mescc-tools)
("bash" ,%bootstrap-coreutils&co)))
--- a/guix/channels.scm
+++ b/guix/channels.scm
@@ -194,8 +194,8 @@