From 7e3eb0e36b5e99a03b3e475b1f914093d2c63bdd Mon Sep 17 00:00:00 2001
From: Koichiro Iwao
Date: Fri, 3 Oct 2025 14:10:10 +0900
Subject: [PATCH] Update kernel to v6.12.47 stable_20250916
---
.raspberrypi2.metadata | 2 +-
SPECS/raspberrypi2.spec | 21 +++++++++++++--------
2 files changed, 14 insertions(+), 9 deletions(-)
diff --git a/.raspberrypi2.metadata b/.raspberrypi2.metadata
index 564f126..202cc02 100644
--- a/.raspberrypi2.metadata
+++ b/.raspberrypi2.metadata
@@ -1,2 +1,2 @@
-4056ee652e15cec45f318082124f9ef6c2fa250e SOURCES/stable_20250702.tar.gz
+25cfd4609f553d2dfecf70664da814f5064c194b SOURCES/stable_20250916.tar.gz
be897efea93afd8c6ccc39a2667166f7398fc97a SOURCES/1.20250915.tar.gz
diff --git a/SPECS/raspberrypi2.spec b/SPECS/raspberrypi2.spec
index 26846d0..b574701 100644
--- a/SPECS/raspberrypi2.spec
+++ b/SPECS/raspberrypi2.spec
@@ -1,5 +1,5 @@
%global firmware_tag 1.20250915
-%global version_tag 20250702
+%global version_tag 20250916
ExclusiveArch: aarch64
@@ -11,7 +11,7 @@ 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.
@@ -19,9 +19,9 @@ ExclusiveArch: aarch64
%define ksuffix 4
%define kversion 6.12
-%define patchlevel 34
+%define patchlevel 47
-%if 0%{?rhel} >= 10
+%if 0%{?rhel} >= 10 || 0%{?fedora} >= 40
%define pathfix %{__python3} %{_rpmconfigdir}/redhat/pathfix.py
%else
%define pathfix pathfix.py
@@ -220,15 +220,16 @@ perl -p -i -e "s/^EXTRAVERSION.*/EXTRAVERSION = -%{release}/" Makefile
perl -p -i -e "s/^CONFIG_LOCALVERSION=.*/CONFIG_LOCALVERSION=/" arch/%{Arch}/configs/bcm2711_defconfig
perl -p -i -e "s/^CONFIG_LOCALVERSION=.*/CONFIG_LOCALVERSION=/" arch/%{Arch}/configs/bcm2712_defconfig
-%if 0%{?rhel} >= 8
+%if 0%{?rhel} >= 8 || 0%{?fedora} >= 28
# Mangle /usr/bin/python shebangs to /usr/bin/python3
# Mangle all Python shebangs to be Python 3 explicitly
# -p preserves timestamps
# -n prevents creating ~backup files
# -i specifies the interpreter for the shebang
%{pathfix} -pni "%{__python3} %{py3_shbang_opts}" scripts/
-%{pathfix} -pni "%{__python3} %{py3_shbang_opts}" scripts/diffconfig scripts/bloat-o-meter scripts/show_delta scripts/jobserver-exec
-%{pathfix} -pni "%{__python3} %{py3_shbang_opts}" tools/ tools/perf/scripts/python/*.py tools/kvm/kvm_stat/kvm_stat scripts/clang-tools/*.py
+%{pathfix} -pni "%{__python3} %{py3_shbang_opts}" scripts/diffconfig scripts/bloat-o-meter scripts/show_delta \
+ scripts/jobserver-exec scripts/dtc/dt-extract-compatibles
+%{pathfix} -pni "%{__python3} %{py3_shbang_opts}" tools/ tools/kvm/kvm_stat/kvm_stat
%endif
%build
@@ -515,6 +516,10 @@ cp $(ls -1 /boot/config-kernel-*-*|sort -V|tail -1) /boot/config-kernel.inc
%endif
%changelog
+* Fri Oct 03 2025 Koichiro Iwao - 6.12.47-20250916.v8.1
+- Update kernel to v6.12.47 stable_20250916
+- Make it buildable on Fedora
+
* Wed Sep 24 2025 Ryosuke Nakayama - 6.12.34-20250702.v8.2
- Update firmware to 1.20250915
@@ -534,7 +539,7 @@ cp $(ls -1 /boot/config-kernel-*-*|sort -V|tail -1) /boot/config-kernel.inc
- Enable EROFS bootc container (contributed by Kevin Fox)
- Fixes to enable bootc (contributed by Kevin Fox)
-* Mon Jan 27 2025 Koichiro Iwao - 6.12.1-20241206.v8.2
+* Mon Jan 27 2025 Koichiro Iwao - 6.12.1-20241206.v8.2
- Add pseudo subpackages for kernel modules to resolve dependency issue
- The main kernel package now provides kernel-core
- Convert license to SPDX expression