From 15d286f32848c5533c12be80db22ed1e118c289a Mon Sep 17 00:00:00 2001
From: Bastian Blank <waldi@debian.org>
Date: Tue, 6 Jan 2026 17:54:33 +0100
Subject: [PATCH] Fix installation of dtb into kernel-image udebs

---
 debian/changelog                     | 3 +++
 debian/config/arm64/config.test      | 6 ++++++
 debian/templates/image-di.install.j2 | 3 +++
 3 files changed, 12 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index f5390ed121..3b93388f32 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,9 @@ linux (6.19~rc4-1~exp1) UNRELEASED; urgency=medium
 
   * New upstream release candidate.
 
+  [ Bastian Blank ]
+  * Fix installation of dtb into kernel-image udebs.
+
  -- Bastian Blank <waldi@debian.org>  Mon, 05 Jan 2026 15:09:52 +0100
 
 linux (6.18.3-1) unstable; urgency=medium
diff --git a/debian/config/arm64/config.test b/debian/config/arm64/config.test
index 785c8a3cb8..48d7b29b9a 100644
--- a/debian/config/arm64/config.test
+++ b/debian/config/arm64/config.test
@@ -28,6 +28,12 @@ CONFIG_RANDOMIZE_BASE=y
 CONFIG_RANDOMIZE_MODULE_REGION_FULL=y
 CONFIG_ARM64_ACPI_PARKING_PROTOCOL=y
 
+##
+## file: arch/arm64/Kconfig.platforms
+##
+#. Testing dtb installation
+CONFIG_ARCH_KEEMBAY=y
+
 ##
 ## file: drivers/acpi/Kconfig
 ##
diff --git a/debian/templates/image-di.install.j2 b/debian/templates/image-di.install.j2
index 941fadd3fa..6a7320c562 100644
--- a/debian/templates/image-di.install.j2
+++ b/debian/templates/image-di.install.j2
@@ -1,3 +1,6 @@
 boot/vmlinu?-{{abiname}}{{localversion}}
 lib/modules/{{abiname}}{{localversion}}/modules.builtin  lib/modules/{{abiname}}{{localversion}}
 lib/modules/{{abiname}}{{localversion}}/modules.order    lib/modules/{{abiname}}{{localversion}}
+{% if config.build.enable_dtb %}
+lib/modules/{{abiname}}{{localversion}}/dtb              lib/modules/{{abiname}}{{localversion}}
+{% endif %}