[bug#66923] [PATCH 0/2] linux-libre kernel updates (2023-11-03)

[bug#66923] [PATCH 0/2] linux-libre kernel updates (2023-11-03)

[Wilko Meyer]

Hi Leo,

There have been two updates around yesterday for 6.5/6.1 kernels.

Wilko Meyer (2):
  gnu: linux-libre 6.5: Update to 6.5.10.
  gnu: linux-libre 6.1: Update to 6.1.61.

 gnu/packages/linux.scm | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

-- 
2.41.0

[bug#66923] [PATCH 1/2] gnu: linux-libre 6.5: Update to 6.5.10.

[Wilko Meyer]

* gnu/packages/linux.scm (linux-libre-6.5-version): Update to 6.5.10.
(linux-libre-6.5-pristine-source): Update hash.

Change-Id: Icc0c07d8f38659be00e3675c335801aab5ae8b6c
---
 gnu/packages/linux.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm
index e77fe9f89d..d5293cbcdf 100644
--- a/gnu/packages/linux.scm
+++ b/gnu/packages/linux.scm
@@ -508,7 +508,7 @@ (define-public linux-libre-6.6-pristine-source
                             (%upstream-linux-source version hash)
                             deblob-scripts-6.6)))
 
-(define-public linux-libre-6.5-version "6.5.9")
+(define-public linux-libre-6.5-version "6.5.10")
 (define-public linux-libre-6.5-gnu-revision "gnu")
 (define deblob-scripts-6.5
   (linux-libre-deblob-scripts
@@ -518,7 +518,7 @@ (define deblob-scripts-6.5
    (base32 "066z5lw5vrfayhv23hpfcm6fh6b7zmn2v13kfv1g3z3jl1wblhfh")))
 (define-public linux-libre-6.5-pristine-source
   (let ((version linux-libre-6.5-version)
-        (hash (base32 "1mcg0lpxr832mwyqlbn0s5gssvsk2nn2xhq9w0qbymizf5j2yrn6")))
+        (hash (base32 "12sswml8jvabv6bqx35lg3jj6gq8jjk365rghjngdy5d0j34jpx1")))
    (make-linux-libre-source version
                             (%upstream-linux-source version hash)
                             deblob-scripts-6.5)))
-- 
2.41.0

[bug#66923] [PATCH 2/2] gnu: linux-libre 6.1: Update to 6.1.61.

[Wilko Meyer]

* gnu/packages/linux.scm (linux-libre-6.1-version): Update to 6.1.61.
(linux-libre-6.1-pristine-source): Update hash.
(deblob-scripts-6.1): Update hash.

Change-Id: Iaab673a11ff578ac7671999deb7d31f4dfd5b1e2
---
 gnu/packages/linux.scm | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm
index d5293cbcdf..02ac5221dd 100644
--- a/gnu/packages/linux.scm
+++ b/gnu/packages/linux.scm
@@ -526,17 +526,17 @@ (define-public linux-libre-6.5-pristine-source
 ;; The "longterm" kernels — the older releases with long-term upstream support.
 ;; Here are the support timelines:
 ;; <https://www.kernel.org/category/releases.html>
-(define-public linux-libre-6.1-version "6.1.60")
+(define-public linux-libre-6.1-version "6.1.61")
 (define-public linux-libre-6.1-gnu-revision "gnu")
 (define deblob-scripts-6.1
   (linux-libre-deblob-scripts
    linux-libre-6.1-version
    linux-libre-6.1-gnu-revision
    (base32 "1sf80f2i4vf888xjcn84ymn4w5ynn30ib9033zwmv7f09yvfhapy")
-   (base32 "1c73516nbhnz0cxjz38b5794dxygb8sznv9idiibw7ablmjbhd11")))
+   (base32 "1hdibv43xbn1lv83i6qjgfmf1bvqxvq17fryfsq4r4sjgs9212js")))
 (define-public linux-libre-6.1-pristine-source
   (let ((version linux-libre-6.1-version)
-        (hash (base32 "02pvymr1dgd36mp7yikxqqv0sfrpwi1grnvxvx6jbbx6wmx0wljq")))
+        (hash (base32 "1kk4d7ph6pvgdrdmaklg15wf58nw9n7yqgkag7jdvqinzh99sb5d")))
    (make-linux-libre-source version
                             (%upstream-linux-source version hash)
                             deblob-scripts-6.1)))
-- 
2.41.0

