guix-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

06/07: gnu: Fix kernel source infodoc patching for linux-libre >= 6.2.


From: guix-commits
Subject: 06/07: gnu: Fix kernel source infodoc patching for linux-libre >= 6.2.
Date: Fri, 3 Mar 2023 16:54:00 -0500 (EST)

lfam pushed a commit to branch kernel-updates
in repository guix.

commit 1f71f4cb515f93d53474c486863c27507828673d
Author: Maxim Cournoyer <maxim.cournoyer@gmail.com>
AuthorDate: Mon Feb 27 17:30:30 2023 -0500

    gnu: Fix kernel source infodoc patching for linux-libre >= 6.2.
    
    * 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 8e01d505ab..be14869f70 100644
--- a/gnu/packages/linux.scm
+++ b/gnu/packages/linux.scm
@@ -863,10 +863,12 @@ ARCH and optionally VARIANT, or #f if there is no such 
configuration."
 ;;; 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 @@ ARCH and optionally VARIANT, or #f if there is no such 
configuration."
                            (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"))
                                     '()))))



reply via email to

[Prev in Thread] Current Thread [Next in Thread]