[PR PATCH] rpi-{kernel,firmware}: bring up to date

[PR PATCH] rpi-{kernel,firmware}: bring up to date

[ahesford]

[-- Attachment #1: Type: text/plain, Size: 669 bytes --]

There is a new pull request by ahesford against master on the void-packages repository

https://github.com/ahesford/void-packages rpi
https://github.com/void-linux/void-packages/pull/44411

rpi-{kernel,firmware}: bring up to date
I don't have any systems that can test the 32-bit builds. Also, for `rpi-firmware`, I don't know if there's a dated version encoded somewhere in the source; I just updated the version to the date of the commit I pulled.

#### Testing the changes
- I tested the changes in this PR: **briefly**
  (The updates boot on my RPi 4b.)

cc: @Piraty 

A patch file from https://github.com/void-linux/void-packages/pull/44411.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-rpi-44411.patch --]
[-- Type: text/x-diff, Size: 3250 bytes --]

From 4d4efdb6d2dbd9920db3d9559688d27222a873e3 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 13 Jun 2023 10:18:37 -0400
Subject: [PATCH 1/2] rpi-kernel: update to 6.1.32.

---
 srcpkgs/rpi-kernel/template | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/rpi-kernel/template b/srcpkgs/rpi-kernel/template
index c49612b7c510..73569c289697 100644
--- a/srcpkgs/rpi-kernel/template
+++ b/srcpkgs/rpi-kernel/template
@@ -1,9 +1,9 @@
 # Template file for 'rpi-kernel'
 #
 # We track the latest Raspberry Pi LTS kernel as that is what is used in the
-# official Raspberry Pi OS distribution. This is currently 5.15:
+# official Raspberry Pi OS distribution. This is currently 6.1:
 #
-# https://forums.raspberrypi.com/viewtopic.php?t=322879
+# https://forums.raspberrypi.com/viewtopic.php?t=344246
 #
 # Commit hash is picked from latest tag [1], if appropriate, or from latest
 # "Merge remote-tracking branch 'stable/linux-5.x.y' into rpi-5.x.y" commit.
@@ -13,9 +13,9 @@
 # Upstream documentation: https://www.raspberrypi.com/documentation/computers/linux_kernel.html
 
 pkgname=rpi-kernel
-version=5.15.72
+version=6.1.32
 revision=1
-_githash="3b98eb7a4aeaecd5274108dc1be7a5df94253500"
+_githash="bb63dc31e48948bc2649357758c7a152210109c4"
 archs="armv6l* armv7l* aarch64*"
 hostmakedepends="perl kmod uboot-mkimage openssl-devel bc bison flex xz"
 makedepends="ncurses-devel"
@@ -24,7 +24,7 @@ homepage="http://www.kernel.org"
 license="GPL-2.0-only"
 short_desc="Linux kernel for Raspberry Pi (${version%.*} series [git ${_githash:0:7}])"
 distfiles="https://github.com/raspberrypi/linux/archive/${_githash}.tar.gz"
-checksum=5cad1fd22f309ddd7b996df748aa21ced72f88d47fdbb8d4bfd9ef3a8a9b6ce9
+checksum=41898b9bd88eec0843e4115156f239bd5bfc086814b3ada52e3db7116a337474
 python_version=3
 
 _kernver="${version}_${revision}"

From c3a588a7d28b358f15112c494e3bda295ea6031b Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 13 Jun 2023 10:18:40 -0400
Subject: [PATCH 2/2] rpi-firmware: update to 20230607.

Fixes: #44408.
---
 srcpkgs/rpi-firmware/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/rpi-firmware/template b/srcpkgs/rpi-firmware/template
index 5086abfa19fe..65f003d14e33 100644
--- a/srcpkgs/rpi-firmware/template
+++ b/srcpkgs/rpi-firmware/template
@@ -1,10 +1,10 @@
 # Template file for 'rpi-firmware'
-_githash="62efc6a69d4e717bf2833c649d622c8298a37e9c"
+_githash="13fbbc4f5ea698353486915986de8b48f18018f6"
 _gitshort="${_githash:0:7}"
 
 pkgname=rpi-firmware
-version=20220823
-revision=2
+version=20230607
+revision=1
 archs="armv6l* armv7l* aarch64*"
 provides="linux-firmware-broadcom-${version}_${revision}"
 replaces="linux-firmware-broadcom>=0"
@@ -13,7 +13,7 @@ maintainer="Piraty <mail@piraty.dev>"
 license="BSD-3-Clause, custom:Cypress"
 homepage="https://github.com/raspberrypi/firmware"
 distfiles="https://github.com/raspberrypi/firmware/archive/${_githash}.tar.gz"
-checksum=3fc5ab7155bde7221245f439971217558300dcbc988ade861cfef4e737de9909
+checksum=613acb04b7330e1d44c2cb061bee03ed4d5e8245ffb00cebaef20c9a568eb300
 
 conf_files="/boot/cmdline.txt /boot/config.txt"
 nostrip=yes

Re: rpi-{kernel,firmware}: bring up to date

[ahesford]

[-- Attachment #1: Type: text/plain, Size: 186 bytes --]

New comment by ahesford on void-packages repository

https://github.com/void-linux/void-packages/pull/44411#issuecomment-1589503453

Comment:
Overlooked #43600, deferring to prior work.

Re: [PR PATCH] [Closed]: rpi-{kernel,firmware}: bring up to date

[ahesford]

[-- Attachment #1: Type: text/plain, Size: 589 bytes --]

There's a closed pull request on the void-packages repository

rpi-{kernel,firmware}: bring up to date
https://github.com/void-linux/void-packages/pull/44411

Description:
I don't have any systems that can test the 32-bit builds. Also, for `rpi-firmware`, I don't know if there's a dated version encoded somewhere in the source; I just updated the version to the date of the commit I pulled.

#### Testing the changes
- I tested the changes in this PR: **briefly**
  (The updates boot on my RPi 4b.)

cc: @Piraty 

Ed.: This should fix the USB boot issue, but I haven't tested it.