me/guix
Archived
1
0
Fork 0
Code Activity

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

Browse source 
* 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:
Maxim Cournoyer 2023-02-27 17:30:30 -05:00 • committed by Leo Famulari
parent 0d96387527
commit ad66469b24
No known key found for this signature in database
GPG key ID: 2646FA30BACA7F08
1 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
gnu/packages/linux.scm
View file

@ -863,10 +863,12 @@ ARCH and optionally VARIANT, or #f if there is no such configuration."
;;; Kernel package utilities. ;;; Kernel package utilities.
;;; ;;;
(define (doc-supported? version) (define (apply-infodoc-patch? version)
;; Versions older than 5.10 have different enough build scripts that the ;; Versions older than 5.10 have different enough build scripts that the
;; infodocs patch doesn't apply. ;; 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 (define* (make-linux-libre version gnu-revision hash-string supported-systems
#:key #:key
@ -879,7 +881,7 @@ ARCH and optionally VARIANT, or #f if there is no such configuration."
(extra-options %default-extra-linux-options) (extra-options %default-extra-linux-options)
(patches (patches
`(,%boot-logo-patch `(,%boot-logo-patch
,@(if (doc-supported? version) ,@(if (apply-infodoc-patch? version)
(list (search-patch (list (search-patch
"linux-libre-infodocs-target.patch")) "linux-libre-infodocs-target.patch"))
'())))) '()))))