infodoc patch doesn't apply to linux 6.2

  • Done
  • quality assurance status badge
Details
2 participants
  • Leo Famulari
  • Maxim Cournoyer
Owner
unassigned
Submitted by
Leo Famulari
Severity
normal

Debbugs page

L
L
Leo Famulari wrote on 25 Feb 2023 18:21
(name . Maxim Cournoyer)(address . maxim.cournoyer@gmail.com)(address . bug-guix@gnu.org)
Y/rCH0sQtKXxwW0f@jasmine.lan
On Wed, Nov 16, 2022 at 11:55:51AM -0500, Maxim Cournoyer wrote:
Toggle quote (2 lines)
> .../patches/linux-libre-infodocs-target.patch | 88 ++++++

This patch doesn't apply to linux-libre 6.2.1, as shown below. If I
understand correctly, it's been applied upstream, but I don't understand
how to adjust things on our end.

Can you take a look and send a patch that applies on top of #61770?


------
applying '/gnu/store/b9kc2xs6407hmpzcvx44g1mi88ls0509-linux-libre-infodocs-target.patch'...
Backtrace:
5 (primitive-load "/gnu/store/6hr5qlvj92idkp2hmnwk7f16ah4?")
In ice-9/eval.scm:
619:8 4 (_ #(#(#<directory (guile-user) 7fffeffcfc80> "lin?") #))
In ice-9/boot-9.scm:
142:2 3 (dynamic-wind #<procedure 7fffeff727a0 at ice-9/eval.s?> ?)
In ice-9/eval.scm:
619:8 2 (_ #(#(#<directory (guile-user) 7fffeffcfc80>)))
In srfi/srfi-1.scm:
634:9 1 (for-each #<procedure apply-patch (a)> _)
In guix/build/utils.scm:
762:6 0 (invoke "/gnu/store/z39hnrwds1dgcbpfgj8dnv2cngjb2xbl-p?" ?)

guix/build/utils.scm:762:6: In procedure invoke:
ERROR:
1. &invoke-error:
program: "/gnu/store/z39hnrwds1dgcbpfgj8dnv2cngjb2xbl-patch-2.7.6/bin/patch"
arguments: ("--force" "--no-backup-if-mismatch" "-p1" "--input" "/gnu/store/b9kc2xs6407hmpzcvx44g1mi88ls0509-linux-libre-infodocs-target.patch")
exit-status: 1
term-signal: #f
stop-signal: #f
builder for
`/gnu/store/qvhbmfmsjryxs0mwmv0apl2110vdmaz2-linux-libre-6.2.1-guix.tar.xz.drv' failed with exit code 1
------
M
M
Maxim Cournoyer wrote on 25 Feb 2023 20:23
(name . Leo Famulari)(address . leo@famulari.name)(address . 61798@debbugs.gnu.org)
87cz5xdphq.fsf@gmail.com
Hi Leo,

Leo Famulari <leo@famulari.name> writes:

Toggle quote (7 lines)
> On Wed, Nov 16, 2022 at 11:55:51AM -0500, Maxim Cournoyer wrote:
>> .../patches/linux-libre-infodocs-target.patch | 88 ++++++
>
> This patch doesn't apply to linux-libre 6.2.1, as shown below. If I
> understand correctly, it's been applied upstream, but I don't understand
> how to adjust things on our end.

It's indeed been applied upstream. Can't we just drop our local version
of it?

--
Thanks,
Maxim
L
L
Leo Famulari wrote on 26 Feb 2023 09:38
(name . Maxim Cournoyer)(address . maxim.cournoyer@gmail.com)(address . 61798@debbugs.gnu.org)
Y/uZFRjCTWAC5DaQ@jasmine.lan
On Sat, Feb 25, 2023 at 11:23:13PM -0500, Maxim Cournoyer wrote:
Toggle quote (3 lines)
> 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.
M
M
Maxim Cournoyer wrote on 27 Feb 2023 05:40
(name . Leo Famulari)(address . leo@famulari.name)(address . 61798@debbugs.gnu.org)
87o7pfkyzv.fsf@gmail.com
Hi Leo,

Leo Famulari <leo@famulari.name> writes:

Toggle quote (8 lines)
> 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:

Toggle snippet (39 lines)
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"))
'()))))

--
Thanks,
Maxim
M
M
Maxim Cournoyer wrote on 2 Mar 2023 06:56
control message for bug #61798
(address . control@debbugs.gnu.org)
87zg8vfbhc.fsf@gmail.com
tags 61798 notabug
close 61798
quit
L
L
Leo Famulari wrote on 3 Mar 2023 16:34
Re: infodoc patch doesn't apply to linux 6.2
(name . Maxim Cournoyer)(address . maxim.cournoyer@gmail.com)(address . 61798-done@debbugs.gnu.org)
ZAKSLVOSfcrAAs7X@jasmine.lan
On Mon, Feb 27, 2023 at 08:40:36AM -0500, Maxim Cournoyer wrote:
Toggle quote (1 lines)
> This should allow you to proceed as usual:
[...]

Thanks! I've prepared the patch, availabe as part of this patch series:

Closed
?
Your comment

This issue is archived.

To comment on this conversation send an email to 61798@patchwise.org

To respond to this issue using the mumi CLI, first switch to it
mumi current 61798
Then, you may apply the latest patchset in this issue (with sign off)
mumi am -- -s
Or, compose a reply to this issue
mumi compose
Or, send patches to this issue
mumi send-email *.patch