[PR PATCH] Raspberry PI Updates

[PR PATCH] Raspberry PI Updates

[kenrap]

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

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

https://github.com/kenrap/void-packages kenrap-rpi-updates
https://github.com/void-linux/void-packages/pull/43600

Raspberry PI Updates
#### Testing the changes
- I tested the changes in this PR: **YES**

#### Local build testing
- I built this PR locally for these architectures:
  - aarch64 (for rpi4)

#### Contributor's notes
- The rpi-kernel package (both the one currently and this updated version) doesn't USB boot without an initramfs.
  - I used dracut to successfully make this work.

[ci skip]

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

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

From 745d4e3c0e640ec8a0c4114c2f9b7155c66a59bf Mon Sep 17 00:00:00 2001
From: Kenneth Raplee <kenrap@kennethraplee.com>
Date: Mon, 24 Apr 2023 13:21:07 -0700
Subject: [PATCH 1/2] rpi-firmware: update to 20230418 and apply cleanup

---
 srcpkgs/rpi-firmware/template | 31 +++++++++++++++++--------------
 1 file changed, 17 insertions(+), 14 deletions(-)

diff --git a/srcpkgs/rpi-firmware/template b/srcpkgs/rpi-firmware/template
index 5086abfa19fe..2bed3b073a1d 100644
--- a/srcpkgs/rpi-firmware/template
+++ b/srcpkgs/rpi-firmware/template
@@ -1,10 +1,10 @@
 # Template file for 'rpi-firmware'
-_githash="62efc6a69d4e717bf2833c649d622c8298a37e9c"
+_githash="5c276f55a4b21345cd4d6200a504ee991851ff7a"
 _gitshort="${_githash:0:7}"
 
 pkgname=rpi-firmware
-version=20220823
-revision=2
+version=20230418
+revision=1
 archs="armv6l* armv7l* aarch64*"
 provides="linux-firmware-broadcom-${version}_${revision}"
 replaces="linux-firmware-broadcom>=0"
@@ -13,11 +13,14 @@ 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=d137ea260b376d1dca4bc7e1cefb4fd0656c5a4dd11774c82ee06af240694690
 
 conf_files="/boot/cmdline.txt /boot/config.txt"
 nostrip=yes
 
