When building a workspace enabled project, the Cargo.lock is found at
the root of the project, not alongside the Cargo.toml. Expose
CARGO_LOCK_PATH so it can be explicitly configured.
Signed-off-by: Alex Kiernan <alex.kier...@gmail.com>
---
Changes in v2:
- Change CARGO_LOCK_PATH to a weak-default
meta/classes-recipe/cargo_common.bbclass | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/meta/classes-recipe/cargo_common.bbclass
b/meta/classes-recipe/cargo_common.bbclass
index 48cdd69bca13..0fb443edbdde 100644
--- a/meta/classes-recipe/cargo_common.bbclass
+++ b/meta/classes-recipe/cargo_common.bbclass
@@ -40,6 +40,9 @@ CARGO_SRC_DIR ??= ""
# The actual path to the Cargo.toml
CARGO_MANIFEST_PATH ??= "${S}/${CARGO_SRC_DIR}/Cargo.toml"
+# Path to Cargo.lock
+CARGO_LOCK_PATH ??= "${@
os.path.join(os.path.dirname(d.getVar('CARGO_MANIFEST_PATH', True)),
'Cargo.lock')}"
+
CARGO_RUST_TARGET_CCLD ??= "${RUST_TARGET_CCLD}"
cargo_common_do_configure () {
mkdir -p ${CARGO_HOME}/bitbake
@@ -168,8 +171,7 @@ python cargo_common_do_patch_paths() {
# here is better than letting cargo tell (in case the file is missing)
# "Cargo.lock should be modified but --frozen was given"
- manifest_path = d.getVar("CARGO_MANIFEST_PATH", True)
- lockfile = os.path.join(os.path.dirname(manifest_path), "Cargo.lock")
+ lockfile = d.getVar("CARGO_LOCK_PATH", True)
if not os.path.exists(lockfile):
bb.fatal(f"{lockfile} file doesn't exist")
--
2.39.0
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#192050):
https://lists.openembedded.org/g/openembedded-core/message/192050
Mute This Topic: https://lists.openembedded.org/mt/103053307/21656
Group Owner: openembedded-core+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
