qps615-dlkm: fix devtool build directory and package version by paddy-chiu · Pull Request #3163 · qualcomm-linux/meta-qcom

paddy-chiu · 2026-09-15T11:36:48Z

When using devtool, externalsrc defaults B to a separate work directory, but the driver Makefile is located under drivers/net/ethernet/toshiba/tc956x. Set EXTERNALSRC_BUILD to use the correct directory.

externalsrc also removes the Git URI from SRC_URI, causing PKGV to remain 6.0.3+git instead of the normal 6.0.3+git0+. Align PKGV for devtool builds with regular builds to prevent buildhistory package-version QA failures.

paddy-chiu · 2026-09-15T11:40:59Z

Without EXTERNALSRC_BUILD, we will face "no makefile found" (log.do_compile.326282.txt) when running devtool build qps615-dlkm
Without PKGV, we might face "ERROR: QA Issue: Package version" (log.do_packagedata.387258.txt) when running devtool build qps615-dlkm since the package version will become 6.0.3+git (PV) without commit ID.

Jose Quaresma (quaresmajose) · 2026-09-15T14:20:48Z

Can you please try the following? I think it does the same thing, if I understand correctly.

--- a/recipes-kernel/qps615-module/qps615-dlkm_git.bb
+++ b/recipes-kernel/qps615-module/qps615-dlkm_git.bb
@@ -13,6 +13,17 @@ SRC_URI = "git://github.com/qualcomm-linux/TC9564_Host_Driver.git;protocol=https
 
 PV = "6.0.3+git"
 
+def qps615_pkgv_suffix(d):
+    import bb.fetch
+
+    data = d.createCopy()
+    data.setVar("SRC_URI", d.getVar("SRC_URI"))
+    return bb.fetch.get_pkgv_string(data)
+
+PKGV .= "${@'' if not d.getVar('EXTERNALSRC') else qps615_pkgv_suffix(d)}"
+
+EXTERNALSRC_BUILD = "${EXTERNALSRC}/drivers/net/ethernet/toshiba/tc956x"
+
 B = "${S}/drivers/net/ethernet/toshiba/tc956x"
 
 # The original Makefile uses an "ifeq ($(pf), 1)" check to pick the default config.

Please wrap the text at ~70 characters in commit message.

Ricardo Salveti (ricardosalveti) · 2026-09-15T22:29:00Z

+# so devtool package versions match versions from the regular fetch/build path.
+QPS615_PKGREV = "${@qps615_pkgv_suffix(d)}"
+PKGV = "${@d.getVar('PV') + d.getVar('QPS615_PKGREV') if d.getVar('EXTERNALSRC') else d.getVar('PV')}"
+


Above changes should be separated on a different commit.

Also, is this really qps615-dlkm specific? I think this is just an oe-core issue.

yeah, it llok like an oe-core issue of the oe-core/meta/classes/externalsrc.bbclass. I will implement this change on the bbclasse and will send it to the list. So have this in separete commit and we can revert when it was fixed.

Hi Ricardo and Jose,
Thanks for review.
I split it to commit 2425bd0afb15ddae5504b8da12a00695db8b5f32.
We need to copy SRC_URI to EXTERNALSRC_ORIG_SRC_URI before qps615_pkgv_suffix called since SRC_URI will be overridden in externalsrc.bbclass for devtool build.

Actually, I have tested a potential fix in oe-core in similar way and it can fix this devtool PKGV issue (commit 459d4c1081d7ee0b589a5303ce14505af707ffce).

After fixing, PV and PKGV for qps615-dlkm are shown as below with devtool build:
PV: 6.0.3+git
PKGV: 6.0.3+git0+2cbd7b9ddf

Thanks,
Paddy

We need to copy SRC_URI to EXTERNALSRC_ORIG_SRC_URI before qps615_pkgv_suffix called since SRC_URI will be overridden in externalsrc.bbclass for devtool build.

Got it

Actually, I have tested a potential fix in oe-core in similar way and it can fix this devtool PKGV issue (commit 459d4c1081d7ee0b589a5303ce14505af707ffce).

Please send it to the oe-core mailing list.

Hi Jose,
Thanks for your suggestion.
I sent the oe-core mailing list for reviewing the oe-core PKGV change.

Best Regards,
Paddy

For reference https://lists.openembedded.org/g/openembedded-core/message/246402.

Thanks

Richard didn't really like this approach; could you reply to him so you can find a better solution?

Jose Quaresma (quaresmajose) · 2026-09-22T13:25:14Z

Please use about 72 chars per line on the commit message.

When using devtool, externalsrc defaults B to a separate work directory, but the driver Makefile is located under drivers/net/ethernet/toshiba/tc956x. Set EXTERNALSRC_BUILD to use the correct directory. Signed-off-by: Paddy Chiu <pohuchiu@qti.qualcomm.com>

