From fc2b7467130af3c343afa9c1211ab3e5e0554a57 Mon Sep 17 00:00:00 2001
From: Koichiro Iwao
Date: Mon, 26 May 2025 18:09:37 +0900
Subject: [PATCH] Apply the consistent directory under /usr/share (fix missed
cases)
---
SPECS/raspberrypi2.spec | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/SPECS/raspberrypi2.spec b/SPECS/raspberrypi2.spec
index e9d81fc..31a7d89 100644
--- a/SPECS/raspberrypi2.spec
+++ b/SPECS/raspberrypi2.spec
@@ -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
@@ -449,6 +449,7 @@ cp $(ls -1 /boot/config-kernel-*-*|sort -V|tail -1) /boot/config-kernel.inc
- 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