[bug#66923] [PATCH 1/2] gnu: linux-libre 6.5: Update to 6.5.10.

[Leo Famulari]

On Fri, Nov 03, 2023 at 10:58:00PM +0100, Wilko Meyer wrote:
> * gnu/packages/linux.scm (linux-libre-6.5-version): Update to 6.5.10.
> (linux-libre-6.5-pristine-source): Update hash.

Thanks for these!

I can't get them to apply. Do you know what commit of guix.git they
apply to?

You can use the '--base=auto' option of Git when creating patches or
sending a patch series to automatically include that information.

[bug#66923] [PATCH 1/2] gnu: linux-libre 6.5: Update to 6.5.10.

[Wilko Meyer]

Hi Leo,

Leo Famulari <leo@famulari.name> writes:

> I can't get them to apply. Do you know what commit of guix.git they
> apply to?

I prepared these patches on a branch where my 6.6. updates were already
present, which caused one of the two patches to not apply properly. I
prepared a second revision of those based off the upstream
kernel-updates branch; which means it should now work properly.

> You can use the '--base=auto' option of Git when creating patches or
> sending a patch series to automatically include that information.

I'll do this in future patches, thanks for mentioning it!

-- 
Kind regards,

Wilko Meyer
w@wmeyer.eu

[bug#66923] [PATCH 1/2] gnu: linux-libre 6.5: Update to 6.5.10.

[Leo Famulari]

On Sat, Nov 04, 2023 at 10:20:46AM +0100, Wilko Meyer wrote:
> I prepared these patches on a branch where my 6.6. updates were already
> present, which caused one of the two patches to not apply properly. I
> prepared a second revision of those based off the upstream
> kernel-updates branch; which means it should now work properly.

That makes sense. I've pushed v2 patches to 'kernel-updates'. 

[bug#66923] [PATCH 1/2] gnu: linux-libre 6.5: Update to 6.5.10.

[Leo Famulari]

On Fri, Nov 03, 2023 at 10:58:00PM +0100, Wilko Meyer wrote:
> * gnu/packages/linux.scm (linux-libre-6.5-version): Update to 6.5.10.
> (linux-libre-6.5-pristine-source): Update hash.

On CI, this package failed to build with a hash mismatch for the kernel
source tarball:

------
Starting download of /gnu/store/31g0vm5hlgfi4d9lfwj07fasjn5667af-linux-6.5.10.tar.xz
From http://linux-kernel.uio.no/pub/linux/kernel/v6.x/linux-6.5.10.tar.xz...
[...]
[K ….10.tar.xz  90.0MiB                62.4MiB/s 00:01 [##################] 100.0%
@ hash-mismatch /gnu/store/31g0vm5hlgfi4d9lfwj07fasjn5667af-linux-6.5.10.tar.xz sha256 12sswml8jvabv6bqx35lg3jj6gq8jjk365rghjngdy5d0j34jpx1 1drdjrbhdiljcqapjrjyvyvvf7dvpxdw4wxnqxjh1xy7f5vimxm9
hash mismatch for store item '/gnu/store/31g0vm5hlgfi4d9lfwj07fasjn5667af-linux-6.5.10.tar.xz'
------
https://ci.guix.gnu.org/build/2418732/log

I downloaded the tarball 'by hand' from kernel.org and calculated the
hash:

------
$ guix hash linux-6.5.10.tar.xz
12sswml8jvabv6bqx35lg3jj6gq8jjk365rghjngdy5d0j34jpx1
------

... and that matches your patch:

>  (define-public linux-libre-6.5-pristine-source
>    (let ((version linux-libre-6.5-version)
> -        (hash (base32 "1mcg0lpxr832mwyqlbn0s5gssvsk2nn2xhq9w0qbymizf5j2yrn6")))
> +        (hash (base32 "12sswml8jvabv6bqx35lg3jj6gq8jjk365rghjngdy5d0j34jpx1")))

However, Guix uses a mirror provided by the University of Oslo, and that
indeed provides a file with a different hash. That file appears to be
truncated, since tar fails to extract it, and it is about 2/3 the size
of the file from kernel.org (133 MiB):

------
$ curl -LO http://linux-kernel.uio.no/pub/linux/kernel/v6.x/linux-6.5.10.tar.xz
  % Total    % Received % Xferd  Average Speed   Time    Time     Time  Current
                                 Dload  Upload   Total   Spent    Left  Speed
100 90.0M  100 90.0M    0     0  6333k      0  0:00:14  0:00:14 --:--:-- 7441k
$ guix hash linux-6.5.10.tar.xz                                                
1drdjrbhdiljcqapjrjyvyvvf7dvpxdw4wxnqxjh1xy7f5vimxm9
$ tar xf linux-6.5.10.tar.xz 
xz: (stdin): Unexpected end of input
tar: Unexpected EOF in archive
tar: Unexpected EOF in archive
tar: Error is not recoverable: exiting now
------

kernel.org already runs a CDN to distribute demand effectively, so I
replaced the bogus source with the canonical upstream in our list of
download URLs, in 'guix/download.scm'.

I've pushed an updated patch series to 'kernel-updates' with this
change.

[bug#66923] [PATCH 1/2] gnu: linux-libre 6.5: Update to 6.5.10.

[Leo Famulari]

On Sun, Nov 05, 2023 at 10:34:11AM -0500, Leo Famulari wrote:
> I've pushed an updated patch series to 'kernel-updates' with this
> change.

CI didn't recognize this as a change that requires rebuilding, so I'm
testing it locally.

bug#66923: [PATCH 1/2] gnu: linux-libre 6.5: Update to 6.5.10.

[Leo Famulari]

On Sun, Nov 05, 2023 at 11:06:22AM -0500, Leo Famulari wrote:
> On Sun, Nov 05, 2023 at 10:34:11AM -0500, Leo Famulari wrote:
> > I've pushed an updated patch series to 'kernel-updates' with this
> > change.
> 
> CI didn't recognize this as a change that requires rebuilding, so I'm
> testing it locally.

Pushed with the updates as 7e214b9a1aab3e00de6e71f3700021092d179862

Thanks!

[bug#66923] [PATCH v2 1/2] gnu: linux-libre 6.1: Update to 6.1.61.

[Wilko Meyer]

* gnu/packages/linux.scm (linux-libre-6.1-version): Update to 6.1.61.
(linux-libre-6.1-pristine-source): Update hash.
(deblob-scripts-6.1): Update hash.

Change-Id: Iaab673a11ff578ac7671999deb7d31f4dfd5b1e2
---
 gnu/packages/linux.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm
index c4cea246cc..b78db6d7ee 100644
--- a/gnu/packages/linux.scm
+++ b/gnu/packages/linux.scm
@@ -511,7 +511,7 @@ (define-public linux-libre-6.5-pristine-source
 ;; The "longterm" kernels — the older releases with long-term upstream support.
 ;; Here are the support timelines:
 ;; <https://www.kernel.org/category/releases.html>
-(define-public linux-libre-6.1-version "6.1.60")
+(define-public linux-libre-6.1-version "6.1.61")
 (define-public linux-libre-6.1-gnu-revision "gnu")
 (define deblob-scripts-6.1
   (linux-libre-deblob-scripts
@@ -521,7 +521,7 @@ (define deblob-scripts-6.1
    (base32 "1hdibv43xbn1lv83i6qjgfmf1bvqxvq17fryfsq4r4sjgs9212js")))
 (define-public linux-libre-6.1-pristine-source
   (let ((version linux-libre-6.1-version)
-        (hash (base32 "02pvymr1dgd36mp7yikxqqv0sfrpwi1grnvxvx6jbbx6wmx0wljq")))
+        (hash (base32 "1kk4d7ph6pvgdrdmaklg15wf58nw9n7yqgkag7jdvqinzh99sb5d")))
    (make-linux-libre-source version
                             (%upstream-linux-source version hash)
                             deblob-scripts-6.1)))

base-commit: 2ee10d8dcfbec3f3d2783d6d3cd2fde0d07aa9bc
-- 
2.41.0

[bug#66923] [PATCH v2 2/2] gnu: linux-libre 6.5: Update to 6.5.10.

[Wilko Meyer]

* gnu/packages/linux.scm (linux-libre-6.5-version): Update to 6.5.10.
(linux-libre-6.5-pristine-source): Update hash.

Change-Id: Icc0c07d8f38659be00e3675c335801aab5ae8b6c
---
 gnu/packages/linux.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm
index b78db6d7ee..95a66e3d6a 100644
--- a/gnu/packages/linux.scm
+++ b/gnu/packages/linux.scm
@@ -493,7 +493,7 @@ (define (%upstream-linux-source version hash)
 ;; The current "stable" kernels. That is, the most recently released major
 ;; versions that are still supported upstream.
 
-(define-public linux-libre-6.5-version "6.5.9")
+(define-public linux-libre-6.5-version "6.5.10")
 (define-public linux-libre-6.5-gnu-revision "gnu")
 (define deblob-scripts-6.5
   (linux-libre-deblob-scripts
@@ -503,7 +503,7 @@ (define deblob-scripts-6.5
    (base32 "066z5lw5vrfayhv23hpfcm6fh6b7zmn2v13kfv1g3z3jl1wblhfh")))
 (define-public linux-libre-6.5-pristine-source
   (let ((version linux-libre-6.5-version)
-        (hash (base32 "1mcg0lpxr832mwyqlbn0s5gssvsk2nn2xhq9w0qbymizf5j2yrn6")))
+        (hash (base32 "12sswml8jvabv6bqx35lg3jj6gq8jjk365rghjngdy5d0j34jpx1")))
    (make-linux-libre-source version
                             (%upstream-linux-source version hash)
                             deblob-scripts-6.5)))
-- 
2.41.0