From 6e4440eb4eb0ef735da1ee57b2ee399838552780 Mon Sep 17 00:00:00 2001
From: Christopher Obbard <chris.obbard@oss.qualcomm.com>
Date: Sat, 10 Oct 2026 22:50:11 +0100
Subject: [PATCH] ci: qcom-7.2: ship the same Qualcomm out-of-tree drivers as
 qcom-next

Build the same DKMS modules for the qcom-7.2 and qcom-7.2-debug variants
as qcom-next does (kgsl, camx, iris-vpu, audioreach) so the qcom-7.2
kernels ship prebuilt <name>-modules-<kernelrelease> packages and
their metapackages alongside the image.

Requested in qualcomm-linux/qcom-deb-images#731.

Signed-off-by: Christopher Obbard <chris.obbard@oss.qualcomm.com>
---
 README.md            |  2 +-
 ci/build-matrix.json | 36 ++++++++++++++++++++++++++++++++----
 2 files changed, 33 insertions(+), 5 deletions(-)

diff --git a/README.md b/README.md
index 86a0893..de2e04b 100644
--- a/README.md
+++ b/README.md
@@ -25,7 +25,7 @@ isolated `kernel_variant + suite` build leg.
 |---------|----------------|-------------------|--------------|----------------|-------|
 | `qcom-next` | `linux-qcom-next` | `linux-image-qcom-next` | trixie, forky, resolute | trixie, forky | Standard kernel |
 | `qcom-next-debug` | `linux-qcom-next-debug` | `linux-image-qcom-next-debug` | trixie, forky | trixie, forky | Adds `arch/arm64/configs/qcom_debug.config` and `kernel/configs/debug.config` from the kernel source, via `intree:` entries |
-| `qcom-7.2` | `linux-qcom-7.2` | `linux-image-qcom-7.2` | trixie | trixie | Builds the newest `qcom-7.2-*` tag (Daily) and a pinned `qcom-7.2-*` tag (Release); no DKMS modules |
+| `qcom-7.2` | `linux-qcom-7.2` | `linux-image-qcom-7.2` | trixie | trixie | Builds the newest `qcom-7.2-*` tag (Daily) and a pinned `qcom-7.2-*` tag (Release); same DKMS modules as `qcom-next` on trixie |
 | `qcom-7.2-debug` | `linux-qcom-7.2-debug` | `linux-image-qcom-7.2-debug` | trixie | trixie | As `qcom-7.2`, plus the same debug fragments as `qcom-next-debug` |
 
 Each debug variant builds the same kernel ref as its standard variant.
diff --git a/ci/build-matrix.json b/ci/build-matrix.json
index aae683e..5a7af65 100644
--- a/ci/build-matrix.json
+++ b/ci/build-matrix.json
@@ -152,7 +152,14 @@
       "srcpkg": "linux-qcom-7.2",
       "binpkg": "linux-image-qcom-7.2",
       "kernel_config": [],
-      "dkms": {},
+      "dkms": {
+        "trixie": [
+          "kgsl",
+          "camx",
+          "iris-vpu",
+          "audioreach"
+        ]
+      },
       "debian_version_stub": "0qli1",
       "debian_version_suffix": "~"
     },
@@ -169,7 +176,14 @@
       "srcpkg": "linux-qcom-7.2",
       "binpkg": "linux-image-qcom-7.2",
       "kernel_config": [],
-      "dkms": {},
+      "dkms": {
+        "trixie": [
+          "kgsl",
+          "camx",
+          "iris-vpu",
+          "audioreach"
+        ]
+      },
       "debian_version_stub": "0qli1",
       "debian_version_suffix": ""
     },
@@ -189,7 +203,14 @@
         "intree:arch/arm64/configs/qcom_debug.config",
         "intree:kernel/configs/debug.config"
       ],
-      "dkms": {},
+      "dkms": {
+        "trixie": [
+          "kgsl",
+          "camx",
+          "iris-vpu",
+          "audioreach"
+        ]
+      },
       "debian_version_stub": "0qli1",
       "debian_version_suffix": "~"
     },
@@ -209,7 +230,14 @@
         "intree:arch/arm64/configs/qcom_debug.config",
         "intree:kernel/configs/debug.config"
       ],
-      "dkms": {},
+      "dkms": {
+        "trixie": [
+          "kgsl",
+          "camx",
+          "iris-vpu",
+          "audioreach"
+        ]
+      },
       "debian_version_stub": "0qli1",
       "debian_version_suffix": ""
     }