CaROS/poky
3
1
Fork 0
mirror of https://git.yoctoproject.org/git/poky synced 2026-01-04 16:10:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

cargo: remove True option to getVar calls

Browse Source 
Layer cleanup similar to
https://git.openembedded.org/openembedded-core/commit/?id=26c74fd10614582e177437608908eb43688ab510

(From OE-Core rev: f419d57e9605dc5430df6828c4b618265db1243f)

Signed-off-by: Peter Marko <peter.marko@siemens.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
(cherry picked from commit 9a2ed52473a3e4eb662509824ef8e59520ebdefb)
Signed-off-by: Steve Sakoman <steve@sakoman.com>
This commit is contained in:
Peter Marko 2024-06-25 21:36:45 +02:00 committed by Steve Sakoman
parent 219e85cc07
commit 27448a7af6
2 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
meta/classes-recipe/cargo_common.bbclass
View File

@ -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")

18
meta/classes-recipe/ptest-cargo.bbclass
View File

@ -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('/'))