@@ -41,7 +41,7 @@ CARGO_SRC_DIR ??= ""
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_LOCK_PATH ??= "${@ os.path.join(os.path.dirname(d.getVar('CARGO_MANIFEST_PATH')), 'Cargo.lock')}"
CARGO_RUST_TARGET_CCLD ??= "${RUST_TARGET_CCLD}"
cargo_common_do_configure () {
@@ -171,7 +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"
- lockfile = d.getVar("CARGO_LOCK_PATH", True)
+ lockfile = d.getVar("CARGO_LOCK_PATH")
if not os.path.exists(lockfile):
bb.fatal(f"{lockfile} file doesn't exist")
@@ -12,10 +12,10 @@ python do_compile_ptest_cargo() {
import subprocess
import json
- cargo = bb.utils.which(d.getVar("PATH"), d.getVar("CARGO", True))
- cargo_build_flags = d.getVar("CARGO_BUILD_FLAGS", True)
- rust_flags = d.getVar("RUSTFLAGS", True)
- manifest_path = d.getVar("CARGO_MANIFEST_PATH", True)
+ cargo = bb.utils.which(d.getVar("PATH"), d.getVar("CARGO"))
+ cargo_build_flags = d.getVar("CARGO_BUILD_FLAGS")
+ rust_flags = d.getVar("RUSTFLAGS")
+ manifest_path = d.getVar("CARGO_MANIFEST_PATH")
project_manifest_path = os.path.normpath(manifest_path)
manifest_dir = os.path.dirname(manifest_path)
@@ -66,7 +66,7 @@ python do_compile_ptest_cargo() {
if not test_bins:
bb.fatal("Unable to find any test binaries")
- cargo_test_binaries_file = d.getVar('CARGO_TEST_BINARIES_FILES', True)
+ cargo_test_binaries_file = d.getVar('CARGO_TEST_BINARIES_FILES')
bb.note(f"Found {len(test_bins)} tests, write their paths into {cargo_test_binaries_file}")
with open(cargo_test_binaries_file, "w") as f:
for test_bin in test_bins:
@@ -77,10 +77,10 @@ python do_compile_ptest_cargo() {
python do_install_ptest_cargo() {
import shutil
- dest_dir = d.getVar("D", True)
- pn = d.getVar("PN", True)
- ptest_path = d.getVar("PTEST_PATH", True)
- cargo_test_binaries_file = d.getVar('CARGO_TEST_BINARIES_FILES', True)
+ dest_dir = d.getVar("D")
+ pn = d.getVar("PN")
+ ptest_path = d.getVar("PTEST_PATH")
+ cargo_test_binaries_file = d.getVar('CARGO_TEST_BINARIES_FILES')
rust_test_args = d.getVar('RUST_TEST_ARGS') or ""
ptest_dir = os.path.join(dest_dir, ptest_path.lstrip('/'))