From e6b15dea9e03d805523bf2a7425a08b5c9e9898e Mon Sep 17 00:00:00 2001
From: Guanquan Tian <guanquan@qti.qualcomm.com>
Date: Thu, 27 Aug 2026 01:08:52 +0800
Subject: [PATCH 1/2] ci(build-kernel): resolve build-dep against local
 debian/control
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

apt-get build-dep -y linux ran before checkout and resolved against
the archive's generic "linux" source package instead of the fork's
own debian/control, so qcom-specific Build-Depends were never
installed.

Move the build-dep call after "debian/rules clean" generates the real
debian/control, and resolve against that local file (apt-get build-dep
-y ./) instead of the archive package name.

Also remove do_fitimage=false flag — the pkg-builder image now
provides mkimage, so FIT image generation should work without
needing to disable it.

Signed-off-by: Guanquan Tian <guanquan@qti.qualcomm.com>
---
 .github/workflows/build-kernel.yml | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/build-kernel.yml b/.github/workflows/build-kernel.yml
index f85fdf7caef4..5ebfbeb7f87f 100644
--- a/.github/workflows/build-kernel.yml
+++ b/.github/workflows/build-kernel.yml
@@ -381,7 +381,6 @@ jobs:
               # pkg-builder:noble is Ubuntu 24.04 which uses DEB822 format.
               sed -i "s/^Types: deb$/Types: deb deb-src/" /etc/apt/sources.list.d/ubuntu.sources
               apt-get update -qq
-              apt-get build-dep -y linux
 
               cd kernel-src/
               echo "debian/debian.env: $(cat debian/debian.env 2>/dev/null || echo NOT FOUND)"
@@ -418,6 +417,10 @@ jobs:
                 echo "Safety net: created debian/changelog → debian.master/changelog"
               fi
 
+              # Resolve against the local debian/control just generated by "clean".
+              echo "=== Installing build dependencies from debian/control ==="
+              apt-get build-dep -y ./
+
               echo "=== Starting: fakeroot debian/rules ${TARGET} (jobs=${JOBS}) ==="
               export DEB_BUILD_OPTIONS="parallel=${JOBS} nocheck"
               # do_skip_checks=true skips the config policy check that requires
@@ -428,7 +431,7 @@ jobs:
               # -dbgsym.ddeb (vmlinux + modules with full debug symbols).
               DBGSYM_OPT="do_dbgsym_package=false"
               if [ "${DBGSYM}" = "true" ]; then DBGSYM_OPT="do_dbgsym_package=true"; fi
-              fakeroot debian/rules ${TARGET} do_skip_checks=true "${DBGSYM_OPT}" do_fitimage=false
+              fakeroot debian/rules ${TARGET} do_skip_checks=true "${DBGSYM_OPT}"
 
               kill "${HEARTBEAT}" 2>/dev/null || true
 

From 3d2e94114a9712a80d2f9cc00e7966cdb63fab5b Mon Sep 17 00:00:00 2001
From: Guanquan Tian <guanquan@qti.qualcomm.com>
Date: Tue, 22 Sep 2026 15:38:29 +0800
Subject: [PATCH 2/2] ci(build-kernel): add Qualcomm qartifactory repo for
 kgsl-dkms

Add the Qualcomm qartifactory source to the build container so
kgsl-dkms and other packages can be resolved during apt-get build-dep.

Signed-off-by: Guanquan Tian <guanquan@qti.qualcomm.com>
---
 .github/workflows/build-kernel.yml | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/.github/workflows/build-kernel.yml b/.github/workflows/build-kernel.yml
index 5ebfbeb7f87f..7ae500b69de8 100644
--- a/.github/workflows/build-kernel.yml
+++ b/.github/workflows/build-kernel.yml
@@ -380,6 +380,11 @@ jobs:
               # Enable deb-src so apt-get build-dep can resolve build dependencies.
               # pkg-builder:noble is Ubuntu 24.04 which uses DEB822 format.
               sed -i "s/^Types: deb$/Types: deb deb-src/" /etc/apt/sources.list.d/ubuntu.sources
+
+              # Add Qualcomm qartifactory repo for kgsl-dkms
+              echo "deb [trusted=yes] https://qartifactory-edge.qualcomm.com/artifactory/qsc-deb-releases resolute main" \
+                > /etc/apt/sources.list.d/qsc-deb-releases.list
+
               apt-get update -qq
 
               cd kernel-src/