From 443212b819cc362d8be1235e489a7faa04721254 Mon Sep 17 00:00:00 2001 From: Koichiro Iwao Date: Wed, 1 Apr 2026 01:24:55 +0000 Subject: [PATCH] Update kernel to v6.18.20 21da81b5 --- SOURCES/config_2711.patch | 14 +++++++------- SOURCES/config_2712.patch | 14 +++++++------- SPECS/raspberrypi2.spec | 21 +++++++++++++-------- 3 files changed, 27 insertions(+), 22 deletions(-) diff --git a/SOURCES/config_2711.patch b/SOURCES/config_2711.patch index 27079a6..f2c2192 100644 --- a/SOURCES/config_2711.patch +++ b/SOURCES/config_2711.patch @@ -1,6 +1,6 @@ -From bdec30ca8e18bc7d9a5d25d7cd9ca7976aef8aa2 Mon Sep 17 00:00:00 2001 +From 830e3d1891cd911bee5d3424445b47c1f50c317e Mon Sep 17 00:00:00 2001 From: Koichiro Iwao -Date: Mon, 19 May 2025 13:09:29 +0900 +Date: Tue, 31 Mar 2026 17:52:13 +0900 Subject: [PATCH 1/2] Apply config patch for Raspberry Pi (BCM2711) The patch is originally provided by Pablo Greco . @@ -11,19 +11,19 @@ Signed-off-by: Koichiro Iwao 1 file changed, 40 insertions(+), 2 deletions(-) diff --git a/arch/arm64/configs/bcm2711_defconfig b/arch/arm64/configs/bcm2711_defconfig -index ce3e13572fb4..324800576e6a 100644 +index 56795bf145bd..2ba26e955191 100644 --- a/arch/arm64/configs/bcm2711_defconfig +++ b/arch/arm64/configs/bcm2711_defconfig -@@ -1690,8 +1690,6 @@ CONFIG_DLM=m +@@ -1714,8 +1714,6 @@ CONFIG_DLM=m CONFIG_UNICODE=m CONFIG_KEY_DH_OPERATIONS=y CONFIG_SECURITY=y -CONFIG_SECURITY_APPARMOR=y -CONFIG_LSM="" CONFIG_CRYPTO_USER=m + CONFIG_CRYPTO_NULL=m CONFIG_CRYPTO_CRYPTD=m - CONFIG_CRYPTO_AES=m -@@ -1742,3 +1740,43 @@ CONFIG_SCHED_TRACER=y +@@ -1762,3 +1760,43 @@ CONFIG_FTRACE_SYSCALLS=y CONFIG_BLK_DEV_IO_TRACE=y # CONFIG_UPROBE_EVENTS is not set # CONFIG_STRICT_DEVMEM is not set @@ -68,5 +68,5 @@ index ce3e13572fb4..324800576e6a 100644 +CONFIG_EROFS_POSIX_ACL=y +CONFIG_EROFS_FS_SECURITY=y -- -2.49.0 +2.53.0 diff --git a/SOURCES/config_2712.patch b/SOURCES/config_2712.patch index 29b4459..35f54d3 100644 --- a/SOURCES/config_2712.patch +++ b/SOURCES/config_2712.patch @@ -1,6 +1,6 @@ -From c6064f14a8c32e3109ee83c736097e2ee03086ca Mon Sep 17 00:00:00 2001 +From c79f1902314f6aca86f4df9bec6f203f6bdb1231 Mon Sep 17 00:00:00 2001 From: Koichiro Iwao -Date: Mon, 19 May 2025 13:10:35 +0900 +Date: Tue, 31 Mar 2026 17:53:02 +0900 Subject: [PATCH 2/2] Apply config patch for Raspberry Pi (BCM2712) The patch is originally provided by Pablo Greco . @@ -11,19 +11,19 @@ Signed-off-by: Koichiro Iwao 1 file changed, 40 insertions(+), 2 deletions(-) diff --git a/arch/arm64/configs/bcm2712_defconfig b/arch/arm64/configs/bcm2712_defconfig -index 9e2bda050f81..51afa99f75e3 100644 +index 65e4f476536a..5530ed8c9dda 100644 --- a/arch/arm64/configs/bcm2712_defconfig +++ b/arch/arm64/configs/bcm2712_defconfig -@@ -1692,8 +1692,6 @@ CONFIG_DLM=m +@@ -1716,8 +1716,6 @@ CONFIG_DLM=m CONFIG_UNICODE=m CONFIG_KEY_DH_OPERATIONS=y CONFIG_SECURITY=y -CONFIG_SECURITY_APPARMOR=y -CONFIG_LSM="" CONFIG_CRYPTO_USER=m + CONFIG_CRYPTO_NULL=m CONFIG_CRYPTO_CRYPTD=m - CONFIG_CRYPTO_AES=m -@@ -1744,3 +1742,43 @@ CONFIG_SCHED_TRACER=y +@@ -1764,3 +1762,43 @@ CONFIG_FTRACE_SYSCALLS=y CONFIG_BLK_DEV_IO_TRACE=y # CONFIG_UPROBE_EVENTS is not set # CONFIG_STRICT_DEVMEM is not set @@ -68,5 +68,5 @@ index 9e2bda050f81..51afa99f75e3 100644 +CONFIG_EROFS_POSIX_ACL=y +CONFIG_EROFS_FS_SECURITY=y -- -2.49.0 +2.53.0 diff --git a/SPECS/raspberrypi2.spec b/SPECS/raspberrypi2.spec index 5332e12..249782f 100644 --- a/SPECS/raspberrypi2.spec +++ b/SPECS/raspberrypi2.spec @@ -1,5 +1,5 @@ %global firmware_tag 1.20250915 -%global version_tag 20250916 +%global version_tag 21da81b5507ac3353013dc093208e6bed53d10e2 ExclusiveArch: aarch64 @@ -11,15 +11,15 @@ ExclusiveArch: aarch64 %define local_version v8 %define bcmmodel 2711 -%define extra_version 2 +%define extra_version 1 # This originally implies Kernel 4.x for RPi 2 and is not appropriate now. # Be careful to change this not to disturb the seamless package update. %define rpisuffix 2 %define ksuffix 4 -%define kversion 6.12 -%define patchlevel 47 +%define kversion 6.18 +%define patchlevel 20 %if 0%{?rhel} >= 10 || 0%{?fedora} >= 40 %define pathfix %{__python3} %{_rpmconfigdir}/redhat/pathfix.py @@ -38,12 +38,12 @@ ExclusiveArch: aarch64 Name: raspberrypi%{rpisuffix} Version: %{kversion}.%{patchlevel} -Release: %{version_tag}.%{local_version}.%{extra_version}%{?dist} +Release: 20260329.%{local_version}.%{extra_version}%{?dist} Summary: Specific kernel and bootcode for Raspberry Pi License: GPL-2.0 WITH Linux-syscall-note URL: https://github.com/raspberrypi/linux -Source0: https://github.com/raspberrypi/linux/archive/stable_%{version_tag}.tar.gz +Source0: https://github.com/raspberrypi/linux/archive/%{version_tag}.tar.gz Source1: https://github.com/raspberrypi/firmware/archive/refs/tags/%{firmware_tag}.tar.gz Patch100: config_2711.patch Patch101: config_2712.patch @@ -227,7 +227,7 @@ glibc package. %endif %prep -%setup -q -n linux-stable_%{version_tag} +%setup -q -n linux-%{version_tag} %patch -P 100 -p1 %patch -P 101 -p1 perl -p -i -e "s/^EXTRAVERSION.*/EXTRAVERSION = -%{release}/" Makefile @@ -489,6 +489,8 @@ cp $(ls -1 /boot/config-kernel-*-*|sort -V|tail -1) /boot/config-kernel.inc %{_datadir}/bash-completion/completions/cpupower %{_unitdir}/cpupower.service %{_mandir}/man[1-8]/cpupower* +%{_libexecdir}/cpupower +%config(noreplace) %{_sysconfdir}/cpupower-service.conf %config(noreplace) %{_sysconfdir}/sysconfig/cpupower %{_bindir}/tmon %{_bindir}/iio_event_monitor @@ -507,7 +509,7 @@ cp $(ls -1 /boot/config-kernel-*-*|sort -V|tail -1) /boot/config-kernel.inc %files kernel%{?ksuffix}-tools-libs %{_libdir}/libcpupower.so.1 -%{_libdir}/libcpupower.so.0.0.1 +%{_libdir}/libcpupower.so.1.0.1 %files kernel%{?ksuffix}-tools-libs-devel %{_libdir}/libcpupower.so @@ -534,6 +536,9 @@ cp $(ls -1 /boot/config-kernel-*-*|sort -V|tail -1) /boot/config-kernel.inc %endif %changelog +* Wed Apr 01 2026 Koichiro Iwao - 6.18.20-20260329.v8.1 +- Update kernel to v6.18.20 21da81b5 + * Mon Mar 02 2026 Koichiro Iwao - 6.12.47-20250916.v8.2 - Add a pseudo subpackage -modules-extra-matched to resolve dependency issue