+_debian_firmware_nonfree_repo=https://raw.githubusercontent.com/RPi-Distro/firmware-nonfree/buster
+_bluez_firmware_repo=https://raw.githubusercontent.com/RPi-Distro/bluez-firmware/master
+
 do_install() {
 	rm -f boot/*.img
 	rm -rf boot/overlays
@@ -34,49 +37,49 @@ do_install() {
 	vinstall ${FILESDIR}/cmdline.txt 644 boot
 	vinstall ${FILESDIR}/config.txt 644 boot
 
-	$XBPS_FETCH_CMD https://raw.githubusercontent.com/RPi-Distro/firmware-nonfree/buster/LICENCE.cypress
+	$XBPS_FETCH_CMD "${_debian_firmware_nonfree_repo}/LICENCE.cypress"
 	vlicense LICENCE.cypress
 
 	# Firmware for rpi3 b and zero wifi chip
 	for f in bin txt; do
-		$XBPS_FETCH_CMD https://raw.githubusercontent.com/RPi-Distro/firmware-nonfree/buster/brcm/brcmfmac43430-sdio.${f}
+		$XBPS_FETCH_CMD "${_debian_firmware_nonfree_repo}/brcm/brcmfmac43430-sdio.${f}"
 		vinstall brcmfmac43430-sdio.${f} 0644 usr/lib/firmware/brcm
 	done
 
 	# Firmware for rpi3 b and zero bluetooth chip
-	$XBPS_FETCH_CMD https://raw.githubusercontent.com/RPi-Distro/bluez-firmware/master/broadcom/BCM43430A1.hcd
+	$XBPS_FETCH_CMD "${_bluez_firmware_repo}/broadcom/BCM43430A1.hcd"
 	vinstall BCM43430A1.hcd 0644 usr/lib/firmware/brcm
 
 	# Firmware for rpi3 b+ wifi chip
 	for f in bin txt clm_blob; do
-		$XBPS_FETCH_CMD https://raw.githubusercontent.com/RPi-Distro/firmware-nonfree/buster/brcm/brcmfmac43455-sdio.${f}
+		$XBPS_FETCH_CMD "${_debian_firmware_nonfree_repo}/brcm/brcmfmac43455-sdio.${f}"
 		vinstall brcmfmac43455-sdio.${f} 0644 usr/lib/firmware/brcm
 	done
 
 	# Firmware for rpi3 b+ bluetooth chip
-	$XBPS_FETCH_CMD https://raw.githubusercontent.com/RPi-Distro/bluez-firmware/master/broadcom/BCM4345C0.hcd
+	$XBPS_FETCH_CMD "${_bluez_firmware_repo}/broadcom/BCM4345C0.hcd"
 	vinstall BCM4345C0.hcd 0644 usr/lib/firmware/brcm
 
 	# Firmware for rpi zero 2w wifi chip
 	for f in bin txt clm_blob; do
-		$XBPS_FETCH_CMD https://raw.githubusercontent.com/RPi-Distro/firmware-nonfree/buster/brcm/brcmfmac43436-sdio.${f}
+		$XBPS_FETCH_CMD "${_debian_firmware_nonfree_repo}/brcm/brcmfmac43436-sdio.${f}"
 		vinstall brcmfmac43436-sdio.${f} 0644 usr/lib/firmware/brcm
 	done
 	for f in bin txt; do
-		$XBPS_FETCH_CMD https://raw.githubusercontent.com/RPi-Distro/firmware-nonfree/buster/brcm/brcmfmac43436s-sdio.${f}
+		$XBPS_FETCH_CMD "${_debian_firmware_nonfree_repo}/brcm/brcmfmac43436s-sdio.${f}"
 		vinstall brcmfmac43436s-sdio.${f} 0644 usr/lib/firmware/brcm
 	done
 
 	# Firmware for rpi4/rpi400 wifi chip
 	for f in bin txt clm_blob; do
-		$XBPS_FETCH_CMD https://raw.githubusercontent.com/RPi-Distro/firmware-nonfree/buster/brcm/brcmfmac43456-sdio.${f}
+		$XBPS_FETCH_CMD "${_debian_firmware_nonfree_repo}/brcm/brcmfmac43456-sdio.${f}"
 		vinstall brcmfmac43456-sdio.${f} 0644 usr/lib/firmware/brcm
 	done
 
 	# Firmware for rpi4/rpi400 bluetooth chip
-	$XBPS_FETCH_CMD https://raw.githubusercontent.com/RPi-Distro/bluez-firmware/master/broadcom/BCM4345C5.hcd
+	$XBPS_FETCH_CMD "${_bluez_firmware_repo}/broadcom/BCM4345C5.hcd"
 	vinstall BCM4345C5.hcd 0644 usr/lib/firmware/brcm
 
-	$XBPS_FETCH_CMD https://raw.githubusercontent.com/RPi-Distro/bluez-firmware/master/broadcom/BCM43430B0.hcd
+	$XBPS_FETCH_CMD "${_bluez_firmware_repo}/broadcom/BCM43430B0.hcd"
 	vinstall BCM43430B0.hcd 0644 usr/lib/firmware/brcm
 }

From 51a8f5d3c84026476c2eae71cee77c72b20b4247 Mon Sep 17 00:00:00 2001
From: Kenneth Raplee <kenrap@kennethraplee.com>
Date: Mon, 24 Apr 2023 13:22:49 -0700
Subject: [PATCH 2/2] rpi-kernel: update to 6.1.25

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

diff --git a/srcpkgs/rpi-kernel/template b/srcpkgs/rpi-kernel/template
index c49612b7c510..0a2ebaf80aaf 100644
--- a/srcpkgs/rpi-kernel/template
+++ b/srcpkgs/rpi-kernel/template
@@ -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.25
 revision=1
-_githash="3b98eb7a4aeaecd5274108dc1be7a5df94253500"
+_githash=e5c93db2b62d983d6a164786357a7eb02c4e50d0
 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=b142709b3be0ec13aa7c40bd683f69ee9b84281ed7b95905633237418cf70906
 python_version=3
 
 _kernver="${version}_${revision}"

Re: Raspberry PI Updates

[classabbyamp]

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

New comment by classabbyamp on void-packages repository

https://github.com/void-linux/void-packages/pull/43600#issuecomment-1520843091

Comment:
willbe testing this soon 

Re: [PR PATCH] [Updated] Raspberry PI Updates

[kenrap]

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

There is an updated pull request by kenrap against master on the void-packages repository

https://github.com/kenrap/void-packages kenrap-rpi-updates
https://github.com/void-linux/void-packages/pull/43600

Raspberry PI Updates
#### Testing the changes
- I tested the changes in this PR: **YES**

#### Local build testing
- I built this PR locally for these architectures:
  - aarch64 (for rpi4)

#### Contributor's notes
- The rpi-kernel package (both the one currently and this updated version) doesn't USB boot without an initramfs.
  - I used dracut to successfully make this work.

[ci skip]

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

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

From 1d28706401e524ef8cf1ee1220adefccdcb5a1ac Mon Sep 17 00:00:00 2001
From: Kenneth Raplee <kenrap@kennethraplee.com>
Date: Mon, 24 Apr 2023 13:21:07 -0700
Subject: [PATCH 1/2] rpi-firmware: update to 20230418 and apply cleanup

---
 srcpkgs/rpi-firmware/template | 85 ++++++++++++++++++-----------------
 1 file changed, 45 insertions(+), 40 deletions(-)

diff --git a/srcpkgs/rpi-firmware/template b/srcpkgs/rpi-firmware/template
index 5086abfa19fe..4a5a544d9b97 100644
--- a/srcpkgs/rpi-firmware/template
+++ b/srcpkgs/rpi-firmware/template
@@ -1,10 +1,10 @@
 # Template file for 'rpi-firmware'
-_githash="62efc6a69d4e717bf2833c649d622c8298a37e9c"
+_githash="5c276f55a4b21345cd4d6200a504ee991851ff7a"
 _gitshort="${_githash:0:7}"
 
 pkgname=rpi-firmware
-version=20220823
-revision=2
+version=20230418
+revision=1
 archs="armv6l* armv7l* aarch64*"
 provides="linux-firmware-broadcom-${version}_${revision}"
 replaces="linux-firmware-broadcom>=0"
@@ -13,11 +13,14 @@ 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=d137ea260b376d1dca4bc7e1cefb4fd0656c5a4dd11774c82ee06af240694690
 
 conf_files="/boot/cmdline.txt /boot/config.txt"
 nostrip=yes
 
+_debian_firmware_nonfree_repo=https://raw.githubusercontent.com/RPi-Distro/firmware-nonfree/buster
+_bluez_firmware_repo=https://raw.githubusercontent.com/RPi-Distro/bluez-firmware/master
+
 do_install() {
 	rm -f boot/*.img
 	rm -rf boot/overlays
@@ -34,49 +37,51 @@ do_install() {
 	vinstall ${FILESDIR}/cmdline.txt 644 boot
 	vinstall ${FILESDIR}/config.txt 644 boot
 
-	$XBPS_FETCH_CMD https://raw.githubusercontent.com/RPi-Distro/firmware-nonfree/buster/LICENCE.cypress
+	$XBPS_FETCH_CMD "${_debian_firmware_nonfree_repo}/LICENCE.cypress"
 	vlicense LICENCE.cypress
 
-	# Firmware for rpi3 b and zero wifi chip
-	for f in bin txt; do
-		$XBPS_FETCH_CMD https://raw.githubusercontent.com/RPi-Distro/firmware-nonfree/buster/brcm/brcmfmac43430-sdio.${f}
-		vinstall brcmfmac43430-sdio.${f} 0644 usr/lib/firmware/brcm
-	done
+	_wifi_firmware_with_blob=(
+		# For rpi3 b+
+		"brcmfmac43455-sdio"
+		# For rpi zero 2w
+		"brcmfmac43436-sdio"
+		# For rpi4/rpi400
+		"brcmfmac43456-sdio"
+	)
 
-	# Firmware for rpi3 b and zero bluetooth chip
-	$XBPS_FETCH_CMD https://raw.githubusercontent.com/RPi-Distro/bluez-firmware/master/broadcom/BCM43430A1.hcd
-	vinstall BCM43430A1.hcd 0644 usr/lib/firmware/brcm
+	_wifi_firmware=(
+		# For rpi3 b and zero
+		"brcmfmac43430-sdio"
+		# For rpi zero 2w
+		"brcmfmac43436s-sdio"
+	)
 
-	# Firmware for rpi3 b+ wifi chip
-	for f in bin txt clm_blob; do
-		$XBPS_FETCH_CMD https://raw.githubusercontent.com/RPi-Distro/firmware-nonfree/buster/brcm/brcmfmac43455-sdio.${f}
-		vinstall brcmfmac43455-sdio.${f} 0644 usr/lib/firmware/brcm
+	for filename in ${_wifi_firmware_with_blob[@]}; do
+		for ext in bin txt clm_blob; do
+			$XBPS_FETCH_CMD "${_debian_firmware_nonfree_repo}/brcm/${filename}.${ext}"
+			vinstall ${filename}.${ext} 0644 usr/lib/firmware/brcm
+		done
 	done
 
-	# Firmware for rpi3 b+ bluetooth chip
-	$XBPS_FETCH_CMD https://raw.githubusercontent.com/RPi-Distro/bluez-firmware/master/broadcom/BCM4345C0.hcd
-	vinstall BCM4345C0.hcd 0644 usr/lib/firmware/brcm
-
-	# Firmware for rpi zero 2w wifi chip
-	for f in bin txt clm_blob; do
-		$XBPS_FETCH_CMD https://raw.githubusercontent.com/RPi-Distro/firmware-nonfree/buster/brcm/brcmfmac43436-sdio.${f}
-		vinstall brcmfmac43436-sdio.${f} 0644 usr/lib/firmware/brcm
-	done
-	for f in bin txt; do
-		$XBPS_FETCH_CMD https://raw.githubusercontent.com/RPi-Distro/firmware-nonfree/buster/brcm/brcmfmac43436s-sdio.${f}
-		vinstall brcmfmac43436s-sdio.${f} 0644 usr/lib/firmware/brcm
+	for filename in ${_wifi_firmware[@]}; do
+		for ext in bin txt; do
+			$XBPS_FETCH_CMD "${_debian_firmware_nonfree_repo}/brcm/${filename}.${ext}"
+			vinstall ${filename}.${ext} 0644 usr/lib/firmware/brcm
+		done
 	done
 
-	# Firmware for rpi4/rpi400 wifi chip
-	for f in bin txt clm_blob; do
-		$XBPS_FETCH_CMD https://raw.githubusercontent.com/RPi-Distro/firmware-nonfree/buster/brcm/brcmfmac43456-sdio.${f}
-		vinstall brcmfmac43456-sdio.${f} 0644 usr/lib/firmware/brcm
-	done
-
-	# Firmware for rpi4/rpi400 bluetooth chip
-	$XBPS_FETCH_CMD https://raw.githubusercontent.com/RPi-Distro/bluez-firmware/master/broadcom/BCM4345C5.hcd
-	vinstall BCM4345C5.hcd 0644 usr/lib/firmware/brcm
+	_bluez_firmware=(
+		# For rpi3 b and zero
+		"BCM43430A1.hcd"
+		# For rpi3 b+
+		"BCM4345C0.hcd"
+		# For rpi4/rpi400
+		"BCM4345C5.hcd"
+		"BCM43430B0.hcd"
+	)
 
-	$XBPS_FETCH_CMD https://raw.githubusercontent.com/RPi-Distro/bluez-firmware/master/broadcom/BCM43430B0.hcd
-	vinstall BCM43430B0.hcd 0644 usr/lib/firmware/brcm
+	for firmware in ${_bluez_firmware[@]}; do
+		$XBPS_FETCH_CMD "${_bluez_firmware_repo}/broadcom/${firmware}"
+		vinstall $firmware 0644 usr/lib/firmware/brcm
+	done
 }

From 1a886793e68806bd69358c3a92a6cb4129f8ea71 Mon Sep 17 00:00:00 2001
From: Kenneth Raplee <kenrap@kennethraplee.com>
Date: Mon, 24 Apr 2023 13:22:49 -0700
Subject: [PATCH 2/2] rpi-kernel: update to 6.1.25

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

diff --git a/srcpkgs/rpi-kernel/template b/srcpkgs/rpi-kernel/template
index c49612b7c510..0a2ebaf80aaf 100644
--- a/srcpkgs/rpi-kernel/template
+++ b/srcpkgs/rpi-kernel/template
@@ -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.25
 revision=1
-_githash="3b98eb7a4aeaecd5274108dc1be7a5df94253500"
+_githash=e5c93db2b62d983d6a164786357a7eb02c4e50d0
 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=b142709b3be0ec13aa7c40bd683f69ee9b84281ed7b95905633237418cf70906
 python_version=3
 
 _kernver="${version}_${revision}"

Re: Raspberry PI Updates

[kenrap]

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

New comment by kenrap on void-packages repository

https://github.com/void-linux/void-packages/pull/43600#issuecomment-1520946363

Comment:
Alright, that should make the rpi-firmware template more maintainable.

Re: Raspberry PI Updates

[kenrap]

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

New comment by kenrap on void-packages repository

https://github.com/void-linux/void-packages/pull/43600#issuecomment-1529149092

Comment:
Should I bump the `_githash` in `rpi-kernel` to the latest commit?

Re: Raspberry PI Updates

[classabbyamp]

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

New comment by classabbyamp on void-packages repository

https://github.com/void-linux/void-packages/pull/43600#issuecomment-1529153317

Comment:
no, see the comment at the top of the template

Re: Raspberry PI Updates

[tsjk]

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

New comment by tsjk on void-packages repository

https://github.com/void-linux/void-packages/pull/43600#issuecomment-1539618725

Comment:
Cool. I'll test this on my armv6 rpis

Re: Raspberry PI Updates

[leahneukirchen]

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

New comment by leahneukirchen on void-packages repository

https://github.com/void-linux/void-packages/pull/43600#issuecomment-1542296944

Comment:
If it works with dracut, that suggests some modules are missing to be compiled in? Would this be a better fix?

Re: Raspberry PI Updates

[classabbyamp]

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

New comment by classabbyamp on void-packages repository

https://github.com/void-linux/void-packages/pull/43600#issuecomment-1542300297

Comment:
hm but we're using the rpi dotconfigs, so I'd expect usbboot to be working with them

Re: Raspberry PI Updates

[tsjk]

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

New comment by tsjk on void-packages repository

https://github.com/void-linux/void-packages/pull/43600#issuecomment-1542542871

Comment:
It doesn't build for armv6:

```
...
  CC [M]  crypto/seqiv.mod.o
  CC [M]  crypto/sha256_generic.mod.o
  CC [M]  crypto/sha512_generic.mod.o
arm-linux-gnueabihf-ld: arch/arm/lib/uaccess_with_memcpy.o: in function `__copy_to_user_memcpy':
uaccess_with_memcpy.c:(.text+0x2dc): undefined reference to `__memcpy'
make[1]: *** [scripts/Makefile.vmlinux:34: vmlinux] Error 1
make: *** [Makefile:1255: vmlinux] Error 2
make: *** Waiting for unfinished jobs....
...
```

I used: `xbps-src -a armv6l pkg rpi-kernel`

Re: Raspberry PI Updates

[classabbyamp]

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

New comment by classabbyamp on void-packages repository

https://github.com/void-linux/void-packages/pull/43600#issuecomment-1542596253

Comment:
works with 6.1.27:
```diff
diff --git a/srcpkgs/rpi-kernel/template b/srcpkgs/rpi-kernel/template
index 0a2ebaf80a..8fa5a3fcc1 100644
--- a/srcpkgs/rpi-kernel/template
+++ b/srcpkgs/rpi-kernel/template
@@ -13,9 +13,9 @@
 # Upstream documentation: https://www.raspberrypi.com/documentation/computers/linux_kernel.html
 
 pkgname=rpi-kernel
-version=6.1.25
+version=6.1.27
 revision=1
-_githash=e5c93db2b62d983d6a164786357a7eb02c4e50d0
+_githash=83cf6b410113c98ebfd0b7fef70b1a7c9539b0b9
 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=b142709b3be0ec13aa7c40bd683f69ee9b84281ed7b95905633237418cf70906
+checksum=be28f607f945ee7083af61608f29ced824db87fc7b49bff4e4c7d64ca8581935
 python_version=3
 
 _kernver="${version}_${revision}"
 ```

Re: [PR PATCH] [Updated] Raspberry PI Updates

[kenrap]

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

There is an updated pull request by kenrap against master on the void-packages repository

https://github.com/kenrap/void-packages kenrap-rpi-updates
https://github.com/void-linux/void-packages/pull/43600

Raspberry PI Updates
#### Testing the changes
- I tested the changes in this PR: **YES**

#### Local build testing
- I built this PR locally for these architectures:
  - aarch64 (for rpi4)

#### Contributor's notes
- The rpi-kernel package (both the one currently and this updated version) doesn't USB boot without an initramfs.
  - I used dracut to successfully make this work.

[ci skip]

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

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

From c42aba7afa0b6d4f70919d75be1134a1f1e8a1cc Mon Sep 17 00:00:00 2001
From: Kenneth Raplee <kenrap@kennethraplee.com>
Date: Mon, 24 Apr 2023 13:21:07 -0700
Subject: [PATCH 1/2] rpi-firmware: update to 20230418 and apply cleanup

---
 srcpkgs/rpi-firmware/template | 85 ++++++++++++++++++-----------------
 1 file changed, 45 insertions(+), 40 deletions(-)

diff --git a/srcpkgs/rpi-firmware/template b/srcpkgs/rpi-firmware/template
index 5086abfa19fe..4a5a544d9b97 100644
--- a/srcpkgs/rpi-firmware/template
+++ b/srcpkgs/rpi-firmware/template
@@ -1,10 +1,10 @@
 # Template file for 'rpi-firmware'
-_githash="62efc6a69d4e717bf2833c649d622c8298a37e9c"
+_githash="5c276f55a4b21345cd4d6200a504ee991851ff7a"
 _gitshort="${_githash:0:7}"
 
 pkgname=rpi-firmware
-version=20220823
-revision=2
+version=20230418
+revision=1
 archs="armv6l* armv7l* aarch64*"
 provides="linux-firmware-broadcom-${version}_${revision}"
 replaces="linux-firmware-broadcom>=0"
@@ -13,11 +13,14 @@ 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=d137ea260b376d1dca4bc7e1cefb4fd0656c5a4dd11774c82ee06af240694690
 
 conf_files="/boot/cmdline.txt /boot/config.txt"
 nostrip=yes
 
+_debian_firmware_nonfree_repo=https://raw.githubusercontent.com/RPi-Distro/firmware-nonfree/buster
+_bluez_firmware_repo=https://raw.githubusercontent.com/RPi-Distro/bluez-firmware/master
+
 do_install() {
 	rm -f boot/*.img
 	rm -rf boot/overlays
@@ -34,49 +37,51 @@ do_install() {
 	vinstall ${FILESDIR}/cmdline.txt 644 boot
 	vinstall ${FILESDIR}/config.txt 644 boot
 
-	$XBPS_FETCH_CMD https://raw.githubusercontent.com/RPi-Distro/firmware-nonfree/buster/LICENCE.cypress
+	$XBPS_FETCH_CMD "${_debian_firmware_nonfree_repo}/LICENCE.cypress"
 	vlicense LICENCE.cypress
 
-	# Firmware for rpi3 b and zero wifi chip
-	for f in bin txt; do
-		$XBPS_FETCH_CMD https://raw.githubusercontent.com/RPi-Distro/firmware-nonfree/buster/brcm/brcmfmac43430-sdio.${f}
-		vinstall brcmfmac43430-sdio.${f} 0644 usr/lib/firmware/brcm
-	done
+	_wifi_firmware_with_blob=(
+		# For rpi3 b+
+		"brcmfmac43455-sdio"
+		# For rpi zero 2w
+		"brcmfmac43436-sdio"
+		# For rpi4/rpi400
+		"brcmfmac43456-sdio"
+	)
 
-	# Firmware for rpi3 b and zero bluetooth chip
-	$XBPS_FETCH_CMD https://raw.githubusercontent.com/RPi-Distro/bluez-firmware/master/broadcom/BCM43430A1.hcd
-	vinstall BCM43430A1.hcd 0644 usr/lib/firmware/brcm
+	_wifi_firmware=(
+		# For rpi3 b and zero
+		"brcmfmac43430-sdio"
+		# For rpi zero 2w
+		"brcmfmac43436s-sdio"
+	)
 
-	# Firmware for rpi3 b+ wifi chip
-	for f in bin txt clm_blob; do
-		$XBPS_FETCH_CMD https://raw.githubusercontent.com/RPi-Distro/firmware-nonfree/buster/brcm/brcmfmac43455-sdio.${f}
-		vinstall brcmfmac43455-sdio.${f} 0644 usr/lib/firmware/brcm
+	for filename in ${_wifi_firmware_with_blob[@]}; do
+		for ext in bin txt clm_blob; do
+			$XBPS_FETCH_CMD "${_debian_firmware_nonfree_repo}/brcm/${filename}.${ext}"
+			vinstall ${filename}.${ext} 0644 usr/lib/firmware/brcm
+		done
 	done
 
-	# Firmware for rpi3 b+ bluetooth chip
-	$XBPS_FETCH_CMD https://raw.githubusercontent.com/RPi-Distro/bluez-firmware/master/broadcom/BCM4345C0.hcd
-	vinstall BCM4345C0.hcd 0644 usr/lib/firmware/brcm
-
-	# Firmware for rpi zero 2w wifi chip
-	for f in bin txt clm_blob; do
-		$XBPS_FETCH_CMD https://raw.githubusercontent.com/RPi-Distro/firmware-nonfree/buster/brcm/brcmfmac43436-sdio.${f}
-		vinstall brcmfmac43436-sdio.${f} 0644 usr/lib/firmware/brcm
-	done
-	for f in bin txt; do
-		$XBPS_FETCH_CMD https://raw.githubusercontent.com/RPi-Distro/firmware-nonfree/buster/brcm/brcmfmac43436s-sdio.${f}
-		vinstall brcmfmac43436s-sdio.${f} 0644 usr/lib/firmware/brcm
+	for filename in ${_wifi_firmware[@]}; do
+		for ext in bin txt; do
+			$XBPS_FETCH_CMD "${_debian_firmware_nonfree_repo}/brcm/${filename}.${ext}"
+			vinstall ${filename}.${ext} 0644 usr/lib/firmware/brcm
+		done
 	done
 
-	# Firmware for rpi4/rpi400 wifi chip
-	for f in bin txt clm_blob; do
-		$XBPS_FETCH_CMD https://raw.githubusercontent.com/RPi-Distro/firmware-nonfree/buster/brcm/brcmfmac43456-sdio.${f}
-		vinstall brcmfmac43456-sdio.${f} 0644 usr/lib/firmware/brcm
-	done
-
-	# Firmware for rpi4/rpi400 bluetooth chip
-	$XBPS_FETCH_CMD https://raw.githubusercontent.com/RPi-Distro/bluez-firmware/master/broadcom/BCM4345C5.hcd
-	vinstall BCM4345C5.hcd 0644 usr/lib/firmware/brcm
+	_bluez_firmware=(
+		# For rpi3 b and zero
+		"BCM43430A1.hcd"
+		# For rpi3 b+
+		"BCM4345C0.hcd"
+		# For rpi4/rpi400
+		"BCM4345C5.hcd"
+		"BCM43430B0.hcd"
+	)
 
-	$XBPS_FETCH_CMD https://raw.githubusercontent.com/RPi-Distro/bluez-firmware/master/broadcom/BCM43430B0.hcd
-	vinstall BCM43430B0.hcd 0644 usr/lib/firmware/brcm
+	for firmware in ${_bluez_firmware[@]}; do
+		$XBPS_FETCH_CMD "${_bluez_firmware_repo}/broadcom/${firmware}"
+		vinstall $firmware 0644 usr/lib/firmware/brcm
+	done
 }

From c8f11cf499d96e6b8633c41f2472bc007e459a35 Mon Sep 17 00:00:00 2001
From: Kenneth Raplee <kenrap@kennethraplee.com>
Date: Mon, 24 Apr 2023 13:22:49 -0700
Subject: [PATCH 2/2] rpi-kernel: update to 6.1.27

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

diff --git a/srcpkgs/rpi-kernel/template b/srcpkgs/rpi-kernel/template
index c49612b7c510..8fa5a3fcc19c 100644
--- a/srcpkgs/rpi-kernel/template
+++ b/srcpkgs/rpi-kernel/template
@@ -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.27
 revision=1
-_githash="3b98eb7a4aeaecd5274108dc1be7a5df94253500"
+_githash=83cf6b410113c98ebfd0b7fef70b1a7c9539b0b9
 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=be28f607f945ee7083af61608f29ced824db87fc7b49bff4e4c7d64ca8581935
 python_version=3
 
 _kernver="${version}_${revision}"

Re: [PR PATCH] [Updated] Raspberry PI Updates

[kenrap]

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

There is an updated pull request by kenrap against master on the void-packages repository

https://github.com/kenrap/void-packages kenrap-rpi-updates
https://github.com/void-linux/void-packages/pull/43600

Raspberry PI Updates
#### Testing the changes
- I tested the changes in this PR: **YES**

#### Local build testing
- I built this PR locally for these architectures:
  - aarch64 (for rpi4)

#### Contributor's notes
- The rpi-kernel package (both the one currently and this updated version) doesn't USB boot without an initramfs.
  - I used dracut to successfully make this work.

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

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

From c42aba7afa0b6d4f70919d75be1134a1f1e8a1cc Mon Sep 17 00:00:00 2001
From: Kenneth Raplee <kenrap@kennethraplee.com>
Date: Mon, 24 Apr 2023 13:21:07 -0700
Subject: [PATCH 1/2] rpi-firmware: update to 20230418 and apply cleanup

---
 srcpkgs/rpi-firmware/template | 85 ++++++++++++++++++-----------------
 1 file changed, 45 insertions(+), 40 deletions(-)

diff --git a/srcpkgs/rpi-firmware/template b/srcpkgs/rpi-firmware/template
index 5086abfa19fe..4a5a544d9b97 100644
--- a/srcpkgs/rpi-firmware/template
+++ b/srcpkgs/rpi-firmware/template
@@ -1,10 +1,10 @@
 # Template file for 'rpi-firmware'
-_githash="62efc6a69d4e717bf2833c649d622c8298a37e9c"
+_githash="5c276f55a4b21345cd4d6200a504ee991851ff7a"
 _gitshort="${_githash:0:7}"
 
 pkgname=rpi-firmware
-version=20220823
-revision=2
+version=20230418
+revision=1
 archs="armv6l* armv7l* aarch64*"
 provides="linux-firmware-broadcom-${version}_${revision}"
 replaces="linux-firmware-broadcom>=0"
@@ -13,11 +13,14 @@ 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=d137ea260b376d1dca4bc7e1cefb4fd0656c5a4dd11774c82ee06af240694690
 
 conf_files="/boot/cmdline.txt /boot/config.txt"
 nostrip=yes
 
+_debian_firmware_nonfree_repo=https://raw.githubusercontent.com/RPi-Distro/firmware-nonfree/buster
+_bluez_firmware_repo=https://raw.githubusercontent.com/RPi-Distro/bluez-firmware/master
+
 do_install() {
 	rm -f boot/*.img
 	rm -rf boot/overlays
@@ -34,49 +37,51 @@ do_install() {
 	vinstall ${FILESDIR}/cmdline.txt 644 boot
 	vinstall ${FILESDIR}/config.txt 644 boot
 
-	$XBPS_FETCH_CMD https://raw.githubusercontent.com/RPi-Distro/firmware-nonfree/buster/LICENCE.cypress
+	$XBPS_FETCH_CMD "${_debian_firmware_nonfree_repo}/LICENCE.cypress"
 	vlicense LICENCE.cypress
 
-	# Firmware for rpi3 b and zero wifi chip
-	for f in bin txt; do
-		$XBPS_FETCH_CMD https://raw.githubusercontent.com/RPi-Distro/firmware-nonfree/buster/brcm/brcmfmac43430-sdio.${f}
-		vinstall brcmfmac43430-sdio.${f} 0644 usr/lib/firmware/brcm
-	done
+	_wifi_firmware_with_blob=(
+		# For rpi3 b+
+		"brcmfmac43455-sdio"
+		# For rpi zero 2w
+		"brcmfmac43436-sdio"
+		# For rpi4/rpi400
+		"brcmfmac43456-sdio"
+	)
 
-	# Firmware for rpi3 b and zero bluetooth chip
-	$XBPS_FETCH_CMD https://raw.githubusercontent.com/RPi-Distro/bluez-firmware/master/broadcom/BCM43430A1.hcd
-	vinstall BCM43430A1.hcd 0644 usr/lib/firmware/brcm
+	_wifi_firmware=(
+		# For rpi3 b and zero
+		"brcmfmac43430-sdio"
+		# For rpi zero 2w
+		"brcmfmac43436s-sdio"
+	)
 
-	# Firmware for rpi3 b+ wifi chip
-	for f in bin txt clm_blob; do
-		$XBPS_FETCH_CMD https://raw.githubusercontent.com/RPi-Distro/firmware-nonfree/buster/brcm/brcmfmac43455-sdio.${f}
-		vinstall brcmfmac43455-sdio.${f} 0644 usr/lib/firmware/brcm
+	for filename in ${_wifi_firmware_with_blob[@]}; do
+		for ext in bin txt clm_blob; do
+			$XBPS_FETCH_CMD "${_debian_firmware_nonfree_repo}/brcm/${filename}.${ext}"
+			vinstall ${filename}.${ext} 0644 usr/lib/firmware/brcm
+		done
 	done
 
-	# Firmware for rpi3 b+ bluetooth chip
-	$XBPS_FETCH_CMD https://raw.githubusercontent.com/RPi-Distro/bluez-firmware/master/broadcom/BCM4345C0.hcd
-	vinstall BCM4345C0.hcd 0644 usr/lib/firmware/brcm
-
-	# Firmware for rpi zero 2w wifi chip
-	for f in bin txt clm_blob; do
-		$XBPS_FETCH_CMD https://raw.githubusercontent.com/RPi-Distro/firmware-nonfree/buster/brcm/brcmfmac43436-sdio.${f}
-		vinstall brcmfmac43436-sdio.${f} 0644 usr/lib/firmware/brcm
-	done
-	for f in bin txt; do
-		$XBPS_FETCH_CMD https://raw.githubusercontent.com/RPi-Distro/firmware-nonfree/buster/brcm/brcmfmac43436s-sdio.${f}
-		vinstall brcmfmac43436s-sdio.${f} 0644 usr/lib/firmware/brcm
+	for filename in ${_wifi_firmware[@]}; do
+		for ext in bin txt; do
+			$XBPS_FETCH_CMD "${_debian_firmware_nonfree_repo}/brcm/${filename}.${ext}"
+			vinstall ${filename}.${ext} 0644 usr/lib/firmware/brcm
+		done
 	done
 
-	# Firmware for rpi4/rpi400 wifi chip
-	for f in bin txt clm_blob; do
-		$XBPS_FETCH_CMD https://raw.githubusercontent.com/RPi-Distro/firmware-nonfree/buster/brcm/brcmfmac43456-sdio.${f}
-		vinstall brcmfmac43456-sdio.${f} 0644 usr/lib/firmware/brcm
-	done
-
-	# Firmware for rpi4/rpi400 bluetooth chip
-	$XBPS_FETCH_CMD https://raw.githubusercontent.com/RPi-Distro/bluez-firmware/master/broadcom/BCM4345C5.hcd
-	vinstall BCM4345C5.hcd 0644 usr/lib/firmware/brcm
+	_bluez_firmware=(
+		# For rpi3 b and zero
+		"BCM43430A1.hcd"
+		# For rpi3 b+
+		"BCM4345C0.hcd"
+		# For rpi4/rpi400
+		"BCM4345C5.hcd"
+		"BCM43430B0.hcd"
+	)
 
-	$XBPS_FETCH_CMD https://raw.githubusercontent.com/RPi-Distro/bluez-firmware/master/broadcom/BCM43430B0.hcd
-	vinstall BCM43430B0.hcd 0644 usr/lib/firmware/brcm
+	for firmware in ${_bluez_firmware[@]}; do
+		$XBPS_FETCH_CMD "${_bluez_firmware_repo}/broadcom/${firmware}"
+		vinstall $firmware 0644 usr/lib/firmware/brcm
+	done
 }

From 5d96d604f37c6c6776d139dbec0f5057b37f5b65 Mon Sep 17 00:00:00 2001
From: Kenneth Raplee <kenrap@kennethraplee.com>
Date: Mon, 24 Apr 2023 13:22:49 -0700
Subject: [PATCH 2/2] rpi-kernel: update to 6.1.27

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

diff --git a/srcpkgs/rpi-kernel/template b/srcpkgs/rpi-kernel/template
index c49612b7c510..8fa5a3fcc19c 100644
--- a/srcpkgs/rpi-kernel/template
+++ b/srcpkgs/rpi-kernel/template
@@ -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.27
 revision=1
-_githash="3b98eb7a4aeaecd5274108dc1be7a5df94253500"
+_githash=83cf6b410113c98ebfd0b7fef70b1a7c9539b0b9
 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=be28f607f945ee7083af61608f29ced824db87fc7b49bff4e4c7d64ca8581935
 python_version=3
 
 _kernver="${version}_${revision}"

Re: Raspberry PI Updates

[classabbyamp]

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

New comment by classabbyamp on void-packages repository

https://github.com/void-linux/void-packages/pull/43600#issuecomment-1542682938

Comment:
builds available for ease of testing: https://devspace.voidlinux.org/abby/rpi-kernel-6.1.27/

Re: Raspberry PI Updates

[classabbyamp]

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

New comment by classabbyamp on void-packages repository

https://github.com/void-linux/void-packages/pull/43600#issuecomment-1542682938

Comment:
builds available for ease of testing: https://devspace.voidlinux.org/abby/rpi-kernel-6.1.27/

key fingerprint is `6e:a5:91:cc:71:99:18:32:75:dc:be:b4:f8:ac:dc:19`

Re: Raspberry PI Updates

[classabbyamp]

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

New comment by classabbyamp on void-packages repository

https://github.com/void-linux/void-packages/pull/43600#issuecomment-1542682938

Comment:
builds available for ease of testing: https://devspace.voidlinux.org/abby/updates/rpi-kernel-6.1.27/

key fingerprint is `6e:a5:91:cc:71:99:18:32:75:dc:be:b4:f8:ac:dc:19`

Re: Raspberry PI Updates

[tsjk]

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

New comment by tsjk on void-packages repository

https://github.com/void-linux/void-packages/pull/43600#issuecomment-1542698184

Comment:
What's the rationale for the chosen firmware commit?

Re: Raspberry PI Updates

[kenrap]

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

New comment by kenrap on void-packages repository

https://github.com/void-linux/void-packages/pull/43600#issuecomment-1542700843

Comment:
Because this firmware update allows my rpi4 to POST unlike the one currently available.

Re: Raspberry PI Updates

[tsjk]

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

New comment by tsjk on void-packages repository

https://github.com/void-linux/void-packages/pull/43600#issuecomment-1542708786

Comment:
I was mostly asking why the specific commit was picked. Why not the one for v6.1.25 at least - or the very latest https://github.com/raspberrypi/firmware/commit/bcf6e3217f79d4aafe29b836003df5ad90fca399, as the kernel is almost the very latest too.

Re: Raspberry PI Updates

[tsjk]

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

New comment by tsjk on void-packages repository

https://github.com/void-linux/void-packages/pull/43600#issuecomment-1542713882

Comment:
It's getting late here now. I've built the stuff. Gonna deploy tomorrow.
You might wanna update userland as well if you're at it. Feel free to just steal https://github.com/void-linux/void-packages/commit/d15ed92d88bf2b047ac463446dd0b676596dcd9b. I'm running it on my armv6l pis.

Re: Raspberry PI Updates

[tsjk]

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

New comment by tsjk on void-packages repository

https://github.com/void-linux/void-packages/pull/43600#issuecomment-1542713882

Comment:
It's getting late here now. I've built the stuff. Gonna deploy tomorrow.
You might wanna update userland as well while you're at it. Feel free to just steal https://github.com/void-linux/void-packages/commit/d15ed92d88bf2b047ac463446dd0b676596dcd9b. I'm running it on my armv6l pis.

Re: [PR PATCH] [Updated] Raspberry PI Updates

[kenrap]

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

There is an updated pull request by kenrap against master on the void-packages repository

https://github.com/kenrap/void-packages kenrap-rpi-updates
https://github.com/void-linux/void-packages/pull/43600

Raspberry PI Updates
#### Testing the changes
- I tested the changes in this PR: **YES**

#### Local build testing
- I built this PR locally for these architectures:
  - aarch64 (for rpi4)

#### Contributor's notes
- The rpi-kernel package (both the one currently and this updated version) doesn't USB boot without an initramfs.
  - I used dracut to successfully make this work.

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

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

From 1f99fa2f652194e138282087e85af25e1992ea96 Mon Sep 17 00:00:00 2001
From: Kenneth Raplee <kenrap@kennethraplee.com>
Date: Mon, 24 Apr 2023 13:21:07 -0700
Subject: [PATCH 1/3] rpi-firmware: update to 20230428 and apply cleanup

---
 srcpkgs/rpi-firmware/template | 85 ++++++++++++++++++-----------------
 1 file changed, 45 insertions(+), 40 deletions(-)

diff --git a/srcpkgs/rpi-firmware/template b/srcpkgs/rpi-firmware/template
index 5086abfa19fe..3bc6718c57f4 100644
--- a/srcpkgs/rpi-firmware/template
+++ b/srcpkgs/rpi-firmware/template
@@ -1,10 +1,10 @@
 # Template file for 'rpi-firmware'
-_githash="62efc6a69d4e717bf2833c649d622c8298a37e9c"
+_githash="bcf6e3217f79d4aafe29b836003df5ad90fca399"
 _gitshort="${_githash:0:7}"
 
 pkgname=rpi-firmware
-version=20220823
-revision=2
+version=20230428
+revision=1
 archs="armv6l* armv7l* aarch64*"
 provides="linux-firmware-broadcom-${version}_${revision}"
 replaces="linux-firmware-broadcom>=0"
@@ -13,11 +13,14 @@ 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=0b4b18fa0f17f564f2266af8df7e19ab6d08954df0822c583a4055bad8e8ccab
 
 conf_files="/boot/cmdline.txt /boot/config.txt"
 nostrip=yes
 
+_debian_firmware_nonfree_repo=https://raw.githubusercontent.com/RPi-Distro/firmware-nonfree/buster
+_bluez_firmware_repo=https://raw.githubusercontent.com/RPi-Distro/bluez-firmware/master
+
 do_install() {
 	rm -f boot/*.img
 	rm -rf boot/overlays
@@ -34,49 +37,51 @@ do_install() {
 	vinstall ${FILESDIR}/cmdline.txt 644 boot
 	vinstall ${FILESDIR}/config.txt 644 boot
 
-	$XBPS_FETCH_CMD https://raw.githubusercontent.com/RPi-Distro/firmware-nonfree/buster/LICENCE.cypress
+	$XBPS_FETCH_CMD "${_debian_firmware_nonfree_repo}/LICENCE.cypress"
 	vlicense LICENCE.cypress
 
-	# Firmware for rpi3 b and zero wifi chip
-	for f in bin txt; do
-		$XBPS_FETCH_CMD https://raw.githubusercontent.com/RPi-Distro/firmware-nonfree/buster/brcm/brcmfmac43430-sdio.${f}
-		vinstall brcmfmac43430-sdio.${f} 0644 usr/lib/firmware/brcm
-	done
+	_wifi_firmware_with_blob=(
+		# For rpi3 b+
+		"brcmfmac43455-sdio"
+		# For rpi zero 2w
+		"brcmfmac43436-sdio"
+		# For rpi4/rpi400
+		"brcmfmac43456-sdio"
+	)
 
-	# Firmware for rpi3 b and zero bluetooth chip
-	$XBPS_FETCH_CMD https://raw.githubusercontent.com/RPi-Distro/bluez-firmware/master/broadcom/BCM43430A1.hcd
-	vinstall BCM43430A1.hcd 0644 usr/lib/firmware/brcm
+	_wifi_firmware=(
+		# For rpi3 b and zero
+		"brcmfmac43430-sdio"
+		# For rpi zero 2w
+		"brcmfmac43436s-sdio"
+	)
 
-	# Firmware for rpi3 b+ wifi chip
-	for f in bin txt clm_blob; do
-		$XBPS_FETCH_CMD https://raw.githubusercontent.com/RPi-Distro/firmware-nonfree/buster/brcm/brcmfmac43455-sdio.${f}
-		vinstall brcmfmac43455-sdio.${f} 0644 usr/lib/firmware/brcm
+	for filename in ${_wifi_firmware_with_blob[@]}; do
+		for ext in bin txt clm_blob; do
+			$XBPS_FETCH_CMD "${_debian_firmware_nonfree_repo}/brcm/${filename}.${ext}"
+			vinstall ${filename}.${ext} 0644 usr/lib/firmware/brcm
+		done
 	done
 
-	# Firmware for rpi3 b+ bluetooth chip
-	$XBPS_FETCH_CMD https://raw.githubusercontent.com/RPi-Distro/bluez-firmware/master/broadcom/BCM4345C0.hcd
-	vinstall BCM4345C0.hcd 0644 usr/lib/firmware/brcm
-
-	# Firmware for rpi zero 2w wifi chip
-	for f in bin txt clm_blob; do
-		$XBPS_FETCH_CMD https://raw.githubusercontent.com/RPi-Distro/firmware-nonfree/buster/brcm/brcmfmac43436-sdio.${f}
-		vinstall brcmfmac43436-sdio.${f} 0644 usr/lib/firmware/brcm
-	done
-	for f in bin txt; do
-		$XBPS_FETCH_CMD https://raw.githubusercontent.com/RPi-Distro/firmware-nonfree/buster/brcm/brcmfmac43436s-sdio.${f}
-		vinstall brcmfmac43436s-sdio.${f} 0644 usr/lib/firmware/brcm
+	for filename in ${_wifi_firmware[@]}; do
+		for ext in bin txt; do
+			$XBPS_FETCH_CMD "${_debian_firmware_nonfree_repo}/brcm/${filename}.${ext}"
+			vinstall ${filename}.${ext} 0644 usr/lib/firmware/brcm
+		done
 	done
 
-	# Firmware for rpi4/rpi400 wifi chip
-	for f in bin txt clm_blob; do
-		$XBPS_FETCH_CMD https://raw.githubusercontent.com/RPi-Distro/firmware-nonfree/buster/brcm/brcmfmac43456-sdio.${f}
-		vinstall brcmfmac43456-sdio.${f} 0644 usr/lib/firmware/brcm
-	done
-
-	# Firmware for rpi4/rpi400 bluetooth chip
-	$XBPS_FETCH_CMD https://raw.githubusercontent.com/RPi-Distro/bluez-firmware/master/broadcom/BCM4345C5.hcd
-	vinstall BCM4345C5.hcd 0644 usr/lib/firmware/brcm
+	_bluez_firmware=(
+		# For rpi3 b and zero
+		"BCM43430A1.hcd"
+		# For rpi3 b+
+		"BCM4345C0.hcd"
+		# For rpi4/rpi400
+		"BCM4345C5.hcd"
+		"BCM43430B0.hcd"
+	)
 
-	$XBPS_FETCH_CMD https://raw.githubusercontent.com/RPi-Distro/bluez-firmware/master/broadcom/BCM43430B0.hcd
-	vinstall BCM43430B0.hcd 0644 usr/lib/firmware/brcm
+	for firmware in ${_bluez_firmware[@]}; do
+		$XBPS_FETCH_CMD "${_bluez_firmware_repo}/broadcom/${firmware}"
+		vinstall $firmware 0644 usr/lib/firmware/brcm
+	done
 }

From 5f9ec859423c900ad5e5f1c0e8e0bccd26321116 Mon Sep 17 00:00:00 2001
From: Kenneth Raplee <kenrap@kennethraplee.com>
Date: Mon, 24 Apr 2023 13:22:49 -0700
Subject: [PATCH 2/3] rpi-kernel: update to 6.1.27

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

diff --git a/srcpkgs/rpi-kernel/template b/srcpkgs/rpi-kernel/template
index c49612b7c510..8fa5a3fcc19c 100644
--- a/srcpkgs/rpi-kernel/template
+++ b/srcpkgs/rpi-kernel/template
@@ -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.27
 revision=1
-_githash="3b98eb7a4aeaecd5274108dc1be7a5df94253500"
+_githash=83cf6b410113c98ebfd0b7fef70b1a7c9539b0b9
 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=be28f607f945ee7083af61608f29ced824db87fc7b49bff4e4c7d64ca8581935
 python_version=3
 
 _kernver="${version}_${revision}"

From 3a58056013eb0ca7faf842863abea514ef2603e6 Mon Sep 17 00:00:00 2001
From: Tamas Jantvik <tsjk@hotmail.com>
Date: Fri, 28 Apr 2023 13:46:05 +0200
Subject: [PATCH 3/3] rpi-userland: upgrade to 20230420

---
 srcpkgs/rpi-userland/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/rpi-userland/template b/srcpkgs/rpi-userland/template
index 4f1ea38c9e3a..1867a0b4ae5a 100644
--- a/srcpkgs/rpi-userland/template
+++ b/srcpkgs/rpi-userland/template
@@ -1,9 +1,9 @@
 # Template file for 'rpi-userland'
-_githash="97bc8180ad682b004ea224d1db7b8e108eda4397"
+_githash="cc1ca18fb0689b01cc2ca2aa4b400dcee624a213"
 _gitshort="${_githash:0:7}"
 
 pkgname=rpi-userland
-version=20210623
+version=20230420
 revision=1
 build_style=cmake
 hostmakedepends="pkg-config"
@@ -13,7 +13,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-3-Clause"
 homepage="https://github.com/raspberrypi/userland"
 distfiles="https://github.com/raspberrypi/userland/archive/${_githash}.tar.gz"
-checksum=d67def03931215f41b741aed5a3a1bc2bd62fa33f5cc14692e9a4d65f2e0ea27
+checksum=8a4bbfcd7181b2656b2781566c9e10eafdf6834399d2a0d2cf0c50923eec65f6
 
 LDFLAGS="-Wl,--no-as-needed"
 archs="armv6l* armv7l* aarch64*"

Re: Raspberry PI Updates

[classabbyamp]

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

New comment by classabbyamp on void-packages repository

https://github.com/void-linux/void-packages/pull/43600#issuecomment-1542748556

Comment:
i've updated the builds i linked above

Re: Raspberry PI Updates

[tsjk]

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

New comment by tsjk on void-packages repository

https://github.com/void-linux/void-packages/pull/43600#issuecomment-1543741176

Comment:
```
Linux rpi 6.1.27_1 #1 Wed May 10 14:23:49 UTC 2023 armv6l GNU/Linux
```

Seems to work here. Gonna see on another unit, which uses wifi drivers compiled with dkms, as well.

Re: Raspberry PI Updates

[tsjk]

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

New comment by tsjk on void-packages repository

https://github.com/void-linux/void-packages/pull/43600#issuecomment-1543741176

Comment:
```
$ uname -a
Linux rpi 6.1.27_1 #1 Wed May 10 14:23:49 UTC 2023 armv6l GNU/Linux
```

Seems to work here. Gonna see on another unit, which uses wifi drivers compiled with dkms, as well.

Re: Raspberry PI Updates

[tsjk]

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

New comment by tsjk on void-packages repository

https://github.com/void-linux/void-packages/pull/43600#issuecomment-1543767511

Comment:
dkms fails instantly during upgrade. :(

```
rpi-kernel-6.1.27_1: configuring ...
Executing post-install kernel hook: 10-dkms ...
make: Entering directory '/usr/src/rpi-kernel-headers-6.1.27_1'
  SYNC    include/config/auto.conf.cmd
  HOSTCC  scripts/basic/fixdep
  HOSTCC  scripts/kconfig/conf.o
  HOSTCC  scripts/kconfig/confdata.o
  HOSTCC  scripts/kconfig/expr.o
  HOSTCC  scripts/kconfig/lexer.lex.o
  HOSTCC  scripts/kconfig/menu.o
  HOSTCC  scripts/kconfig/parser.tab.o
  HOSTCC  scripts/kconfig/preprocess.o
  HOSTCC  scripts/kconfig/symbol.o
  HOSTCC  scripts/kconfig/util.o
  HOSTLD  scripts/kconfig/conf
crypto/Kconfig:1399: can't open file "arch/arm64/crypto/Kconfig"
make[2]: *** [scripts/kconfig/Makefile:77: syncconfig] Error 1
make[1]: *** [Makefile:704: syncconfig] Error 2
make: *** [Makefile:805: include/config/auto.conf.cmd] Error 2
make: *** [include/config/auto.conf.cmd] Deleting file 'include/generated/rustc_cfg'
make: *** [include/config/auto.conf.cmd] Deleting file 'include/generated/autoconf.h'
make: Leaving directory '/usr/src/rpi-kernel-headers-6.1.27_1'
```

Re: Raspberry PI Updates

[tsjk]

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

New comment by tsjk on void-packages repository

https://github.com/void-linux/void-packages/pull/43600#issuecomment-1544013897

Comment:
I have no idea why ARM64 is set.

Re: Raspberry PI Updates

[tsjk]

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

New comment by tsjk on void-packages repository

https://github.com/void-linux/void-packages/pull/43600#issuecomment-1544013897

Comment:
I have no idea why ARM64 is set.
But those ifs are new, and were not there in 5.15. I wonder if those ifs just don't work here and it fails on ARM64 because it's the first non-existing one.

Re: Raspberry PI Updates

[tsjk]

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

New comment by tsjk on void-packages repository

https://github.com/void-linux/void-packages/pull/43600#issuecomment-1544013897

Comment:
I have no idea why ARM64 is set.
But those ifs are new, and were not there in 5.15. I wonder if those ifs just don't work here and it fails on ARM64 because it's the first non-existing one.
Answer: Yes, that's the case. I think we can just sed away the ones we don't need... somehow

Re: Raspberry PI Updates

[classabbyamp]

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

New comment by classabbyamp on void-packages repository

https://github.com/void-linux/void-packages/pull/43600#issuecomment-1544131004

Comment:
which pi does this error happen on? 

Re: Raspberry PI Updates

[classabbyamp]

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

New comment by classabbyamp on void-packages repository

https://github.com/void-linux/void-packages/pull/43600#issuecomment-1544131004

Comment:
which pi and arch does this error happen on? 

Re: Raspberry PI Updates

[tsjk]

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

New comment by tsjk on void-packages repository

https://github.com/void-linux/void-packages/pull/43600#issuecomment-1544156978

Comment:
> which pi and arch does this error happen on?

armv6l, and it's a Pi 1B.

In addition, when deleting all ifs except the ARM one, I get an infinite loop:
```
$ doas make -j $(nproc) -C /lib/modules/6.1.27_1/build prepare0
...
HOSTLD  scripts/mod/modpost
scripts/Makefile.build:425: warning: overriding recipe for target 'built-in.a'
Makefile:1259: warning: ignoring old recipe for target 'built-in.a'
scripts/Makefile.build:440: warning: overriding recipe for target 'modules.order'
Makefile:1923: warning: ignoring old recipe for target 'modules.order'
scripts/Makefile.build:425: warning: overriding recipe for target 'built-in.a'
Makefile:1259: warning: ignoring old recipe for target 'built-in.a'
scripts/Makefile.build:440: warning: overriding recipe for target 'modules.order'
Makefile:1923: warning: ignoring old recipe for target 'modules.order'
...
```

Have anyone tested that installing the package works as expected when dkms is installed?
I don't have any dkms-modules as I usually clean them out before kernel upgrades and then reinstall. So the failure is caused by just having dkms.

Re: Raspberry PI Updates

[classabbyamp]

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

New comment by classabbyamp on void-packages repository

https://github.com/void-linux/void-packages/pull/43600#issuecomment-1544171314

Comment:
after resetting the edits you made to whichever file, does adding arm_64bit=0 to /boot/config.txt fix it? 

Re: Raspberry PI Updates

[classabbyamp]

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

New comment by classabbyamp on void-packages repository

https://github.com/void-linux/void-packages/pull/43600#issuecomment-1544171314

Comment:
after resetting the edits you made to whichever file, does adding arm_64bit=0 to /boot/config.txt (and rebooting) fix it? 

Re: Raspberry PI Updates

[tsjk]

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

New comment by tsjk on void-packages repository

https://github.com/void-linux/void-packages/pull/43600#issuecomment-1544180233

Comment:
> after resetting the edits you made to whichever file, does adding arm_64bit=0 to /boot/config.txt fix it?

I can try. But I haven't rebooted. This happens immediately when the kernel package is upgraded.
The thing is that the ifs in crypto/Kconfig do not work. If I delete the ARM64-clause it fails on the next one (as we strip away all archs except the target's when building the package.

Edit: Adding the directive to /boot/config.txt makes no difference.

Re: Raspberry PI Updates

[tsjk]

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

New comment by tsjk on void-packages repository

https://github.com/void-linux/void-packages/pull/43600#issuecomment-1544180233

Comment:
> after resetting the edits you made to whichever file, does adding arm_64bit=0 to /boot/config.txt fix it?

I can try. But I haven't rebooted. This happens immediately when the kernel package is upgraded.
The thing is that the ifs in crypto/Kconfig do not work. If I delete the ARM64-clause it fails on the next one (as we strip away all archs except the target's when building the package).

Edit: Adding the directive to /boot/config.txt makes no difference.

Re: Raspberry PI Updates

[tsjk]

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

New comment by tsjk on void-packages repository

https://github.com/void-linux/void-packages/pull/43600#issuecomment-1544180233

Comment:
> after resetting the edits you made to whichever file, does adding arm_64bit=0 to /boot/config.txt fix it?

I can try. But I haven't rebooted. This happens immediately when the kernel package is upgraded.
The thing is that the ifs in crypto/Kconfig (around line 1399) do not work. If I delete the ARM64-clause it fails on the next one (as we strip away all archs except the target's when building the package).

Edit: Adding the directive to /boot/config.txt makes no difference.

Re: Raspberry PI Updates

[tsjk]

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

New comment by tsjk on void-packages repository

https://github.com/void-linux/void-packages/pull/43600#issuecomment-1544180233

Comment:
> after resetting the edits you made to whichever file, does adding arm_64bit=0 to /boot/config.txt fix it?

I can try. But I haven't rebooted. This happens immediately when the kernel package is upgraded - but only if dkms is installed.
The thing is that the ifs in crypto/Kconfig (around line 1399) do not work. If I delete the ARM64-clause it fails on the next one (as we strip away all archs except the target's when building the package).

Edit: Adding the directive to /boot/config.txt makes no difference.

Re: Raspberry PI Updates

[tsjk]

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

New comment by tsjk on void-packages repository

https://github.com/void-linux/void-packages/pull/43600#issuecomment-1543741176

Comment:
```
$ uname -a
Linux rpi 6.1.27_1 #1 Wed May 10 14:23:49 UTC 2023 armv6l GNU/Linux
```

Seems to work here. Gonna see on another unit, which uses wifi drivers compiled with dkms, as well. The unit that shows the above output does not have dkms.

Re: Raspberry PI Updates

[tsjk]

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

New comment by tsjk on void-packages repository

https://github.com/void-linux/void-packages/pull/43600#issuecomment-1543767511

Comment:
dkms fails instantly during the upgrade of the rpi-kernel package. :(

```
rpi-kernel-6.1.27_1: configuring ...
Executing post-install kernel hook: 10-dkms ...
make: Entering directory '/usr/src/rpi-kernel-headers-6.1.27_1'
  SYNC    include/config/auto.conf.cmd
  HOSTCC  scripts/basic/fixdep
  HOSTCC  scripts/kconfig/conf.o
  HOSTCC  scripts/kconfig/confdata.o
  HOSTCC  scripts/kconfig/expr.o
  HOSTCC  scripts/kconfig/lexer.lex.o
  HOSTCC  scripts/kconfig/menu.o
  HOSTCC  scripts/kconfig/parser.tab.o
  HOSTCC  scripts/kconfig/preprocess.o
  HOSTCC  scripts/kconfig/symbol.o
  HOSTCC  scripts/kconfig/util.o
  HOSTLD  scripts/kconfig/conf
crypto/Kconfig:1399: can't open file "arch/arm64/crypto/Kconfig"
make[2]: *** [scripts/kconfig/Makefile:77: syncconfig] Error 1
make[1]: *** [Makefile:704: syncconfig] Error 2
make: *** [Makefile:805: include/config/auto.conf.cmd] Error 2
make: *** [include/config/auto.conf.cmd] Deleting file 'include/generated/rustc_cfg'
make: *** [include/config/auto.conf.cmd] Deleting file 'include/generated/autoconf.h'
make: Leaving directory '/usr/src/rpi-kernel-headers-6.1.27_1'
```

Re: Raspberry PI Updates

[tsjk]

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

New comment by tsjk on void-packages repository

https://github.com/void-linux/void-packages/pull/43600#issuecomment-1544203121

Comment:
I'll revert on that system for now, to rpi-kernel-5.15.92_1.
I guess that one can run
```
make -j $(nproc) -C /lib/modules/6.1.27_1/build prepare0
```
(as root) even without dkms to reproduce the issue. As far as I've gathered the dkms hook fails on that command.

Re: Raspberry PI Updates

[ahesford]

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

New comment by ahesford on void-packages repository

https://github.com/void-linux/void-packages/pull/43600#issuecomment-1589502251

Comment:
Upstream is now up to 6.1.32: https://github.com/void-linux/void-packages/pull/44411/

Re: Raspberry PI Updates

[lilmike]

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

New comment by lilmike on void-packages repository

https://github.com/void-linux/void-packages/pull/43600#issuecomment-1589724052

Comment:
My friend had the same problem of rpi4 not booting via usb, updated the latest image with the temp repo and it boots fine. Consider this successful from me.

-Michael.

Re: [PR PATCH] [Updated] Raspberry PI Updates

[classabbyamp]

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

There is an updated pull request by classabbyamp against master on the void-packages repository

https://github.com/kenrap/void-packages kenrap-rpi-updates
https://github.com/void-linux/void-packages/pull/43600

Raspberry PI Updates
#### Testing the changes
- I tested the changes in this PR: **YES**

#### Local build testing
- I built this PR locally for these architectures:
  - aarch64 (for rpi4)

#### Contributor's notes
- The rpi-kernel package (both the one currently and this updated version) doesn't USB boot without an initramfs.
  - I used dracut to successfully make this work.

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

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

From 3a0edd8b204c277dc316c76c7c8322039d1ae7e5 Mon Sep 17 00:00:00 2001
From: Kenneth Raplee <kenrap@kennethraplee.com>
Date: Mon, 24 Apr 2023 13:21:07 -0700
Subject: [PATCH 1/3] rpi-firmware: update to 20230623 and apply cleanup

---
 srcpkgs/rpi-firmware/template | 92 ++++++++++++++++++-----------------
 1 file changed, 48 insertions(+), 44 deletions(-)

diff --git a/srcpkgs/rpi-firmware/template b/srcpkgs/rpi-firmware/template
index 5086abfa19fe..87db3012ca6b 100644
--- a/srcpkgs/rpi-firmware/template
+++ b/srcpkgs/rpi-firmware/template
@@ -1,23 +1,25 @@
 # Template file for 'rpi-firmware'
-_githash="62efc6a69d4e717bf2833c649d622c8298a37e9c"
-_gitshort="${_githash:0:7}"
-
 pkgname=rpi-firmware
-version=20220823
-revision=2
+version=20230623
+revision=1
+_githash="a7f7e2da955ef01b50516ea9722f6126e8d521a8"
+_gitshort="${_githash:0:7}"
 archs="armv6l* armv7l* aarch64*"
-provides="linux-firmware-broadcom-${version}_${revision}"
-replaces="linux-firmware-broadcom>=0"
 short_desc="Firmware files for the Raspberry Pi (git ${_gitshort})"
 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=0b4b18fa0f17f564f2266af8df7e19ab6d08954df0822c583a4055bad8e8ccab
+provides="linux-firmware-broadcom-${version}_${revision}"
+replaces="linux-firmware-broadcom>=0"
 
 conf_files="/boot/cmdline.txt /boot/config.txt"
 nostrip=yes
 
+_debian_firmware_nonfree_repo=https://raw.githubusercontent.com/RPi-Distro/firmware-nonfree/buster
+_bluez_firmware_repo=https://raw.githubusercontent.com/RPi-Distro/bluez-firmware/master
+
 do_install() {
 	rm -f boot/*.img
 	rm -rf boot/overlays
@@ -34,49 +36,51 @@ do_install() {
 	vinstall ${FILESDIR}/cmdline.txt 644 boot
 	vinstall ${FILESDIR}/config.txt 644 boot
 
-	$XBPS_FETCH_CMD https://raw.githubusercontent.com/RPi-Distro/firmware-nonfree/buster/LICENCE.cypress
+	$XBPS_FETCH_CMD "${_debian_firmware_nonfree_repo}/LICENCE.cypress"
 	vlicense LICENCE.cypress
 
-	# Firmware for rpi3 b and zero wifi chip
-	for f in bin txt; do
-		$XBPS_FETCH_CMD https://raw.githubusercontent.com/RPi-Distro/firmware-nonfree/buster/brcm/brcmfmac43430-sdio.${f}
-		vinstall brcmfmac43430-sdio.${f} 0644 usr/lib/firmware/brcm
-	done
+	_wifi_firmware_with_blob=(
+		# For rpi3 b+
+		"brcmfmac43455-sdio"
+		# For rpi zero 2w
+		"brcmfmac43436-sdio"
+		# For rpi4/rpi400
+		"brcmfmac43456-sdio"
+	)
 
-	# Firmware for rpi3 b and zero bluetooth chip
-	$XBPS_FETCH_CMD https://raw.githubusercontent.com/RPi-Distro/bluez-firmware/master/broadcom/BCM43430A1.hcd
-	vinstall BCM43430A1.hcd 0644 usr/lib/firmware/brcm
+	_wifi_firmware=(
+		# For rpi3 b and zero
+		"brcmfmac43430-sdio"
+		# For rpi zero 2w
+		"brcmfmac43436s-sdio"
+	)
 
-	# Firmware for rpi3 b+ wifi chip
-	for f in bin txt clm_blob; do
-		$XBPS_FETCH_CMD https://raw.githubusercontent.com/RPi-Distro/firmware-nonfree/buster/brcm/brcmfmac43455-sdio.${f}
-		vinstall brcmfmac43455-sdio.${f} 0644 usr/lib/firmware/brcm
+	for filename in ${_wifi_firmware_with_blob[@]}; do
+		for ext in bin txt clm_blob; do
+			$XBPS_FETCH_CMD "${_debian_firmware_nonfree_repo}/brcm/${filename}.${ext}"
+			vinstall ${filename}.${ext} 0644 usr/lib/firmware/brcm
+		done
 	done
 
-	# Firmware for rpi3 b+ bluetooth chip
-	$XBPS_FETCH_CMD https://raw.githubusercontent.com/RPi-Distro/bluez-firmware/master/broadcom/BCM4345C0.hcd
-	vinstall BCM4345C0.hcd 0644 usr/lib/firmware/brcm
-
-	# Firmware for rpi zero 2w wifi chip
-	for f in bin txt clm_blob; do
-		$XBPS_FETCH_CMD https://raw.githubusercontent.com/RPi-Distro/firmware-nonfree/buster/brcm/brcmfmac43436-sdio.${f}
-		vinstall brcmfmac43436-sdio.${f} 0644 usr/lib/firmware/brcm
-	done
-	for f in bin txt; do
-		$XBPS_FETCH_CMD https://raw.githubusercontent.com/RPi-Distro/firmware-nonfree/buster/brcm/brcmfmac43436s-sdio.${f}
-		vinstall brcmfmac43436s-sdio.${f} 0644 usr/lib/firmware/brcm
+	for filename in ${_wifi_firmware[@]}; do
+		for ext in bin txt; do
+			$XBPS_FETCH_CMD "${_debian_firmware_nonfree_repo}/brcm/${filename}.${ext}"
+			vinstall ${filename}.${ext} 0644 usr/lib/firmware/brcm
+		done
 	done
 
-	# Firmware for rpi4/rpi400 wifi chip
-	for f in bin txt clm_blob; do
-		$XBPS_FETCH_CMD https://raw.githubusercontent.com/RPi-Distro/firmware-nonfree/buster/brcm/brcmfmac43456-sdio.${f}
-		vinstall brcmfmac43456-sdio.${f} 0644 usr/lib/firmware/brcm
-	done
-
-	# Firmware for rpi4/rpi400 bluetooth chip
-	$XBPS_FETCH_CMD https://raw.githubusercontent.com/RPi-Distro/bluez-firmware/master/broadcom/BCM4345C5.hcd
-	vinstall BCM4345C5.hcd 0644 usr/lib/firmware/brcm
+	_bluez_firmware=(
+		# For rpi3 b and zero
+		"BCM43430A1.hcd"
+		# For rpi3 b+
+		"BCM4345C0.hcd"
+		# For rpi4/rpi400
+		"BCM4345C5.hcd"
+		"BCM43430B0.hcd"
+	)
 
-	$XBPS_FETCH_CMD https://raw.githubusercontent.com/RPi-Distro/bluez-firmware/master/broadcom/BCM43430B0.hcd
-	vinstall BCM43430B0.hcd 0644 usr/lib/firmware/brcm
+	for firmware in ${_bluez_firmware[@]}; do
+		$XBPS_FETCH_CMD "${_bluez_firmware_repo}/broadcom/${firmware}"
+		vinstall $firmware 0644 usr/lib/firmware/brcm
+	done
 }

From e904a64b0fd711668c32f04dc8014f46c4b9d8b5 Mon Sep 17 00:00:00 2001
From: Kenneth Raplee <kenrap@kennethraplee.com>
Date: Mon, 24 Apr 2023 13:22:49 -0700
Subject: [PATCH 2/3] rpi-kernel: update to 6.1.35.

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

diff --git a/srcpkgs/rpi-kernel/template b/srcpkgs/rpi-kernel/template
index c49612b7c510..867e532ef79b 100644
--- a/srcpkgs/rpi-kernel/template
+++ b/srcpkgs/rpi-kernel/template
@@ -11,20 +11,19 @@
 # [1] https://github.com/raspberrypi/linux/tags
 #
 # Upstream documentation: https://www.raspberrypi.com/documentation/computers/linux_kernel.html
-
 pkgname=rpi-kernel
-version=5.15.72
+version=6.1.35
 revision=1
-_githash="3b98eb7a4aeaecd5274108dc1be7a5df94253500"
+_githash=4b60cbf0149f5b5fa5eb9149bd35c750cbc02b25
 archs="armv6l* armv7l* aarch64*"
 hostmakedepends="perl kmod uboot-mkimage openssl-devel bc bison flex xz"
 makedepends="ncurses-devel"
+short_desc="Linux kernel for Raspberry Pi (${version%.*} series [git ${_githash:0:7}])"
 maintainer="Piraty <mail@piraty.dev>"
-homepage="http://www.kernel.org"
 license="GPL-2.0-only"
-short_desc="Linux kernel for Raspberry Pi (${version%.*} series [git ${_githash:0:7}])"
+homepage="http://www.kernel.org"
 distfiles="https://github.com/raspberrypi/linux/archive/${_githash}.tar.gz"
-checksum=5cad1fd22f309ddd7b996df748aa21ced72f88d47fdbb8d4bfd9ef3a8a9b6ce9
+checksum=74793a0d0c5cbec213913ea921384c00cf9112e0ce39d8215cda7a9048208d44
 python_version=3
 
 _kernver="${version}_${revision}"

From 111ef3ee4eb4ab2111b7cad88d56595e6b68c8be Mon Sep 17 00:00:00 2001
From: Tamas Jantvik <tsjk@hotmail.com>
Date: Fri, 28 Apr 2023 13:46:05 +0200
Subject: [PATCH 3/3] rpi-userland: update to 20230420.

---
 srcpkgs/rpi-userland/template | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/srcpkgs/rpi-userland/template b/srcpkgs/rpi-userland/template
index 4f1ea38c9e3a..bfb07d045d91 100644
--- a/srcpkgs/rpi-userland/template
+++ b/srcpkgs/rpi-userland/template
@@ -1,19 +1,18 @@
 # Template file for 'rpi-userland'
-_githash="97bc8180ad682b004ea224d1db7b8e108eda4397"
-_gitshort="${_githash:0:7}"
-
 pkgname=rpi-userland
-version=20210623
+version=20230420
 revision=1
+_githash="cc1ca18fb0689b01cc2ca2aa4b400dcee624a213"
+_gitshort="${_githash:0:7}"
 build_style=cmake
-hostmakedepends="pkg-config"
 configure_args="-DCMAKE_INSTALL_RPATH=\$ORIGIN/../lib"
+hostmakedepends="pkg-config"
 short_desc="Raspberry Pi GPU userland libraries and utilities (git ${_gitshort})"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-3-Clause"
 homepage="https://github.com/raspberrypi/userland"
 distfiles="https://github.com/raspberrypi/userland/archive/${_githash}.tar.gz"
-checksum=d67def03931215f41b741aed5a3a1bc2bd62fa33f5cc14692e9a4d65f2e0ea27
+checksum=8a4bbfcd7181b2656b2781566c9e10eafdf6834399d2a0d2cf0c50923eec65f6
 
 LDFLAGS="-Wl,--no-as-needed"
 archs="armv6l* armv7l* aarch64*"

Re: [PR PATCH] [Updated] Raspberry PI Updates

[classabbyamp]

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

There is an updated pull request by classabbyamp against master on the void-packages repository

https://github.com/kenrap/void-packages kenrap-rpi-updates
https://github.com/void-linux/void-packages/pull/43600

Raspberry PI Updates
#### Testing the changes
- I tested the changes in this PR: **YES**

#### Local build testing
- I built this PR locally for these architectures:
  - aarch64 (for rpi4)

#### Contributor's notes
- The rpi-kernel package (both the one currently and this updated version) doesn't USB boot without an initramfs.
  - I used dracut to successfully make this work.

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

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

From 1c8a69f180e9c490da8522cae0437784b0a6c423 Mon Sep 17 00:00:00 2001
From: Kenneth Raplee <kenrap@kennethraplee.com>
Date: Mon, 24 Apr 2023 13:21:07 -0700
Subject: [PATCH 1/3] rpi-firmware: update to 20230623 and apply cleanup

---
 srcpkgs/rpi-firmware/template | 92 ++++++++++++++++++-----------------
 1 file changed, 48 insertions(+), 44 deletions(-)

diff --git a/srcpkgs/rpi-firmware/template b/srcpkgs/rpi-firmware/template
index 5086abfa19fe..0ff85c59aeb6 100644
--- a/srcpkgs/rpi-firmware/template
+++ b/srcpkgs/rpi-firmware/template
@@ -1,23 +1,25 @@
 # Template file for 'rpi-firmware'
-_githash="62efc6a69d4e717bf2833c649d622c8298a37e9c"
-_gitshort="${_githash:0:7}"
-
 pkgname=rpi-firmware
-version=20220823
-revision=2
+version=20230623
+revision=1
+_githash="a7f7e2da955ef01b50516ea9722f6126e8d521a8"
+_gitshort="${_githash:0:7}"
 archs="armv6l* armv7l* aarch64*"
-provides="linux-firmware-broadcom-${version}_${revision}"
-replaces="linux-firmware-broadcom>=0"
 short_desc="Firmware files for the Raspberry Pi (git ${_gitshort})"
 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=ead7a45c0013c0f2a56848fcde2532d2fe493533e6c1e5cc954c921893caae43
+provides="linux-firmware-broadcom-${version}_${revision}"
+replaces="linux-firmware-broadcom>=0"
 
 conf_files="/boot/cmdline.txt /boot/config.txt"
 nostrip=yes
 
+_debian_firmware_nonfree_repo=https://raw.githubusercontent.com/RPi-Distro/firmware-nonfree/buster
+_bluez_firmware_repo=https://raw.githubusercontent.com/RPi-Distro/bluez-firmware/master
+
 do_install() {
 	rm -f boot/*.img
 	rm -rf boot/overlays
@@ -34,49 +36,51 @@ do_install() {
 	vinstall ${FILESDIR}/cmdline.txt 644 boot
 	vinstall ${FILESDIR}/config.txt 644 boot
 
-	$XBPS_FETCH_CMD https://raw.githubusercontent.com/RPi-Distro/firmware-nonfree/buster/LICENCE.cypress
+	$XBPS_FETCH_CMD "${_debian_firmware_nonfree_repo}/LICENCE.cypress"
 	vlicense LICENCE.cypress
 
-	# Firmware for rpi3 b and zero wifi chip
-	for f in bin txt; do
-		$XBPS_FETCH_CMD https://raw.githubusercontent.com/RPi-Distro/firmware-nonfree/buster/brcm/brcmfmac43430-sdio.${f}
-		vinstall brcmfmac43430-sdio.${f} 0644 usr/lib/firmware/brcm
-	done
+	_wifi_firmware_with_blob=(
+		# For rpi3 b+
+		"brcmfmac43455-sdio"
+		# For rpi zero 2w
+		"brcmfmac43436-sdio"
+		# For rpi4/rpi400
+		"brcmfmac43456-sdio"
+	)
 
-	# Firmware for rpi3 b and zero bluetooth chip
-	$XBPS_FETCH_CMD https://raw.githubusercontent.com/RPi-Distro/bluez-firmware/master/broadcom/BCM43430A1.hcd
-	vinstall BCM43430A1.hcd 0644 usr/lib/firmware/brcm
+	_wifi_firmware=(
+		# For rpi3 b and zero
+		"brcmfmac43430-sdio"
+		# For rpi zero 2w
+		"brcmfmac43436s-sdio"
+	)
 
-	# Firmware for rpi3 b+ wifi chip
-	for f in bin txt clm_blob; do
-		$XBPS_FETCH_CMD https://raw.githubusercontent.com/RPi-Distro/firmware-nonfree/buster/brcm/brcmfmac43455-sdio.${f}
-		vinstall brcmfmac43455-sdio.${f} 0644 usr/lib/firmware/brcm
+	for filename in ${_wifi_firmware_with_blob[@]}; do
+		for ext in bin txt clm_blob; do
+			$XBPS_FETCH_CMD "${_debian_firmware_nonfree_repo}/brcm/${filename}.${ext}"
+			vinstall ${filename}.${ext} 0644 usr/lib/firmware/brcm
+		done
 	done
 
-	# Firmware for rpi3 b+ bluetooth chip
-	$XBPS_FETCH_CMD https://raw.githubusercontent.com/RPi-Distro/bluez-firmware/master/broadcom/BCM4345C0.hcd
-	vinstall BCM4345C0.hcd 0644 usr/lib/firmware/brcm
-
-	# Firmware for rpi zero 2w wifi chip
-	for f in bin txt clm_blob; do
-		$XBPS_FETCH_CMD https://raw.githubusercontent.com/RPi-Distro/firmware-nonfree/buster/brcm/brcmfmac43436-sdio.${f}
-		vinstall brcmfmac43436-sdio.${f} 0644 usr/lib/firmware/brcm
-	done
-	for f in bin txt; do
-		$XBPS_FETCH_CMD https://raw.githubusercontent.com/RPi-Distro/firmware-nonfree/buster/brcm/brcmfmac43436s-sdio.${f}
-		vinstall brcmfmac43436s-sdio.${f} 0644 usr/lib/firmware/brcm
+	for filename in ${_wifi_firmware[@]}; do
+		for ext in bin txt; do
+			$XBPS_FETCH_CMD "${_debian_firmware_nonfree_repo}/brcm/${filename}.${ext}"
+			vinstall ${filename}.${ext} 0644 usr/lib/firmware/brcm
+		done
 	done
 
-	# Firmware for rpi4/rpi400 wifi chip
-	for f in bin txt clm_blob; do
-		$XBPS_FETCH_CMD https://raw.githubusercontent.com/RPi-Distro/firmware-nonfree/buster/brcm/brcmfmac43456-sdio.${f}
-		vinstall brcmfmac43456-sdio.${f} 0644 usr/lib/firmware/brcm
-	done
-
-	# Firmware for rpi4/rpi400 bluetooth chip
-	$XBPS_FETCH_CMD https://raw.githubusercontent.com/RPi-Distro/bluez-firmware/master/broadcom/BCM4345C5.hcd
-	vinstall BCM4345C5.hcd 0644 usr/lib/firmware/brcm
+	_bluez_firmware=(
+		# For rpi3 b and zero
+		"BCM43430A1.hcd"
+		# For rpi3 b+
+		"BCM4345C0.hcd"
+		# For rpi4/rpi400
+		"BCM4345C5.hcd"
+		"BCM43430B0.hcd"
+	)
 
-	$XBPS_FETCH_CMD https://raw.githubusercontent.com/RPi-Distro/bluez-firmware/master/broadcom/BCM43430B0.hcd
-	vinstall BCM43430B0.hcd 0644 usr/lib/firmware/brcm
+	for firmware in ${_bluez_firmware[@]}; do
+		$XBPS_FETCH_CMD "${_bluez_firmware_repo}/broadcom/${firmware}"
+		vinstall $firmware 0644 usr/lib/firmware/brcm
+	done
 }

From 6c02b3687d4c2e682ffbf5ce82fe6763cf395fb7 Mon Sep 17 00:00:00 2001
From: Kenneth Raplee <kenrap@kennethraplee.com>
Date: Mon, 24 Apr 2023 13:22:49 -0700
Subject: [PATCH 2/3] rpi-kernel: update to 6.1.35.

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

diff --git a/srcpkgs/rpi-kernel/template b/srcpkgs/rpi-kernel/template
index c49612b7c510..867e532ef79b 100644
--- a/srcpkgs/rpi-kernel/template
+++ b/srcpkgs/rpi-kernel/template
@@ -11,20 +11,19 @@
 # [1] https://github.com/raspberrypi/linux/tags
 #
 # Upstream documentation: https://www.raspberrypi.com/documentation/computers/linux_kernel.html
-
 pkgname=rpi-kernel
-version=5.15.72
+version=6.1.35
 revision=1
-_githash="3b98eb7a4aeaecd5274108dc1be7a5df94253500"
+_githash=4b60cbf0149f5b5fa5eb9149bd35c750cbc02b25
 archs="armv6l* armv7l* aarch64*"
 hostmakedepends="perl kmod uboot-mkimage openssl-devel bc bison flex xz"
 makedepends="ncurses-devel"
+short_desc="Linux kernel for Raspberry Pi (${version%.*} series [git ${_githash:0:7}])"
 maintainer="Piraty <mail@piraty.dev>"
-homepage="http://www.kernel.org"
 license="GPL-2.0-only"
-short_desc="Linux kernel for Raspberry Pi (${version%.*} series [git ${_githash:0:7}])"
+homepage="http://www.kernel.org"
 distfiles="https://github.com/raspberrypi/linux/archive/${_githash}.tar.gz"
-checksum=5cad1fd22f309ddd7b996df748aa21ced72f88d47fdbb8d4bfd9ef3a8a9b6ce9
+checksum=74793a0d0c5cbec213913ea921384c00cf9112e0ce39d8215cda7a9048208d44
 python_version=3
 
 _kernver="${version}_${revision}"

From 7f4a530262287f798e1435aa451f4f288af1c3e1 Mon Sep 17 00:00:00 2001
From: Tamas Jantvik <tsjk@hotmail.com>
Date: Fri, 28 Apr 2023 13:46:05 +0200
Subject: [PATCH 3/3] rpi-userland: update to 20230420.

---
 srcpkgs/rpi-userland/template | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/srcpkgs/rpi-userland/template b/srcpkgs/rpi-userland/template
index 4f1ea38c9e3a..bfb07d045d91 100644
--- a/srcpkgs/rpi-userland/template
+++ b/srcpkgs/rpi-userland/template
@@ -1,19 +1,18 @@
 # Template file for 'rpi-userland'
-_githash="97bc8180ad682b004ea224d1db7b8e108eda4397"
-_gitshort="${_githash:0:7}"
-
 pkgname=rpi-userland
-version=20210623
+version=20230420
 revision=1
+_githash="cc1ca18fb0689b01cc2ca2aa4b400dcee624a213"
+_gitshort="${_githash:0:7}"
 build_style=cmake
-hostmakedepends="pkg-config"
 configure_args="-DCMAKE_INSTALL_RPATH=\$ORIGIN/../lib"
+hostmakedepends="pkg-config"
 short_desc="Raspberry Pi GPU userland libraries and utilities (git ${_gitshort})"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-3-Clause"
 homepage="https://github.com/raspberrypi/userland"
 distfiles="https://github.com/raspberrypi/userland/archive/${_githash}.tar.gz"
-checksum=d67def03931215f41b741aed5a3a1bc2bd62fa33f5cc14692e9a4d65f2e0ea27
+checksum=8a4bbfcd7181b2656b2781566c9e10eafdf6834399d2a0d2cf0c50923eec65f6
 
 LDFLAGS="-Wl,--no-as-needed"
 archs="armv6l* armv7l* aarch64*"

Re: Raspberry PI Updates

[r-ricci]

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

New comment by r-ricci on void-packages repository

https://github.com/void-linux/void-packages/pull/43600#issuecomment-1657270006

Comment:
https://github.com/void-linux/void-packages/issues/44807#issuecomment-1657269573

Re: Raspberry PI Updates

[tsjk]

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

New comment by tsjk on void-packages repository

https://github.com/void-linux/void-packages/pull/43600#issuecomment-1664491675

Comment:
Yeah, we are a bit stuck here.

Re: Raspberry PI Updates

[classabbyamp]

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

New comment by classabbyamp on void-packages repository

https://github.com/void-linux/void-packages/pull/43600#issuecomment-1664541602

Comment:
I've made some progress but I've been busy with other things

Re: Raspberry PI Updates

[moabeat-berlin]

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

New comment by moabeat-berlin on void-packages repository

https://github.com/void-linux/void-packages/pull/43600#issuecomment-1722569106

Comment:
I think I figured something out why dkms is not working with the new kernel. There have been some changes how the kernel is configured.  For example, the crypto module got has now dependencies into the "arch" directory. Check this [diff between the old 5.15.72 and the newer 6.1.53](https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/diff/crypto/Kconfig?id=v6.1.53&id2=v5.15.72) version.

Now, the dkms with the x86_64 architecture only works due an error in the template script of the "linux6.3" package. [Here](https://github.com/void-linux/void-packages/blob/master/srcpkgs/linux6.3/template#L294) all files related to unnecessary architectures should actually get removed. The case to extend this also to architectures like "powerpc" (matching *p) uses the "arch" variable and expects it either as "i386" or "x86_64". However, this is never true as [here](https://github.com/void-linux/void-packages/blob/master/srcpkgs/linux6.3/template#L119) the "arch" variable is set to "x86". Therefore no "powerpc" directory is removed on x86_64 and dkms works. By accident all necessary sub-directories in the "arch" directory are present.

For "arm64" this is different. Here architectures starting with "p*" are removed. Now the question is, why is this important? Well, something similar is present in the "rpi-kernel" package [here](https://github.com/void-linux/void-packages/blob/master/srcpkgs/rpi-kernel/template#L193). It even removes "arm64" if you are on "arm". And since there is a hard-coded dependency in "crypto/Kconfig" it breaks.

Maybe the best approach is, to not remove any unnecessary architectures at all anymore if there are so many interdependences?

Re: Raspberry PI Updates

[moabeat-berlin]

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

New comment by moabeat-berlin on void-packages repository

https://github.com/void-linux/void-packages/pull/43600#issuecomment-1722569106

Comment:
I think I figured something out why dkms is not working with the new kernel. There have been some changes how the kernel is configured.  For example, the crypto module got has now dependencies into the "arch" directory. Check this [diff between the old 5.15.72 and the newer 6.1.53](https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/diff/crypto/Kconfig?id=v6.1.53&id2=v5.15.72) version.

Now, the dkms with the x86_64 architecture only works due an error in the template script of the "linux6.3" package. [Here](https://github.com/void-linux/void-packages/blob/master/srcpkgs/linux6.3/template#L294) all files related to unnecessary architectures should actually get removed. The case to extend this also to architectures like "powerpc" (matching *p) uses the "arch" variable and expects it either as "i386" or "x86_64". However, this is never true as [here](https://github.com/void-linux/void-packages/blob/master/srcpkgs/linux6.3/template#L119) the "arch" variable is set to "x86". Therefore no "powerpc" directory is removed on x86_64 and dkms works. By accident all necessary sub-directories in the "arch" directory are present.

For "arm64" this is different. Here architectures starting with "p*" are removed. Now the question is, why is this importantfor the "rpi-kernel"? Well, something similar is present in the "rpi-kernel" package [here](https://github.com/void-linux/void-packages/blob/master/srcpkgs/rpi-kernel/template#L193). It even removes "arm64" if you are on "arm". And since there is a hard-coded dependency in "crypto/Kconfig" it breaks. Additionally the "dkms" package depends on the "linux-headers" package, only for architecture "arm" and "arm64" (matching arm*) [here](https://github.com/void-linux/void-packages/blob/master/srcpkgs/dkms/template#L20). That also installs the "linux6.3-headers" package, which also removes architectures (as describes above). So neither dkms module build is successful, not for "rpi-kernel" nor for the usual "linux-kernel".

Maybe the best approach is, to not remove any unnecessary architectures at all anymore if there are so many interdependences?

Re: Raspberry PI Updates

[moabeat-berlin]

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

New comment by moabeat-berlin on void-packages repository

https://github.com/void-linux/void-packages/pull/43600#issuecomment-1722569106

Comment:
I think I figured something out why dkms is not working with the new kernel. There have been some changes how the kernel is configured.  For example, the crypto module got has now dependencies into the "arch" directory. Check this [diff between the old 5.15.72 and the newer 6.1.53](https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/diff/crypto/Kconfig?id=v6.1.53&id2=v5.15.72) version (at the very end of the file). 

Now, the dkms with the x86_64 architecture only works due an error in the template script of the "linux6.3" package. [Here](https://github.com/void-linux/void-packages/blob/master/srcpkgs/linux6.3/template#L294) all files related to unnecessary architectures should actually get removed. The case to extend this also to architectures like "powerpc" (matching *p) uses the "arch" variable and expects it either as "i386" or "x86_64". However, this is never true as [here](https://github.com/void-linux/void-packages/blob/master/srcpkgs/linux6.3/template#L119) the "arch" variable is set to "x86". Therefore no "powerpc" directory is removed on x86_64 and dkms works. By accident all necessary sub-directories in the "arch" directory are present.

For "arm64" this is different. Here architectures starting with "p*" are removed. Now the question is, why is this importantfor the "rpi-kernel"? Well, something similar is present in the "rpi-kernel" package [here](https://github.com/void-linux/void-packages/blob/master/srcpkgs/rpi-kernel/template#L193). It even removes "arm64" if you are on "arm". And since there is a hard-coded dependency in "crypto/Kconfig" it breaks. Additionally the "dkms" package depends on the "linux-headers" package, only for architecture "arm" and "arm64" (matching arm*) [here](https://github.com/void-linux/void-packages/blob/master/srcpkgs/dkms/template#L20). That also installs the "linux6.3-headers" package, which also removes architectures (as describes above). So neither dkms module build is successful, not for "rpi-kernel" nor for the usual "linux-kernel".

Maybe the best approach is, to not remove any unnecessary architectures at all anymore if there are so many interdependences?

Re: Raspberry PI Updates

[leahneukirchen]

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

New comment by leahneukirchen on void-packages repository

https://github.com/void-linux/void-packages/pull/43600#issuecomment-1725304208

Comment:
Thanks for the analysis, I think just keeping the headers is the way to go, they are not very big in the end.

Re: Raspberry PI Updates

[moabeat-berlin]

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

New comment by moabeat-berlin on void-packages repository

https://github.com/void-linux/void-packages/pull/43600#issuecomment-1726015076

Comment:
I might be able to submit this as a pull request tomorrow or the day after. I would like to test this first on x86_64, armv6l and aarch64 properly. I have some devices at hand for that. However, since this issue spans across the packages "rpi-kernel" and "linux6.3", would you recommend this as a single PR for this fix or separate ones for each package?

Re: Raspberry PI Updates

[leahneukirchen]

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

New comment by leahneukirchen on void-packages repository

https://github.com/void-linux/void-packages/pull/43600#issuecomment-1726030252

Comment:
No need to make a PR, the Void kernel maintainers know what to do.  Thanks!

Re: Raspberry PI Updates

[tsjk]

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

New comment by tsjk on void-packages repository

https://github.com/void-linux/void-packages/pull/43600#issuecomment-1726265798

Comment:
I think I made a similar point in https://github.com/raspberrypi/linux/issues/5468 back in May, but the audience wasn't mature back then. Would be cool to get v6.1 - especially when the previous lts is no longer maintained by the pi people.

Re: Raspberry PI Updates

[classabbyamp]

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

New comment by classabbyamp on void-packages repository

https://github.com/void-linux/void-packages/pull/43600#issuecomment-1726271056

Comment:
i'm going to try and work on this PR in the next couple days... I'll finally have the time

Re: Raspberry PI Updates

[classabbyamp]

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

New comment by classabbyamp on void-packages repository

https://github.com/void-linux/void-packages/pull/43600#issuecomment-1727547633

Comment:
continuing the party in: https://devspace.voidlinux.org/abby/updates/rpi/

Re: Raspberry PI Updates

[classabbyamp]

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

New comment by classabbyamp on void-packages repository

https://github.com/void-linux/void-packages/pull/43600#issuecomment-1727547633

Comment:
continuing the party in: #46152 

Re: [PR PATCH] [Closed]: Raspberry PI Updates

[classabbyamp]

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

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

Raspberry PI Updates
https://github.com/void-linux/void-packages/pull/43600

Description:
#### Testing the changes
- I tested the changes in this PR: **YES**

#### Local build testing
- I built this PR locally for these architectures:
  - aarch64 (for rpi4)

#### Contributor's notes
- The rpi-kernel package (both the one currently and this updated version) doesn't USB boot without an initramfs.
  - I used dracut to successfully make this work.