Hi Leo,
Leo Famulari <l...@famulari.name> writes:
> On Sat, Feb 25, 2023 at 11:23:13PM -0500, Maxim Cournoyer wrote:
>> It's indeed been applied upstream. Can't we just drop our local version
>> of it?
>
> Do I need to set the 'doc-supported?' value somehow for particular
> kernel versions? It would be helpful for me if you could try it, if this
> stuff is still fresh in your mind, since you implemented it.
This should allow you to proceed as usual:
--8<---------------cut here---------------start------------->8---
1 file changed, 5 insertions(+), 5 deletions(-)
gnu/packages/linux.scm | 10 +++++-----
modified gnu/packages/linux.scm
@@ -620,8 +620,7 @@ (define (source-with-patches source patches)
(define-public linux-libre-6.2-source
(source-with-patches linux-libre-6.2-pristine-source
(list %boot-logo-patch
- %linux-libre-arm-export-__sync_icache_dcache-patch
- (search-patch
"linux-libre-infodocs-target.patch"))))
+
%linux-libre-arm-export-__sync_icache_dcache-patch)))
(define-public linux-libre-6.1-source
(source-with-patches linux-libre-6.1-pristine-source
@@ -889,10 +888,11 @@ (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
@@ -905,7 +905,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"))
'()))))
--8<---------------cut here---------------end--------------->8---
--
Thanks,
Maxim
