From 53199be15fb8d429fea6b03b6a946308d84844ba Mon Sep 17 00:00:00 2001
From: Koichiro Iwao
Date: Fri, 28 Mar 2025 17:52:28 +0900
Subject: [PATCH 1/6] Use the consistent directory under /usr/share with the
package name
(cherry picked from commit 9820b4550af4547b62e6952add806b8e48a0f0db)
---
SPECS/raspberrypi2.spec | 30 +++++++++++++++---------------
1 file changed, 15 insertions(+), 15 deletions(-)
diff --git a/SPECS/raspberrypi2.spec b/SPECS/raspberrypi2.spec
index d457098..9f65035 100644
--- a/SPECS/raspberrypi2.spec
+++ b/SPECS/raspberrypi2.spec
@@ -211,15 +211,15 @@ popd
%if %{with_up}
# kernel
mkdir -p %{buildroot}/boot/overlays/
-mkdir -p %{buildroot}/usr/share/%{name}-kernel/%{version}-%{release}/boot/overlays
+mkdir -p %{buildroot}/usr/share/%{name}-kernel%{?ksuffix}/%{version}-%{release}/boot/overlays
cp -p -v COPYING %{buildroot}/boot/COPYING.linux-%{kversion}
-cp -p -v arch/%{Arch}/boot/dts/overlays/README %{buildroot}/usr/share/%{name}-kernel/%{version}-%{release}/boot/overlays
+cp -p -v arch/%{Arch}/boot/dts/overlays/README %{buildroot}/usr/share/%{name}-kernel%{?ksuffix}/%{version}-%{release}/boot/overlays
%ifarch aarch64
-cp -p -v arch/%{Arch}/boot/dts/broadcom/*.dtb %{buildroot}/usr/share/%{name}-kernel/%{version}-%{release}/boot
+cp -p -v arch/%{Arch}/boot/dts/broadcom/*.dtb %{buildroot}/usr/share/%{name}-kernel%{?ksuffix}/%{version}-%{release}/boot
%else
-cp -p -v arch/%{Arch}/boot/dts/*.dtb %{buildroot}/usr/share/%{name}-kernel/%{version}-%{release}/boot
+cp -p -v arch/%{Arch}/boot/dts/*.dtb %{buildroot}/usr/share/%{name}-kernel%{?ksuffix}/%{version}-%{release}/boot
%endif
-cp -p -v arch/%{Arch}/boot/dts/overlays/*.dtb* %{buildroot}/usr/share/%{name}-kernel/%{version}-%{release}/boot/overlays
+cp -p -v arch/%{Arch}/boot/dts/overlays/*.dtb* %{buildroot}/usr/share/%{name}-kernel%{?ksuffix}/%{version}-%{release}/boot/overlays
cp -p -v arch/%{Arch}/boot/%{build_image} %{buildroot}/boot/kernel-%{version}-%{release}.img
make INSTALL_MOD_PATH=%{buildroot} modules_install
cat > %{buildroot}/boot/config-kernel-%{version}-%{release}.inc <<__EOF__
@@ -340,12 +340,12 @@ find %{buildroot}/usr/include \
%files kernel%{?ksuffix}
%defattr(-,root,root,-)
/lib/modules/%{version}-%{release}
-/usr/share/%{name}-kernel/%{version}-%{release}
-/usr/share/%{name}-kernel/%{version}-%{release}/boot
-/usr/share/%{name}-kernel/%{version}-%{release}/boot/*.dtb
+/usr/share/%{name}-kernel%{?ksuffix}/%{version}-%{release}
+/usr/share/%{name}-kernel%{?ksuffix}/%{version}-%{release}/boot
+/usr/share/%{name}-kernel%{?ksuffix}/%{version}-%{release}/boot/*.dtb
/boot/config-%{version}-%{release}
/boot/overlays/
-/usr/share/%{name}-kernel/%{version}-%{release}/boot/overlays/*
+/usr/share/%{name}-kernel%{?ksuffix}/%{version}-%{release}/boot/overlays/*
%attr(0755,root,root) /boot/kernel-%{version}-%{release}.img
%ghost /boot/initramfs-%{version}-%{release}.img
/boot/config-kernel-%{version}-%{release}.inc
@@ -358,9 +358,9 @@ if [ -f /boot/kernel%{armtarget}.img ] || [ ! -f /boot/config-kernel.inc ];then
# if we have moved to initramfs
cp /boot/kernel-%{version}-%{release}.img /boot/kernel%{armtarget}.img
fi
-cp /usr/share/%{name}-kernel/%{version}-%{release}/boot/*.dtb /boot/
-cp /usr/share/%{name}-kernel/%{version}-%{release}/boot/overlays/*.dtb* /boot/overlays/
-cp /usr/share/%{name}-kernel/%{version}-%{release}/boot/overlays/README /boot/overlays/
+cp /usr/share/%{name}-kernel%{?ksuffix}/%{version}-%{release}/boot/*.dtb /boot/
+cp /usr/share/%{name}-kernel%{?ksuffix}/%{version}-%{release}/boot/overlays/*.dtb* /boot/overlays/
+cp /usr/share/%{name}-kernel%{?ksuffix}/%{version}-%{release}/boot/overlays/README /boot/overlays/
cp /boot/config-kernel-%{version}-%{release}.inc /boot/config-kernel.inc
%postun kernel%{?ksuffix}
@@ -368,9 +368,9 @@ if [ -f /boot/kernel%{armtarget}.img ];then
#only restore kernel%{armtarget}.img if it exists, we may have moved to initramfs
cp $(ls -1 /boot/kernel-*-*|sort -V|tail -1) /boot/kernel%{armtarget}.img
fi
-cp $(ls -1d /usr/share/%{name}-kernel/*-*/|sort -V|tail -1)/boot/*.dtb /boot/
-cp $(ls -1d /usr/share/%{name}-kernel/*-*/|sort -V|tail -1)/boot/overlays/*.dtb* /boot/overlays/
-cp $(ls -1d /usr/share/%{name}-kernel/*-*/|sort -V|tail -1)/boot/overlays/README /boot/overlays/
+cp $(ls -1d /usr/share/%{name}-kernel%{?ksuffix}/*-*/|sort -V|tail -1)/boot/*.dtb /boot/
+cp $(ls -1d /usr/share/%{name}-kernel%{?ksuffix}/*-*/|sort -V|tail -1)/boot/overlays/*.dtb* /boot/overlays/
+cp $(ls -1d /usr/share/%{name}-kernel%{?ksuffix}/*-*/|sort -V|tail -1)/boot/overlays/README /boot/overlays/
cp $(ls -1 /boot/config-kernel-*-*|sort -V|tail -1) /boot/config-kernel.inc
--
2.47.3
From 12a286e89e20b5245fec0e04ea77c8b9b2608286 Mon Sep 17 00:00:00 2001
From: Koichiro Iwao
Date: Tue, 1 Apr 2025 15:56:09 +0900
Subject: [PATCH 2/6] Enable EROFS
(cherry picked from commit 49f7d4205e7616bae5ffb3aadd02dadd8ff1e468)
---
SOURCES/config_2711.patch | 6 +++++-
SOURCES/config_2712.patch | 6 +++++-
2 files changed, 10 insertions(+), 2 deletions(-)
diff --git a/SOURCES/config_2711.patch b/SOURCES/config_2711.patch
index 7ca65b8..08e3474 100644
--- a/SOURCES/config_2711.patch
+++ b/SOURCES/config_2711.patch
@@ -23,7 +23,7 @@ index e87791286ab4..6fda5b261683 100644
CONFIG_CRYPTO_USER=m
CONFIG_CRYPTO_CRYPTD=m
CONFIG_CRYPTO_AES=m
-@@ -1674,3 +1672,39 @@ CONFIG_SCHED_TRACER=y
+@@ -1674,3 +1672,43 @@ CONFIG_SCHED_TRACER=y
CONFIG_BLK_DEV_IO_TRACE=y
# CONFIG_UPROBE_EVENTS is not set
# CONFIG_STRICT_DEVMEM is not set
@@ -63,6 +63,10 @@ index e87791286ab4..6fda5b261683 100644
+CONFIG_FW_LOADER_COMPRESS=y
+CONFIG_FW_LOADER_COMPRESS_XZ=y
+CONFIG_FW_LOADER_COMPRESS_ZSTD=y
++CONFIG_EROFS_FS=m
++CONFIG_EROFS_FS_XATTR=y
++CONFIG_EROFS_POSIX_ACL=y
++CONFIG_EROFS_FS_SECURITY=y
--
2.45.1
diff --git a/SOURCES/config_2712.patch b/SOURCES/config_2712.patch
index 39c7248..7134e24 100644
--- a/SOURCES/config_2712.patch
+++ b/SOURCES/config_2712.patch
@@ -23,7 +23,7 @@ index 79c4332581eb..7b63683ff687 100644
CONFIG_CRYPTO_USER=m
CONFIG_CRYPTO_CRYPTD=m
CONFIG_CRYPTO_AES=m
-@@ -1677,3 +1675,39 @@ CONFIG_SCHED_TRACER=y
+@@ -1677,3 +1675,43 @@ CONFIG_SCHED_TRACER=y
CONFIG_BLK_DEV_IO_TRACE=y
# CONFIG_UPROBE_EVENTS is not set
# CONFIG_STRICT_DEVMEM is not set
@@ -63,6 +63,10 @@ index 79c4332581eb..7b63683ff687 100644
+CONFIG_FW_LOADER_COMPRESS=y
+CONFIG_FW_LOADER_COMPRESS_XZ=y
+CONFIG_FW_LOADER_COMPRESS_ZSTD=y
++CONFIG_EROFS_FS=m
++CONFIG_EROFS_FS_XATTR=y
++CONFIG_EROFS_POSIX_ACL=y
++CONFIG_EROFS_FS_SECURITY=y
--
2.45.1
--
2.47.3
From 481fceb4cd60edb913537474afe1dad2660b2bb4 Mon Sep 17 00:00:00 2001
From: Koichiro Iwao
Date: Tue, 1 Apr 2025 15:57:10 +0900
Subject: [PATCH 3/6] Fixes to enable bootc
Signed-off-by: Kevin Fox
(cherry picked from commit 0a27438f03d9e17a738246bf27fb915c385de135)
---
SPECS/raspberrypi2.spec | 25 +++++++++++++++++--------
1 file changed, 17 insertions(+), 8 deletions(-)
diff --git a/SPECS/raspberrypi2.spec b/SPECS/raspberrypi2.spec
index 9f65035..5038845 100644
--- a/SPECS/raspberrypi2.spec
+++ b/SPECS/raspberrypi2.spec
@@ -353,15 +353,24 @@ find %{buildroot}/usr/include \
%posttrans kernel%{?ksuffix}
-if [ -f /boot/kernel%{armtarget}.img ] || [ ! -f /boot/config-kernel.inc ];then
- # if nothing exists, fall back to generating the file, but don't create it
- # if we have moved to initramfs
- cp /boot/kernel-%{version}-%{release}.img /boot/kernel%{armtarget}.img
+if [ -d /usr/lib/ostree-boot ]; then
+ mkdir -p /usr/lib/modules/%{version}-%{release}
+ mv /usr/lib/ostree-boot/config-%{version}-%{release} /usr/lib/modules/%{version}-%{release}/
+ mv /usr/lib/ostree-boot/config-kernel-%{version}-%{release}.inc /usr/lib/modules/%{version}-%{release}/
+ mv /usr/lib/ostree-boot/initramfs-%{version}-%{release}.img /usr/lib/modules/%{version}-%{release}/initramfs
+ mv /usr/lib/ostree-boot/kernel-%{version}-%{release}.img /usr/lib/modules/%{version}-%{release}/vmlinuz
+fi
+if [ -d /boot ]; then
+ if [ -f /boot/kernel%{armtarget}.img ] || [ ! -f /boot/config-kernel.inc ];then
+ # if nothing exists, fall back to generating the file, but don't create it
+ # if we have moved to initramfs
+ cp /boot/kernel-%{version}-%{release}.img /boot/kernel%{armtarget}.img
+ fi
+ cp /usr/share/%{name}-kernel/%{version}-%{release}/boot/*.dtb /boot/
+ cp /usr/share/%{name}-kernel/%{version}-%{release}/boot/overlays/*.dtb* /boot/overlays/
+ cp /usr/share/%{name}-kernel/%{version}-%{release}/boot/overlays/README /boot/overlays/
+ cp /boot/config-kernel-%{version}-%{release}.inc /boot/config-kernel.inc
fi
-cp /usr/share/%{name}-kernel%{?ksuffix}/%{version}-%{release}/boot/*.dtb /boot/
-cp /usr/share/%{name}-kernel%{?ksuffix}/%{version}-%{release}/boot/overlays/*.dtb* /boot/overlays/
-cp /usr/share/%{name}-kernel%{?ksuffix}/%{version}-%{release}/boot/overlays/README /boot/overlays/
-cp /boot/config-kernel-%{version}-%{release}.inc /boot/config-kernel.inc
%postun kernel%{?ksuffix}
if [ -f /boot/kernel%{armtarget}.img ];then
--
2.47.3
From f6cd337a07cacc3343fd97010a209f74a62db86d Mon Sep 17 00:00:00 2001
From: Koichiro Iwao
Date: Tue, 1 Apr 2025 15:57:10 +0900
Subject: [PATCH 4/6] Add existence checks before moving bootc related files
(cherry picked from commit b560a57125388c3e664f0d7c583c5e10a4fe47a9)
---
SPECS/raspberrypi2.spec | 14 ++++++++++----
1 file changed, 10 insertions(+), 4 deletions(-)
diff --git a/SPECS/raspberrypi2.spec b/SPECS/raspberrypi2.spec
index 5038845..d56bd48 100644
--- a/SPECS/raspberrypi2.spec
+++ b/SPECS/raspberrypi2.spec
@@ -355,10 +355,16 @@ find %{buildroot}/usr/include \
%posttrans kernel%{?ksuffix}
if [ -d /usr/lib/ostree-boot ]; then
mkdir -p /usr/lib/modules/%{version}-%{release}
- mv /usr/lib/ostree-boot/config-%{version}-%{release} /usr/lib/modules/%{version}-%{release}/
- mv /usr/lib/ostree-boot/config-kernel-%{version}-%{release}.inc /usr/lib/modules/%{version}-%{release}/
- mv /usr/lib/ostree-boot/initramfs-%{version}-%{release}.img /usr/lib/modules/%{version}-%{release}/initramfs
- mv /usr/lib/ostree-boot/kernel-%{version}-%{release}.img /usr/lib/modules/%{version}-%{release}/vmlinuz
+ pushd /usr/lib/ostree-boot
+ [ -e config-%{version}-%{release} ] && \
+ mv config-%{version}-%{release} /usr/lib/modules/%{version}-%{release}/
+ [ -e config-kernel-%{version}-%{release}.inc ] && \
+ mv config-kernel-%{version}-%{release}.inc /usr/lib/modules/%{version}-%{release}/
+ [ -e initramfs-%{version}-%{release}.img ] && \
+ mv initramfs-%{version}-%{release}.img /usr/lib/modules/%{version}-%{release}/initramfs
+ [ -e kernel-%{version}-%{release}.img ] && \
+ mv kernel-%{version}-%{release}.img /usr/lib/modules/%{version}-%{release}/vmlinuz
+ popd
fi
if [ -d /boot ]; then
if [ -f /boot/kernel%{armtarget}.img ] || [ ! -f /boot/config-kernel.inc ];then
--
2.47.3
From 0c741f92fd3aa8c0c845dd8ebd7df27e5bc1af7a Mon Sep 17 00:00:00 2001
From: Koichiro Iwao
Date: Mon, 14 Apr 2025 17:54:35 +0900
Subject: [PATCH 5/6] Bump package version and update changelog
(cherry picked from commit 863a2f1858bd220c4603e80231bce1efc02dfed8)
---
SPECS/raspberrypi2.spec | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/SPECS/raspberrypi2.spec b/SPECS/raspberrypi2.spec
index d56bd48..56837ab 100644
--- a/SPECS/raspberrypi2.spec
+++ b/SPECS/raspberrypi2.spec
@@ -11,7 +11,7 @@ ExclusiveArch: aarch64
%define local_version v8
%define bcmmodel 2711
-%define extra_version 1
+%define extra_version 2
# 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.
@@ -445,6 +445,11 @@ cp $(ls -1 /boot/config-kernel-*-*|sort -V|tail -1) /boot/config-kernel.inc
%endif
%changelog
+* Mon Apr 14 2025 Koichiro Iwao - 6.6.74-20250127.v8.2
+- Fixes to enable bootc
+- Enable EROFS
+- Use the consistent directory under /usr/share with the package name
+
* Thu Feb 20 2025 Koichiro Iwao - 6.6.74-20250127.v8.1
- Update kernel to v6.6.74 stable_20250127
- Update firmware to 1.20250127
--
2.47.3
From f398a86d6fce1db859c221c253a583b442cad3b7 Mon Sep 17 00:00:00 2001
From: Koichiro Iwao
Date: Wed, 21 May 2025 18:44:53 +0900
Subject: [PATCH 6/6] Update to 6.12.25 stable_20250428
(cherry picked from commit 6627c4c42baa2eed34b36ba8642f0751a7a2d607)
---
.raspberrypi2.metadata | 4 ++--
SOURCES/config_2711.patch | 18 +++++++++---------
SOURCES/config_2712.patch | 18 +++++++++---------
SPECS/raspberrypi2.spec | 22 ++++++++++++++--------
4 files changed, 34 insertions(+), 28 deletions(-)
diff --git a/.raspberrypi2.metadata b/.raspberrypi2.metadata
index 6d99700..c972d5d 100644
--- a/.raspberrypi2.metadata
+++ b/.raspberrypi2.metadata
@@ -1,2 +1,2 @@
-3b7015807a4ca000fb448ed13b51d63a5dc7a745 SOURCES/1.20250127.tar.gz
-dff2a82c96972629d33534897d8aa22d8c19ee94 SOURCES/stable_20250127.tar.gz
+716cf8d994e7c3794489e9c33de8c77c466d2a46 SOURCES/1.20250430.tar.gz
+37b6749bb055db30a8496f0bf60e14465304416e SOURCES/stable_20250428.tar.gz
diff --git a/SOURCES/config_2711.patch b/SOURCES/config_2711.patch
index 08e3474..27079a6 100644
--- a/SOURCES/config_2711.patch
+++ b/SOURCES/config_2711.patch
@@ -1,21 +1,21 @@
-From 8bdc23947dfc60f7c1e277dc4f87a8bc5fc645c6 Mon Sep 17 00:00:00 2001
+From bdec30ca8e18bc7d9a5d25d7cd9ca7976aef8aa2 Mon Sep 17 00:00:00 2001
From: Koichiro Iwao
-Date: Tue, 28 May 2024 15:11:20 +0900
+Date: Mon, 19 May 2025 13:09:29 +0900
Subject: [PATCH 1/2] Apply config patch for Raspberry Pi (BCM2711)
The patch is originally provided by Pablo Greco .
Signed-off-by: Koichiro Iwao
---
- arch/arm64/configs/bcm2711_defconfig | 38 ++++++++++++++++++++++++++--
- 1 file changed, 36 insertions(+), 2 deletions(-)
+ arch/arm64/configs/bcm2711_defconfig | 42 ++++++++++++++++++++++++++--
+ 1 file changed, 40 insertions(+), 2 deletions(-)
diff --git a/arch/arm64/configs/bcm2711_defconfig b/arch/arm64/configs/bcm2711_defconfig
-index e87791286ab4..6fda5b261683 100644
+index ce3e13572fb4..324800576e6a 100644
--- a/arch/arm64/configs/bcm2711_defconfig
+++ b/arch/arm64/configs/bcm2711_defconfig
-@@ -1622,8 +1622,6 @@ CONFIG_NLS_KOI8_U=m
- CONFIG_DLM=m
+@@ -1690,8 +1690,6 @@ CONFIG_DLM=m
+ CONFIG_UNICODE=m
CONFIG_KEY_DH_OPERATIONS=y
CONFIG_SECURITY=y
-CONFIG_SECURITY_APPARMOR=y
@@ -23,7 +23,7 @@ index e87791286ab4..6fda5b261683 100644
CONFIG_CRYPTO_USER=m
CONFIG_CRYPTO_CRYPTD=m
CONFIG_CRYPTO_AES=m
-@@ -1674,3 +1672,43 @@ CONFIG_SCHED_TRACER=y
+@@ -1742,3 +1740,43 @@ CONFIG_SCHED_TRACER=y
CONFIG_BLK_DEV_IO_TRACE=y
# CONFIG_UPROBE_EVENTS is not set
# CONFIG_STRICT_DEVMEM is not set
@@ -68,5 +68,5 @@ index e87791286ab4..6fda5b261683 100644
+CONFIG_EROFS_POSIX_ACL=y
+CONFIG_EROFS_FS_SECURITY=y
--
-2.45.1
+2.49.0
diff --git a/SOURCES/config_2712.patch b/SOURCES/config_2712.patch
index 7134e24..29b4459 100644
--- a/SOURCES/config_2712.patch
+++ b/SOURCES/config_2712.patch
@@ -1,21 +1,21 @@
-From 5ae1f73a82e6ba1203d031c5c82943865dce8174 Mon Sep 17 00:00:00 2001
+From c6064f14a8c32e3109ee83c736097e2ee03086ca Mon Sep 17 00:00:00 2001
From: Koichiro Iwao
-Date: Tue, 28 May 2024 15:14:02 +0900
+Date: Mon, 19 May 2025 13:10:35 +0900
Subject: [PATCH 2/2] Apply config patch for Raspberry Pi (BCM2712)
The patch is originally provided by Pablo Greco .
Signed-off-by: Koichiro Iwao
---
- arch/arm64/configs/bcm2712_defconfig | 38 ++++++++++++++++++++++++++--
- 1 file changed, 36 insertions(+), 2 deletions(-)
+ arch/arm64/configs/bcm2712_defconfig | 42 ++++++++++++++++++++++++++--
+ 1 file changed, 40 insertions(+), 2 deletions(-)
diff --git a/arch/arm64/configs/bcm2712_defconfig b/arch/arm64/configs/bcm2712_defconfig
-index 79c4332581eb..7b63683ff687 100644
+index 9e2bda050f81..51afa99f75e3 100644
--- a/arch/arm64/configs/bcm2712_defconfig
+++ b/arch/arm64/configs/bcm2712_defconfig
-@@ -1625,8 +1625,6 @@ CONFIG_NLS_KOI8_U=m
- CONFIG_DLM=m
+@@ -1692,8 +1692,6 @@ CONFIG_DLM=m
+ CONFIG_UNICODE=m
CONFIG_KEY_DH_OPERATIONS=y
CONFIG_SECURITY=y
-CONFIG_SECURITY_APPARMOR=y
@@ -23,7 +23,7 @@ index 79c4332581eb..7b63683ff687 100644
CONFIG_CRYPTO_USER=m
CONFIG_CRYPTO_CRYPTD=m
CONFIG_CRYPTO_AES=m
-@@ -1677,3 +1675,43 @@ CONFIG_SCHED_TRACER=y
+@@ -1744,3 +1742,43 @@ CONFIG_SCHED_TRACER=y
CONFIG_BLK_DEV_IO_TRACE=y
# CONFIG_UPROBE_EVENTS is not set
# CONFIG_STRICT_DEVMEM is not set
@@ -68,5 +68,5 @@ index 79c4332581eb..7b63683ff687 100644
+CONFIG_EROFS_POSIX_ACL=y
+CONFIG_EROFS_FS_SECURITY=y
--
-2.45.1
+2.49.0
diff --git a/SPECS/raspberrypi2.spec b/SPECS/raspberrypi2.spec
index 56837ab..48d6b2e 100644
--- a/SPECS/raspberrypi2.spec
+++ b/SPECS/raspberrypi2.spec
@@ -1,5 +1,5 @@
-%global firmware_tag 1.20250127
-%global version_tag 20250127
+%global firmware_tag 1.20250430
+%global version_tag 20250428
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.6
-%define patchlevel 74
+%define kversion 6.12
+%define patchlevel 25
# standard kernel
%define with_up %{?_without_up: 0} %{?!_without_up: 1}
@@ -372,9 +372,9 @@ if [ -d /boot ]; then
# if we have moved to initramfs
cp /boot/kernel-%{version}-%{release}.img /boot/kernel%{armtarget}.img
fi
- cp /usr/share/%{name}-kernel/%{version}-%{release}/boot/*.dtb /boot/
- cp /usr/share/%{name}-kernel/%{version}-%{release}/boot/overlays/*.dtb* /boot/overlays/
- cp /usr/share/%{name}-kernel/%{version}-%{release}/boot/overlays/README /boot/overlays/
+ cp /usr/share/%{name}-kernel%{?ksuffix}/%{version}-%{release}/boot/*.dtb /boot/
+ cp /usr/share/%{name}-kernel%{?ksuffix}/%{version}-%{release}/boot/overlays/*.dtb* /boot/overlays/
+ cp /usr/share/%{name}-kernel%{?ksuffix}/%{version}-%{release}/boot/overlays/README /boot/overlays/
cp /boot/config-kernel-%{version}-%{release}.inc /boot/config-kernel.inc
fi
@@ -445,6 +445,12 @@ cp $(ls -1 /boot/config-kernel-*-*|sort -V|tail -1) /boot/config-kernel.inc
%endif
%changelog
+* Mon May 26 2025 Koichiro Iwao - 6.12.25-20250428.v8.1
+- Update kernel to 6.12.25 stable_20250428
+- Update firmware to 1.20250430
+- Regenerate patches
+- Apply the consistent directory under /usr/share (fix missed cases)
+
* Mon Apr 14 2025 Koichiro Iwao - 6.6.74-20250127.v8.2
- Fixes to enable bootc
- Enable EROFS
--
2.47.3