From 50978e378eefc0c080657ef11f796bfea0f83d4a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20Christian=20Gr=C3=BCnhage?= Date: Sun, 28 Aug 2022 12:29:32 +0200 Subject: [PATCH 1/5] rpi-firmware: update to 20220823. --- srcpkgs/rpi-firmware/template | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/srcpkgs/rpi-firmware/template b/srcpkgs/rpi-firmware/template index 9517824114460c..ed852971606573 100644 --- a/srcpkgs/rpi-firmware/template +++ b/srcpkgs/rpi-firmware/template @@ -1,10 +1,10 @@ # Template file for 'rpi-firmware' -_githash="8f13114b9ea29bd004151d4a8afa500b2df721be" +_githash="62efc6a69d4e717bf2833c649d622c8298a37e9c" _gitshort="${_githash:0:7}" pkgname=rpi-firmware -version=20201123 -revision=5 +version=20220823 +revision=1 archs="armv6l* armv7l* aarch64*" wrksrc="firmware-${_githash}" provides="linux-firmware-broadcom-${version}_${revision}" @@ -14,7 +14,7 @@ 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=f9be0cc177aae7dddaa0a2967d090ea33a95be9dd519d2eee3bc740af8ffb19e +checksum=3fc5ab7155bde7221245f439971217558300dcbc988ade861cfef4e737de9909 conf_files="/boot/cmdline.txt /boot/config.txt" nostrip=yes @@ -35,39 +35,39 @@ do_install() { vinstall ${FILESDIR}/cmdline.txt 644 boot vinstall ${FILESDIR}/config.txt 644 boot - $XBPS_FETCH_CMD https://github.com/RPi-Distro/firmware-nonfree/raw/master/LICENCE.cypress + $XBPS_FETCH_CMD https://raw.githubusercontent.com/RPi-Distro/firmware-nonfree/buster/LICENCE.cypress vlicense LICENCE.cypress # Firmware for rpi3 b and zero wifi chip for f in bin txt; do - $XBPS_FETCH_CMD https://github.com/RPi-Distro/firmware-nonfree/raw/master/brcm/brcmfmac43430-sdio.${f} + $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 # Firmware for rpi3 b and zero bluetooth chip - $XBPS_FETCH_CMD https://github.com/RPi-Distro/bluez-firmware/raw/master/broadcom/BCM43430A1.hcd + $XBPS_FETCH_CMD https://raw.githubusercontent.com/RPi-Distro/bluez-firmware/master/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://github.com/RPi-Distro/firmware-nonfree/raw/master/brcm/brcmfmac43455-sdio.${f} + $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 done # Firmware for rpi3 b+ bluetooth chip - $XBPS_FETCH_CMD https://github.com/RPi-Distro/bluez-firmware/raw/master/broadcom/BCM4345C0.hcd + $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 rpi4/rpi400 wifi chip for f in bin txt clm_blob; do - $XBPS_FETCH_CMD https://github.com/RPi-Distro/firmware-nonfree/raw/master/brcm/brcmfmac43456-sdio.${f} + $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://github.com/RPi-Distro/bluez-firmware/raw/master/broadcom/BCM4345C5.hcd + $XBPS_FETCH_CMD https://raw.githubusercontent.com/RPi-Distro/bluez-firmware/master/broadcom/BCM4345C5.hcd vinstall BCM4345C5.hcd 0644 usr/lib/firmware/brcm - $XBPS_FETCH_CMD https://github.com/RPi-Distro/bluez-firmware/raw/master/broadcom/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 } From 2c3a3d158f048885a41ef940d5e392e556c5c091 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20Christian=20Gr=C3=BCnhage?= Date: Sun, 28 Aug 2022 12:30:03 +0200 Subject: [PATCH 2/5] rpi-kernel: update to 5.15.61. --- srcpkgs/rpi-kernel/template | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/srcpkgs/rpi-kernel/template b/srcpkgs/rpi-kernel/template index 3c2188d2d5bc78..3183183b6a4e13 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 Raspbian distribution. This is currently 5.10: +# official Raspberry Pi OS distribution. This is currently 5.15: # -# https://www.raspberrypi.org/forums/viewtopic.php?f=29&t=288234 +# https://forums.raspberrypi.com/viewtopic.php?t=322879 # # Commit hash is picked from latest tag [1], if appropriate, or from latest # "Merge remote-tracking branch 'stable/linux-5.10.y' into rpi-5.10.y" commit. @@ -12,22 +12,22 @@ # # WARNING: keep all rpi*-kernel packages in sync -_githash="82c6f8643398e222099066bfffb2070772f0696f" +_githash="64ad74084fa44abe8689564071df5729ded4c589" _gitshort="${_githash:0:7}" pkgname=rpi-kernel -version=5.10.110 +version=5.15.61 revision=1 archs="armv6l*" wrksrc="linux-${_githash}" -hostmakedepends="perl kmod uboot-mkimage openssl-devel bc bison flex" +hostmakedepends="perl kmod uboot-mkimage openssl-devel bc bison flex xz" makedepends="ncurses-devel" maintainer="Piraty " homepage="http://www.kernel.org" license="GPL-2.0-only" short_desc="Linux kernel for Raspberry Pi zero/1 (${version%.*} series [git ${_gitshort}])" distfiles="https://github.com/raspberrypi/linux/archive/${_githash}.tar.gz" -checksum=f3ee7782c90ecb3e468e89602248a1de45b466d5d4c1af4748f7ca088c0fcab3 +checksum=8257604cc47792007284cc2640d7dd9f70fab062a7c596e92903e99718434244 python_version=3 _kernver="${version}_${revision}" @@ -206,10 +206,6 @@ do_install() { mkdir -p ${hdrdest}/net/mac80211/ cp net/mac80211/*.h ${hdrdest}/net/mac80211 - # add dvb headers for external modules - mkdir -p ${hdrdest}/include/config/dvb/ - cp include/config/dvb/*.h ${hdrdest}/include/config/dvb/ - # Remove unneeded architectures # (save the correct one + Kconfig and delete all others) mkdir -p arch-backup From ad4b2ae4dce9aaf967f083f7bbb5dbdb615d380a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20Christian=20Gr=C3=BCnhage?= Date: Fri, 2 Sep 2022 14:45:42 +0200 Subject: [PATCH 3/5] rpi2-kernel: update to 5.10.110. --- srcpkgs/rpi2-kernel/template | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/srcpkgs/rpi2-kernel/template b/srcpkgs/rpi2-kernel/template index 228b6d2c5551fa..8963b855a4de59 100644 --- a/srcpkgs/rpi2-kernel/template +++ b/srcpkgs/rpi2-kernel/template @@ -1,7 +1,7 @@ # Template file for 'rpi2-kernel' # See rpi-kernel for version policy -_githash="82c6f8643398e222099066bfffb2070772f0696f" +_githash="64ad74084fa44abe8689564071df5729ded4c589" _gitshort="${_githash:0:7}" pkgname=rpi2-kernel @@ -16,7 +16,7 @@ homepage="http://www.kernel.org" license="GPL-2.0-only" short_desc="Linux kernel for Raspberry Pi 2 (${version%.*} series [git ${_gitshort}])" distfiles="https://github.com/raspberrypi/linux/archive/${_githash}.tar.gz" -checksum=f3ee7782c90ecb3e468e89602248a1de45b466d5d4c1af4748f7ca088c0fcab3 +checksum=8257604cc47792007284cc2640d7dd9f70fab062a7c596e92903e99718434244 python_version=3 _kernver="${version}_${revision}" @@ -198,10 +198,6 @@ do_install() { mkdir -p ${hdrdest}/net/mac80211/ cp net/mac80211/*.h ${hdrdest}/net/mac80211 - # add dvb headers for external modules - mkdir -p ${hdrdest}/include/config/dvb/ - cp include/config/dvb/*.h ${hdrdest}/include/config/dvb/ - # Remove unneeded architectures # (save the correct one + Kconfig and delete all others) mkdir -p arch-backup From b2bcecbc8d6ce04a399664037500dd6f0765c25c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20Christian=20Gr=C3=BCnhage?= Date: Sun, 28 Aug 2022 12:29:56 +0200 Subject: [PATCH 4/5] rpi3-kernel: update to 5.15.61. --- srcpkgs/rpi3-kernel/template | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/srcpkgs/rpi3-kernel/template b/srcpkgs/rpi3-kernel/template index 937308fc65765b..20d51a6b85796d 100644 --- a/srcpkgs/rpi3-kernel/template +++ b/srcpkgs/rpi3-kernel/template @@ -1,22 +1,22 @@ # Template file for 'rpi3-kernel' # See rpi-kernel for version policy -_githash="82c6f8643398e222099066bfffb2070772f0696f" +_githash="64ad74084fa44abe8689564071df5729ded4c589" _gitshort="${_githash:0:7}" pkgname=rpi3-kernel -version=5.10.110 +version=5.15.61 revision=1 archs="aarch64*" wrksrc="linux-${_githash}" -hostmakedepends="perl kmod uboot-mkimage openssl-devel bc bison flex" +hostmakedepends="perl kmod uboot-mkimage openssl-devel bc bison flex xz" makedepends="ncurses-devel" maintainer="Piraty " homepage="http://www.kernel.org" license="GPL-2.0-only" short_desc="Linux kernel for Raspberry Pi 3 / Zero 2 (${version%.*} series [git ${_gitshort}])" distfiles="https://github.com/raspberrypi/linux/archive/${_githash}.tar.gz" -checksum=f3ee7782c90ecb3e468e89602248a1de45b466d5d4c1af4748f7ca088c0fcab3 +checksum=8257604cc47792007284cc2640d7dd9f70fab062a7c596e92903e99718434244 python_version=3 _kernver="${version}_${revision}" @@ -198,10 +198,6 @@ do_install() { mkdir -p ${hdrdest}/net/mac80211/ cp net/mac80211/*.h ${hdrdest}/net/mac80211 - # add dvb headers for external modules - mkdir -p ${hdrdest}/include/config/dvb/ - cp include/config/dvb/*.h ${hdrdest}/include/config/dvb/ - # Remove unneeded architectures # (save the correct one + Kconfig and delete all others) mkdir -p arch-backup From 4b6ee5bc31efdc68c4dab7c894422c4ab99e9f63 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20Christian=20Gr=C3=BCnhage?= Date: Sun, 28 Aug 2022 12:30:00 +0200 Subject: [PATCH 5/5] rpi4-kernel: update to 5.15.61. --- srcpkgs/rpi4-kernel/template | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/srcpkgs/rpi4-kernel/template b/srcpkgs/rpi4-kernel/template index e2c8ac19efee79..d4fb3c72906e96 100644 --- a/srcpkgs/rpi4-kernel/template +++ b/srcpkgs/rpi4-kernel/template @@ -1,22 +1,22 @@ # Template file for 'rpi4-kernel' # See rpi-kernel for version policy -_githash="82c6f8643398e222099066bfffb2070772f0696f" +_githash="64ad74084fa44abe8689564071df5729ded4c589" _gitshort="${_githash:0:7}" pkgname=rpi4-kernel -version=5.10.110 +version=5.15.61 revision=1 archs="aarch64*" wrksrc="linux-${_githash}" -hostmakedepends="perl kmod uboot-mkimage openssl-devel bc bison flex" +hostmakedepends="perl kmod uboot-mkimage openssl-devel bc bison flex xz" makedepends="ncurses-devel" maintainer="Piraty " homepage="http://www.kernel.org" license="GPL-2.0-only" short_desc="Linux kernel for Raspberry Pi 4 (${version%.*} series [git ${_gitshort}])" distfiles="https://github.com/raspberrypi/linux/archive/${_githash}.tar.gz" -checksum=f3ee7782c90ecb3e468e89602248a1de45b466d5d4c1af4748f7ca088c0fcab3 +checksum=8257604cc47792007284cc2640d7dd9f70fab062a7c596e92903e99718434244 python_version=3 conflicts=rpi3-kernel @@ -199,10 +199,6 @@ do_install() { mkdir -p ${hdrdest}/net/mac80211/ cp net/mac80211/*.h ${hdrdest}/net/mac80211 - # add dvb headers for external modules - mkdir -p ${hdrdest}/include/config/dvb/ - cp include/config/dvb/*.h ${hdrdest}/include/config/dvb/ - # Remove unneeded architectures # (save the correct one + Kconfig and delete all others) mkdir -p arch-backup