qps615-dlkm: fix devtool build directory and package version - #3163
Open
paddy-chiu wants to merge 1 commit into
Open
paddy-chiu wants to merge 1 commit into
paddy-chiu wants to merge 1 commit into
Conversation
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+<SRCREV>. Align PKGV for devtool builds with regular builds to prevent buildhistory package-version QA failures. Signed-off-by: Paddy Chiu <pohuchiu@qti.qualcomm.com>
Author
|
Without EXTERNALSRC_BUILD, we will face "no makefile found" (log.do_compile.326282.txt) when running |
Contributor
|
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. |
| # 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')}" | ||
|
|
Contributor
There was a problem hiding this comment.
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.
|
|
||
| # devtool/externalsrc replaces B with a separate work directory unless the | ||
| # out-of-tree build directory is explicitly provided. | ||
| EXTERNALSRC_BUILD = "${EXTERNALSRC}/drivers/net/ethernet/toshiba/tc956x" |
Contributor
There was a problem hiding this comment.
This part is ok.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
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.