linux-libre packaging: Learn to apply deblob script "errata" patches

Recipients:(address . 72164@debbugs.gnu.org)

Message-ID:Zpho8WL5gCqArpjW@jasmine.lan

I tested the build of linux-libre 6.10 with the attached patches, and it

failed as dariqq said it would on #guix, because this kernel series

requires an update to the 'dwarves' package. I'm building again with the

dwarves update now.

Also, these errata patches will only be required for 6.10, and not

subsequent releases in this series (6.10.1, etc).

We don't often end up including the mainline release in Guix, but rather

the subsequent stable releases, so in this case, it's not really

necessary to add this functionality. Although it would be nice.

From 3659eaef947623d502708441cfd6531acdc0fd90 Mon Sep 17 00:00:00 2001

Message-ID: <3659eaef947623d502708441cfd6531acdc0fd90.1721264342.git.leo@famulari.name>

to the deblobbing scripts.

* gnu/packages/linux.scm (linux-libre-deblob-scripts): Accept an optional

parameter DEBLOB-ERRATA-PATCHES.

Change-Id: If3c87f713637428e1cd2eaf5ef962b8005395805

---

gnu/packages/linux.scm | 8 ++++++--

1 file changed, 6 insertions(+), 2 deletions(-)

Toggle diff (32 lines)diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm
index e5aa712df7..0defc03e7a 100644
--- a/gnu/packages/linux.scm
+++ b/gnu/packages/linux.scm
@@ -359,9 +359,11 @@ (define-public (system->defconfig system)
 ;;; Kernel source code deblobbing.
 ;;;
 
-(define (linux-libre-deblob-scripts version gnu-revision
+(define* (linux-libre-deblob-scripts version gnu-revision
                                     deblob-hash
-                                    deblob-check-hash)
+                                    deblob-check-hash
+                                    #:optional
+                                    (deblob-errata-patches '()))
   (list (version-major+minor version)
         (origin
           (method url-fetch)
@@ -370,6 +372,8 @@ (define (linux-libre-deblob-scripts version gnu-revision
                               "deblob-" (version-major+minor version)))
           (file-name (string-append "linux-libre-deblob-"
                                     version "-" gnu-revision))
+          (patches
+            (map search-patch deblob-errata-patches))
           (sha256 deblob-hash))
         (origin
           (method url-fetch)

base-commit: 6cfc88e3be73904fc87443cdd5c7d7961923e848
prerequisite-patch-id: 58efdd6ff2418b91eae89e7964de00b95f83105f
-- 
2.45.2

From 1942a6c7340ee124313f65602dd218471ddbc193 Mon Sep 17 00:00:00 2001

Message-ID: <1942a6c7340ee124313f65602dd218471ddbc193.1721264342.git.leo@famulari.name>

In-Reply-To: <3659eaef947623d502708441cfd6531acdc0fd90.1721264342.git.leo@famulari.name>

References: <3659eaef947623d502708441cfd6531acdc0fd90.1721264342.git.leo@famulari.name>

* gnu/packages/linux.scm (dwarves): Update to 1.27.

Change-Id: Id986fdd240a6619544ff6be93cce00afd9fc31bd

---

gnu/packages/linux.scm | 4 ++--

1 file changed, 2 insertions(+), 2 deletions(-)

Toggle diff (24 lines)diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm
index bef7803fb9..141aaf33f5 100644
--- a/gnu/packages/linux.scm
+++ b/gnu/packages/linux.scm
@@ -2421,7 +2421,7 @@ (define-public dislocker
 (define-public dwarves
   (package
     (name "dwarves")
-    (version "1.26")
+    (version "1.27")
     (source (origin
               (method git-fetch)
               (uri (git-reference
@@ -2430,7 +2430,7 @@ (define-public dwarves
               (file-name (git-file-name name version))
               (sha256
                (base32
-                "0xfq0r3whc3dk922ss8i5vwyfcqhgc95dy27mm69j5niy7i5kzrd"))
+                "0qwc3772az1h3c78pyswawyvyq9spj5s1prj7ckfij9nazp3a007"))
               (patches
                (search-patches "dwarves-threading-reproducibility.patch"))))
     (build-system cmake-build-system)
-- 
2.45.2