From 7afa4f50b49dd3eed809b2e66ca18cc86835c534 Mon Sep 17 00:00:00 2001 From: Peter Marko Date: Tue, 25 Jun 2024 21:36:45 +0200 Subject: cargo: remove True option to getVar calls Layer cleanup similar to https://git.openembedded.org/openembedded-core/commit/?id=26c74fd10614582e177437608908eb43688ab510 (From OE-Core rev: 9a2ed52473a3e4eb662509824ef8e59520ebdefb) Signed-off-by: Peter Marko Signed-off-by: Richard Purdie --- meta/classes-recipe/ptest-cargo.bbclass | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) (limited to 'meta/classes-recipe/ptest-cargo.bbclass') diff --git a/meta/classes-recipe/ptest-cargo.bbclass b/meta/classes-recipe/ptest-cargo.bbclass index c46df362bf..fd1df9d7c9 100644 --- a/meta/classes-recipe/ptest-cargo.bbclass +++ b/meta/classes-recipe/ptest-cargo.bbclass @@ -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('/')) -- cgit v1.2.3-54-g00ecf