[PR PATCH] rpi update

[PR PATCH] rpi update

[classabbyamp]

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

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

https://github.com/classabbyamp/void-packages rpi-update
https://github.com/void-linux/void-packages/pull/50647

rpi update
[ci skip]

will be building packages for testing soon, taking requests for kernel config items to add


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

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

From af98aa3e486f0f8b0159093bc67aa45d53447dce Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Sat, 1 Jun 2024 04:15:15 -0400
Subject: [PATCH 1/4] rpi-eeprom: update to 2024.05.17.

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

diff --git a/srcpkgs/rpi-eeprom/template b/srcpkgs/rpi-eeprom/template
index 341b1e7f5ad9ae..578bfc84899066 100644
--- a/srcpkgs/rpi-eeprom/template
+++ b/srcpkgs/rpi-eeprom/template
@@ -1,8 +1,8 @@
 # Template file for 'rpi-eeprom'
 pkgname=rpi-eeprom
-version=2024.03.01
+version=2024.05.17
 revision=1
-_githash=b745226b41ac202976ee8307fcb179a1193fab3c
+_githash=61fb89536fc94a57c1e0afd42617849b6d0cac37
 archs="armv7l* aarch64*"
 conf_files="/etc/default/rpi-eeprom-update"
 hostmakedepends="help2man python3"
@@ -12,7 +12,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="BSD-3-Clause, custom:Proprietary"
 homepage="https://github.com/raspberrypi/rpi-eeprom/"
 distfiles="https://github.com/raspberrypi/rpi-eeprom/archive/${_githash}.tar.gz"
-checksum=5d53606e939a48206d0d68c6398e900ff2845863a52c28c2739fa84c8fbc0bac
+checksum=952c6348b65cbeca05da449dce3fa5f307d54997b1a9788e235eb1ac403ae21e
 python_version=3
 repository=nonfree
 

From 18a45649492e4f21e55cca8b6b9dc4c4937e207c Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Sat, 1 Jun 2024 04:15:29 -0400
Subject: [PATCH 2/4] rpi-firmware: update to 20240524.

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

diff --git a/srcpkgs/rpi-firmware/template b/srcpkgs/rpi-firmware/template
index ae667a1d7bebca..6e9fa596945520 100644
--- a/srcpkgs/rpi-firmware/template
+++ b/srcpkgs/rpi-firmware/template
@@ -1,8 +1,8 @@
 # Template file for 'rpi-firmware'
 pkgname=rpi-firmware
-version=20240208
+version=20240524
 revision=1
-_rpi_fw=7273369aded28c56937cda2ec8e305f86eaa1203
+_rpi_fw=458df3adc11fccc3d26d3d6d8864738459290416
 _rpi_brcm=223ccf3a3ddb11b3ea829749fbbba4d65b380897
 _rpi_bt=78d6a07730e2d20c035899521ab67726dc028e1c
 create_wrksrc=yes
@@ -16,7 +16,7 @@ distfiles="
  https://github.com/RPi-Distro/firmware-nonfree/archive/${_rpi_brcm}.tar.gz
  https://github.com/RPi-Distro/bluez-firmware/archive/${_rpi_bt}.tar.gz
  https://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git/plain/LICENCE.cypress>LICENCE.cypress"
-checksum="583f11eb4b0c4f2673e4a90519013f654aeddd018c03604c8c1b933651602edb
+checksum="5e4e9117adec178bd7f7409ebf6b7cbff77436f907b7d5f96c65de190d71dacc
  a73ecb8e4fe3e55f6919352661600538ff5fcac82cadfa4e52caf4ccf61ece58
  56bcee9bac20720ceeef983949ba4d6b8d81c2f9602613232e642de547240841
  ae0db6cc4db33941148df0f67de53e76a77b1b5a46b3165edb7040aa2750015f"

From 36286ce6e1b76f9a685141f427ce322dc4f590ca Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Sat, 1 Jun 2024 04:15:35 -0400
Subject: [PATCH 3/4] rpi-kernel: update to 6.6.31.

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

