Subject: [PATCH v3 1/2] gnu: Fix kernel source infodoc patching for linux-libre >= 6.2.

From: Leo Famulari <[email-masked]>
Date: Mon, 27 Feb 2023 12:15:51 -0500

From: Maxim Cournoyer <[email-masked]>

* gnu/packages/linux.scm (doc-supported?): Rename to ...
(apply-infodoc-patch?): ... new variable with different kernel version
constraints.
(make-linux-libre): Adjust accordingly.
---
 gnu/packages/linux.scm | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm
index 3601744c51..22ebaea243 100644
--- a/gnu/packages/linux.scm
+++ b/gnu/packages/linux.scm
@@ -863,10 +863,12 @@ (define (config->string options)
 ;;; Kernel package utilities.
 ;;;
 
-(define (doc-supported? version)
+(define (apply-infodoc-patch? version)
   ;; Versions older than 5.10 have different enough build scripts that the
   ;; infodocs patch doesn't apply.
-  (version>=? version "5.10"))
+  (and (version>=? version "5.10")
+       (not (version>=? version "6.2")))) ;patch applied upstream
+
 
 (define* (make-linux-libre version gnu-revision hash-string supported-systems
                            #:key
@@ -879,7 +881,7 @@ (define* (make-linux-libre version gnu-revision hash-string supported-systems
                            (extra-options %default-extra-linux-options)
                            (patches
                             `(,%boot-logo-patch
-                              ,@(if (doc-supported? version)
+                              ,@(if (apply-infodoc-patch? version)
                                     (list (search-patch
                                            "linux-libre-infodocs-target.patch"))
                                     '()))))
-- 
2.39.1