From: Leo Famulari <leo@famulari.name>
To: 61947@debbugs.gnu.org
Cc: Maxim Cournoyer <maxim.cournoyer@gmail.com>
Subject: [bug#61947] [PATCH 1/2] gnu: Fix kernel source infodoc patching for linux-libre >= 6.2.
Date: Fri, 3 Mar 2023 19:35:16 -0500 [thread overview]
Message-ID: <20230304003517.15072-1-leo@famulari.name> (raw)
In-Reply-To: <ZAKRgLBTZS8kUfv5@jasmine.lan>
From: Maxim Cournoyer <maxim.cournoyer@gmail.com>
* 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 @@ (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
next prev parent reply other threads:[~2023-03-04 0:36 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-03-04 0:32 [bug#61947] linux-libre version 6.2 Leo Famulari
2023-03-04 0:35 ` Leo Famulari [this message]
2023-03-04 0:35 ` [bug#61947] [PATCH 2/2] gnu: Add linux-libre 6.2 Leo Famulari
2023-03-04 13:03 ` [bug#61947] linux-libre version 6.2 pelzflorian (Florian Pelz)
2023-03-04 16:00 ` Leo Famulari
2023-03-06 23:16 ` bug#61947: [PATCH 2/2] gnu: Add linux-libre 6.2 Leo Famulari
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20230304003517.15072-1-leo@famulari.name \
--to=leo@famulari.name \
--cc=61947@debbugs.gnu.org \
--cc=maxim.cournoyer@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this external index
https://git.savannah.gnu.org/cgit/guix.git
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.