From 3e39ccd11464bc18e06b5b53395265f9127baf2b Mon Sep 17 00:00:00 2001 From: Jami Kettunen Date: Sun, 9 Jan 2022 15:33:56 +0200 Subject: [PATCH 1/4] rpi-kernel: update to 5.10.92. --- srcpkgs/rpi-kernel/template | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/srcpkgs/rpi-kernel/template b/srcpkgs/rpi-kernel/template index 81a8c484d0a3..9b38bc53a346 100644 --- a/srcpkgs/rpi-kernel/template +++ b/srcpkgs/rpi-kernel/template @@ -8,15 +8,15 @@ # 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. # -# [1] https://github.com/raspberrypi/linux/releases +# [1] https://github.com/raspberrypi/linux/tags # # WARNING: keep all rpi*-kernel packages in sync -_githash="86729e78125d4f3d203457940feee8bc97b11f6c" +_githash="650082a559a570d6c9d2739ecc62843d6f951059" _gitshort="${_githash:0:7}" pkgname=rpi-kernel -version=5.10.52 +version=5.10.92 revision=1 archs="armv6l*" wrksrc="linux-${_githash}" @@ -27,7 +27,7 @@ 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=a25a7dfce4c2ca5bdca39ddab5e43539d9b04900b0dbefe19f4f9b053e59968c +checksum=ae8b1635a33316ef9b85a4f0ce77d0032c74fbe2ef127755b17cd34d265c48d8 python_version=3 _kernver="${version}_${revision}" From 8d5965b3217c989408e0e2df1851dee22ed993fd Mon Sep 17 00:00:00 2001 From: Jami Kettunen Date: Sun, 9 Jan 2022 15:34:05 +0200 Subject: [PATCH 2/4] rpi2-kernel: update to 5.10.92. Additionally disable GCC_PLUGINS since it was enabled in the upstream bcm2709_defconfig. --- srcpkgs/rpi2-kernel/template | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/srcpkgs/rpi2-kernel/template b/srcpkgs/rpi2-kernel/template index cc861a0a261a..b970fd924fd9 100644 --- a/srcpkgs/rpi2-kernel/template +++ b/srcpkgs/rpi2-kernel/template @@ -1,11 +1,11 @@ # Template file for 'rpi2-kernel' # See rpi-kernel for version policy -_githash="86729e78125d4f3d203457940feee8bc97b11f6c" +_githash="650082a559a570d6c9d2739ecc62843d6f951059" _gitshort="${_githash:0:7}" pkgname=rpi2-kernel -version=5.10.52 +version=5.10.92 revision=1 archs="armv7l*" wrksrc="linux-${_githash}" @@ -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=a25a7dfce4c2ca5bdca39ddab5e43539d9b04900b0dbefe19f4f9b053e59968c +checksum=ae8b1635a33316ef9b85a4f0ce77d0032c74fbe2ef127755b17cd34d265c48d8 python_version=3 _kernver="${version}_${revision}" @@ -82,6 +82,9 @@ do_configure() { # LXD 4.2+ support echo "CONFIG_BRIDGE_VLAN_FILTERING=y" >> "$defconfig" + # Disable GCC plugins + echo "# CONFIG_GCC_PLUGINS is not set" >> "$defconfig" + make ${makejobs} ${_cross} ARCH=${_arch} ${target} # Always use our revision to CONFIG_LOCALVERSION to match our pkg version. From 4b8e6726acebe0cfcc0eb4a1bcb91402d810602d Mon Sep 17 00:00:00 2001 From: Jami Kettunen Date: Sun, 9 Jan 2022 15:35:35 +0200 Subject: [PATCH 3/4] rpi3-kernel: update to 5.10.92. --- srcpkgs/rpi3-kernel/template | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/srcpkgs/rpi3-kernel/template b/srcpkgs/rpi3-kernel/template index 0dd5ce9593db..e76d0ab86d51 100644 --- a/srcpkgs/rpi3-kernel/template +++ b/srcpkgs/rpi3-kernel/template @@ -1,11 +1,11 @@ # Template file for 'rpi3-kernel' # See rpi-kernel for version policy -_githash="86729e78125d4f3d203457940feee8bc97b11f6c" +_githash="650082a559a570d6c9d2739ecc62843d6f951059" _gitshort="${_githash:0:7}" pkgname=rpi3-kernel -version=5.10.52 +version=5.10.92 revision=1 archs="aarch64*" wrksrc="linux-${_githash}" @@ -14,9 +14,9 @@ makedepends="ncurses-devel" maintainer="Piraty " homepage="http://www.kernel.org" license="GPL-2.0-only" -short_desc="Linux kernel for Raspberry Pi 3 (${version%.*} series [git ${_gitshort}])" +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=a25a7dfce4c2ca5bdca39ddab5e43539d9b04900b0dbefe19f4f9b053e59968c +checksum=ae8b1635a33316ef9b85a4f0ce77d0032c74fbe2ef127755b17cd34d265c48d8 python_version=3 _kernver="${version}_${revision}" From 9fee769292543ff2901694c373ccf70c136e3c29 Mon Sep 17 00:00:00 2001 From: Jami Kettunen Date: Sun, 9 Jan 2022 15:35:42 +0200 Subject: [PATCH 4/4] rpi4-kernel: update to 5.10.92. --- srcpkgs/rpi4-kernel/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/rpi4-kernel/template b/srcpkgs/rpi4-kernel/template index 9ddae3fac5a3..27ed4f581a7b 100644 --- a/srcpkgs/rpi4-kernel/template +++ b/srcpkgs/rpi4-kernel/template @@ -1,11 +1,11 @@ # Template file for 'rpi4-kernel' # See rpi-kernel for version policy -_githash="86729e78125d4f3d203457940feee8bc97b11f6c" +_githash="650082a559a570d6c9d2739ecc62843d6f951059" _gitshort="${_githash:0:7}" pkgname=rpi4-kernel -version=5.10.52 +version=5.10.92 revision=1 archs="aarch64*" wrksrc="linux-${_githash}" @@ -16,7 +16,7 @@ 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=a25a7dfce4c2ca5bdca39ddab5e43539d9b04900b0dbefe19f4f9b053e59968c +checksum=ae8b1635a33316ef9b85a4f0ce77d0032c74fbe2ef127755b17cd34d265c48d8 python_version=3 conflicts=rpi3-kernel