unofficial mirror of bug-guix@gnu.org 
 help / color / mirror / code / Atom feed
* bug#61798: infodoc patch doesn't apply to linux 6.2
       [not found] <20221116165551.23244-1-maxim.cournoyer@gmail.com>
@ 2023-02-26  2:21 ` Leo Famulari
  2023-02-26  4:23   ` Maxim Cournoyer
  0 siblings, 1 reply; 5+ messages in thread
From: Leo Famulari @ 2023-02-26  2:21 UTC (permalink / raw)
  To: Maxim Cournoyer; +Cc: 61798

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.

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

https://issues.guix.gnu.org/issue/61770

https://ci.guix.gnu.org/build/469982/details
------
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
------




^ permalink raw reply	[flat|nested] 5+ messages in thread

* bug#61798: infodoc patch doesn't apply to linux 6.2
  2023-02-26  2:21 ` bug#61798: infodoc patch doesn't apply to linux 6.2 Leo Famulari
@ 2023-02-26  4:23   ` Maxim Cournoyer
  2023-02-26 17:38     ` Leo Famulari
  0 siblings, 1 reply; 5+ messages in thread
From: Maxim Cournoyer @ 2023-02-26  4:23 UTC (permalink / raw)
  To: Leo Famulari; +Cc: 61798

Hi Leo,

Leo Famulari <leo@famulari.name> writes:

> 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




^ permalink raw reply	[flat|nested] 5+ messages in thread

* bug#61798: infodoc patch doesn't apply to linux 6.2
  2023-02-26  4:23   ` Maxim Cournoyer
@ 2023-02-26 17:38     ` Leo Famulari
  2023-02-27 13:40       ` Maxim Cournoyer
  0 siblings, 1 reply; 5+ messages in thread
From: Leo Famulari @ 2023-02-26 17:38 UTC (permalink / raw)
  To: Maxim Cournoyer; +Cc: 61798

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.




^ permalink raw reply	[flat|nested] 5+ messages in thread

* bug#61798: infodoc patch doesn't apply to linux 6.2
  2023-02-26 17:38     ` Leo Famulari
@ 2023-02-27 13:40       ` Maxim Cournoyer
  2023-03-04  0:34         ` Leo Famulari
  0 siblings, 1 reply; 5+ messages in thread
From: Maxim Cournoyer @ 2023-02-27 13:40 UTC (permalink / raw)
  To: Leo Famulari; +Cc: 61798

Hi Leo,

Leo Famulari <leo@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




^ permalink raw reply	[flat|nested] 5+ messages in thread

* bug#61798: infodoc patch doesn't apply to linux 6.2
  2023-02-27 13:40       ` Maxim Cournoyer
@ 2023-03-04  0:34         ` Leo Famulari
  0 siblings, 0 replies; 5+ messages in thread
From: Leo Famulari @ 2023-03-04  0:34 UTC (permalink / raw)
  To: Maxim Cournoyer; +Cc: 61798-done

On Mon, Feb 27, 2023 at 08:40:36AM -0500, Maxim Cournoyer wrote:
> This should allow you to proceed as usual:
[...]

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

https://issues.guix.gnu.org/61947




^ permalink raw reply	[flat|nested] 5+ messages in thread

end of thread, other threads:[~2023-03-04  0:36 UTC | newest]

Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
     [not found] <20221116165551.23244-1-maxim.cournoyer@gmail.com>
2023-02-26  2:21 ` bug#61798: infodoc patch doesn't apply to linux 6.2 Leo Famulari
2023-02-26  4:23   ` Maxim Cournoyer
2023-02-26 17:38     ` Leo Famulari
2023-02-27 13:40       ` Maxim Cournoyer
2023-03-04  0:34         ` Leo Famulari

Code repositories for project(s) associated with this public inbox

	https://git.savannah.gnu.org/cgit/guix.git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).