externalsrc also removes the Git URI from SRC_URI, causing PKGV to remain 6.0.3+git instead of the normal 6.0.3+git0+<SRCREV>. Align PKGV for devtool builds with regular builds to prevent buildhistory package-version QA failures. Signed-off-by: Paddy Chiu <paddy.chiu@oss.qualcomm.com>

paddy-chiu · 2026-09-29T08:47:45Z

Please use about 72 chars per line on the commit message.

Done. Thanks for comment.

Jose Quaresma (quaresmajose) · 2026-09-29T15:49:56Z

+# so devtool package versions match versions from the regular fetch/build path.
+QPS615_PKGREV = "${@qps615_pkgv_suffix(d)}"
+PKGV = "${@d.getVar('PV') + d.getVar('QPS615_PKGREV') if d.getVar('EXTERNALSRC') else d.getVar('PV')}"
+


Richard didn't really like this approach; could you reply to him so you can find a better solution?

github-actions · 2026-09-30T02:47:29Z

Test run workflow

Test jobs for commit `2425bd0`

qcom-distro_linux-qcom-6.18
Pass: 7 | Fail: 1 | Total: 8

nodistro
Pass: 10 | Fail: 0 | Total: 10

qcom-distro
Pass: 335 | Fail: 9 | Total: 367

test-reporting-app · 2026-09-30T02:47:47Z

Test Results

81 files 436 suites 5h 58m 2s ⏱️
200 tests 183 ✅ 2 💤 15 ❌
2 838 runs 2 794 ✅ 23 💤 21 ❌

For more details on these failures, see this check.

Results for commit 2425bd0.

qcomlnxci · 2026-09-30T03:50:30Z

Test Coral run workflow

Test jobs for commit `2425bd0`

qcomdistro: multimedia image
Pass: 4 | Fail: 0 | Total: 4
qcomdistro: multimedia image-prop
Pass: 29 | Fail: 0 | Others: 3 | Total: 32

paddy-chiu requested review from Anuj Mittal (anujm1), Koen Kooi (koenkooi), Dmitry Baryshkov (lumag), Nicolas Dechesne (ndechesne), Ricardo Salveti (ricardosalveti) and Viswanath Kraleti (vkraleti) as code owners September 15, 2026 11:36

Ricardo Salveti (ricardosalveti) reviewed Sep 15, 2026

View reviewed changes

Comment thread recipes-kernel/qps615-module/qps615-dlkm_git.bb

paddy-chiu force-pushed the master branch 2 times, most recently from 7e18919 to b47acfc Compare September 21, 2026 08:48

Jose Quaresma (quaresmajose) reviewed Sep 21, 2026

View reviewed changes

Comment thread recipes-kernel/qps615-module/qps615-dlkm_git.bb Outdated

paddy-chiu force-pushed the master branch from b47acfc to 213fd36 Compare September 22, 2026 09:40

Paddy Chiu and others added 2 commits September 29, 2026 01:43

paddy-chiu force-pushed the master branch from 213fd36 to 2425bd0 Compare September 29, 2026 08:45

Jose Quaresma (quaresmajose) approved these changes Sep 29, 2026

View reviewed changes

Conversation

paddy-chiu commented Sep 15, 2026

Uh oh!

paddy-chiu commented Sep 15, 2026

Uh oh!

Jose Quaresma (quaresmajose) commented Sep 15, 2026

Uh oh!

Ricardo Salveti (ricardosalveti) Sep 15, 2026

Choose a reason for hiding this comment

Uh oh!

Jose Quaresma (quaresmajose) Sep 16, 2026

Choose a reason for hiding this comment

Uh oh!

paddy-chiu Sep 21, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Jose Quaresma (quaresmajose) Sep 21, 2026

Choose a reason for hiding this comment

Uh oh!

paddy-chiu Sep 22, 2026

Choose a reason for hiding this comment

Uh oh!

Jose Quaresma (quaresmajose) Sep 22, 2026

Choose a reason for hiding this comment

Uh oh!

Jose Quaresma (quaresmajose) Sep 29, 2026

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Jose Quaresma (quaresmajose) commented Sep 22, 2026

Uh oh!

paddy-chiu commented Sep 29, 2026

Uh oh!

Jose Quaresma (quaresmajose) Sep 29, 2026

Choose a reason for hiding this comment

Uh oh!

github-actions Bot commented Sep 30, 2026

Test run workflow

Test jobs for commit 2425bd0

Uh oh!

test-reporting-app Bot commented Sep 30, 2026

Test Results

Uh oh!

qcomlnxci commented Sep 30, 2026

Test Coral run workflow

Test jobs for commit 2425bd0

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

paddy-chiu Sep 21, 2026 •

edited

Loading

Test jobs for commit `2425bd0`

Test jobs for commit `2425bd0`