From 745d4e3c0e640ec8a0c4114c2f9b7155c66a59bf Mon Sep 17 00:00:00 2001 From: Kenneth Raplee 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 " 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 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}"