mirror of
https://git.in.rschanz.org/ryan77627/guix.git
synced 2025-01-11 13:49:23 -05:00
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.
This commit is contained in:
parent
0d96387527
commit
ad66469b24
1 changed files with 5 additions and 3 deletions
|
@ -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"))
|
||||
'()))))
|
||||
|
|
Loading…
Reference in a new issue