fix: key surface-dtb copy of the device tree by kernel versionfedora-45-kernel-7.2.3-patchset-3

1 files changed, 12 insertions, 5 deletions

diff --git a/kernel-surface.spec b/kernel-surface.spec
index e238be7..7c4fab2 100644
--- a/kernel-surface.spec
+++ b/kernel-surface.spec
@@ -17,7 +17,7 @@
 
 # Bumped whenever the patch tarball changes without the upstream version moving.
 %if %{undefined patchset_ver}
-%global patchset_ver 2
+%global patchset_ver 3
 %endif
 
 # rpm gives - to the version-release separator, so it cannot appear in Version
@@ -217,7 +217,7 @@ install -Dm644 System.map \
 install -Dm644 .config \
     %{buildroot}/usr/lib/modules/%{kverrel}/config
 install -Dm644 arch/arm64/boot/dts/qcom/x1p42100-microsoft-sp12in.dtb \
-    %{buildroot}/usr/lib/surface-dtb/x1p42100-microsoft-sp12in.dtb
+    %{buildroot}/usr/lib/surface-dtb/%{kverrel}/x1p42100-microsoft-sp12in.dtb
 
 %post
 /usr/sbin/depmod -a %{kverrel} || :
@@ -239,16 +239,23 @@ fi
 %files
 %license COPYING
 /usr/lib/modules/%{kverrel}/
-/usr/lib/surface-dtb/x1p42100-microsoft-sp12in.dtb
+/usr/lib/surface-dtb/%{kverrel}/
 %ghost %attr(0644,root,root) /boot/config-%{kverrel}
 %ghost %attr(0644,root,root) /boot/initramfs-%{kverrel}.img
 %ghost %attr(0600,root,root) /boot/System.map-%{kverrel}
 %ghost %attr(0644,root,root) /boot/vmlinuz-%{kverrel}
 
 %changelog
+* Mon Sep 07 2026 Saya Andy  7.2.3-3
+- Key the /usr/lib/surface-dtb copy of the device tree by kernel version. This
+  package is installonly, so an unqualified path there conflicts between two
+  installed releases as soon as the device tree they build differs.
+
 * Sun Sep 06 2026 Saya Andy  7.2.3-2
-- Local camera patch: report the right bayer order when mirrored (fixes the black-green monochrome output issue)
-- Local surface patch: point iris at the OEM video firmware (fixes error -22 for video encoding/decoding)
+- Local camera patch: report the right bayer order when mirrored (fixes the
+  black-green monochrome output issue)
+- Local surface patch: point iris at the OEM video firmware (fixes error -22
+  for video encoding/decoding)
 
 * Sun Sep 06 2026 Saya Andy  7.2.3-1
 - Initial package: vanilla 7.2.3 with the overlay's Surface Pro 12" patch set