diff --git a/srcpkgs/rpi-kernel/template b/srcpkgs/rpi-kernel/template
index 123ae02eb580fb..138b0c6e2e6eb2 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 6.1:
+# official Raspberry Pi OS distribution. This is currently 6.6:
 #
-# https://forums.raspberrypi.com/viewtopic.php?t=344246
+# https://forums.raspberrypi.com/viewtopic.php?t=361116
 #
 # Commit hash is picked from latest tag [1], if appropriate, or from latest
 # "Merge remote-tracking branch 'stable/linux-6.x.y' into rpi-6.x.y" commit.
@@ -12,10 +12,11 @@
 #
 # Upstream documentation: https://www.raspberrypi.com/documentation/computers/linux_kernel.html
 pkgname=rpi-kernel
-version=6.1.77
+version=6.6.31
 revision=1
-_githash=fdd0eca49f6d09d4520d9d9827abfef1c605ce74
+_githash=1ac74d2f9773922731a11bc329ae2710fce172d4
 archs="armv6l* armv7l* aarch64*"
+build_wrksrc="build-rpi"
 hostmakedepends="perl kmod uboot-mkimage openssl-devel bc bison flex xz"
 makedepends="ncurses-devel"
 short_desc="Linux kernel for Raspberry Pi (${version%.*} series)"
@@ -23,7 +24,7 @@ maintainer="classabbyamp <void@placeviolette.net>"
 license="GPL-2.0-only"
 homepage="http://www.kernel.org"
 distfiles="https://github.com/raspberrypi/linux/archive/${_githash}.tar.gz"
-checksum=611dd843760ea80753ed8c67e665dbe923827e79a381c27c353d33b1da52e211
+checksum=961ce72e339ca024c6dd1ae57c0dfc25ab1f39eee9699813a535f138b31d670c
 python_version=3
 provides="rpi-kernel-${version}_${revision}"
 replaces="rpi5-kernel>=0"
@@ -35,6 +36,15 @@ nostrip=yes
 noverifyrdeps=yes
 noshlibprovides=yes
 
+build_options="rpi5"
+desc_option_rpi5="build large page-size rpi5-kernel"
+
+if [[ "$XBPS_TARGET_MACHINE" = aarch64* ]]; then
+	build_options_default+=" rpi5"
+elif [ "$build_option_rpi5" ]; then
+	broken="rpi5 build option only works on aarch64*"
+fi
+
 triggers="kernel-hooks"
 # These files could be modified when an external module is built.
 mutable_files="
@@ -58,11 +68,22 @@ make_install_args=("-j$XBPS_MAKEJOBS" "ARCH=$_arch")
 
 if [ "$CROSS_BUILD" ]; then
 	make_build_args+=("CROSS_COMPILE=${XBPS_CROSS_TRIPLET}-")
+	make_install_args+=("CROSS_COMPILE=${XBPS_CROSS_TRIPLET}-")
 fi
 
+post_extract() {
+	mkdir build-rpi
+	mv * build-rpi || true
+	if [ "$build_option_rpi5" ]; then
+		cp -a build-rpi build-rpi5
+	fi
+}
+
 _configure() {
 	local target="$1" defconfig
 
+	msg_normal "configuring for ${target} in ${PWD##*/}\n"
+
 	defconfig="arch/${_arch}/configs/${target}"
 	cp "$defconfig" .config
 
@@ -113,6 +134,7 @@ _configure() {
 	CONFIG_IKCONFIG_PROC=y
 	CONFIG_LEDS_TRIGGER_ACTIVITY=m
 	CONFIG_MACVTAP=m
+	CONFIG_IPV6=y
 	!
 
 	while read -r line; do
@@ -141,10 +163,18 @@ _configure() {
 	make "${make_build_args[@]}" olddefconfig
 }
 
+_build() {
+	msg_normal "building in ${PWD##*/}\n"
+	make "${make_build_args[@]}" prepare
+	make "${make_build_args[@]}" "${_image_target}" modules dtbs
+}
+
 _install() {
 	local _pkg="$1" _destdir="$2"
 	local hdrdest="usr/src/${_pkg}-headers-${_kernver}"
 
+	msg_normal "installing ${_pkg} from ${PWD##*/} into ${_destdir}\n"
+
 	# Run depmod after compressing modules.
 	vsed -i -e '2iexit 0' scripts/depmod.sh
 
@@ -260,11 +290,20 @@ do_configure() {
 	esac
 
 	_configure "$target"
+
+	if [ "$build_option_rpi5" ]; then
+		cd "$wrksrc"/build-rpi5
+		_configure "bcm2712_defconfig"
+	fi
 }
 
 do_build() {
-	make "${make_build_args[@]}" prepare
-	make "${make_build_args[@]}" "${_image_target}" modules dtbs
+	_build
+
+	if [ "$build_option_rpi5" ]; then
+		cd "$wrksrc"/build-rpi5
+		_build
+	fi
 }
 
 do_install() {
@@ -275,9 +314,13 @@ subpackages="rpi-kernel-headers"
 
 case "$XBPS_TARGET_MACHINE" in
 	armv7l*) subpackages+=" rpi2-kernel rpi2-kernel-headers" ;;
-	aarch64*) subpackages+=" rpi3-kernel rpi3-kernel-headers rpi4-kernel rpi4-kernel-headers rpi5-kernel rpi5-kernel-headers" ;;
+	aarch64*) subpackages+=" rpi3-kernel rpi3-kernel-headers rpi4-kernel rpi4-kernel-headers" ;;
 esac
 
+if [ "$build_option_rpi5" ]; then
+	subpackages+=" rpi5-kernel rpi5-kernel-headers"
+fi
+
 rpi-kernel-headers_package() {
 	nostrip=yes
 	noverifyrdeps=yes
@@ -313,9 +356,7 @@ rpi5-kernel_package() {
 	provides="rpi-kernel-${version}_${revision}"
 	replaces="rpi-kernel>=0"
 	pkg_install() {
-		_configure "bcm2712_defconfig"
-		make "${make_build_args[@]}" prepare
-		make "${make_build_args[@]}" "${_image_target}" modules dtbs
+		cd "$wrksrc"/build-rpi5
 		_install "rpi5-kernel" "$PKGDESTDIR"
 	}
 }

From 3e7cd23a28287a08170da6483ceb9580c661e538 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Sat, 1 Jun 2024 04:15:40 -0400
Subject: [PATCH 4/4] rpi-utils: update to 20240523.

---
 srcpkgs/rpi-utils/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/rpi-utils/template b/srcpkgs/rpi-utils/template
index bb53daf8b41a73..2af87e9e0dd28e 100644
--- a/srcpkgs/rpi-utils/template
+++ b/srcpkgs/rpi-utils/template
@@ -1,9 +1,9 @@
 # Template file for 'rpi-utils'
 pkgname=rpi-utils
-version=20240228
+version=20240523
 revision=1
-_commit=9eddf892ef7b9f94b2406d56f48c81f15a42794c
-archs="armv6l* armv7l* aarch64*"
+_commit=b9c63214c535d7df2b0fa6743b7b3e508363c25a
+archs="aarch64* armv7l* armv6l*"
 build_style=cmake
 makedepends="dtc-devel"
 depends="python3 perl bash"
@@ -12,7 +12,7 @@ maintainer="classabbyamp <void@placeviolette.net>"
 license="BSD-3-Clause"
 homepage="https://github.com/raspberrypi/utils"
 distfiles="https://github.com/raspberrypi/utils/archive/${_commit}.tar.gz"
-checksum=f54ec0909713b8450e118b0ebb8a51e9b293ffca519026f0296d21809072173a
+checksum=e2dd917ba498c3cc24fbcea6a3e14fd06ed99d0b00a230b1ec8a3d36ad2b0ac9
 python_version=3
 
 post_install() {

Re: [PR PATCH] [Merged]: rpi update

[classabbyamp]

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

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

rpi update
https://github.com/void-linux/void-packages/pull/50647

Description:
[ci skip]

will be building packages for testing soon, taking requests for kernel config items to add

fixes #50669