| Message ID | 20250113091832.82071-1-akash.hadke27@gmail.com |
|---|---|
| State | Not Applicable |
| Delegated to: | Steve Sakoman |
| Headers | show |
| Series | [poky,kirkstone] poky: Remove True option to getVar calls | expand |
Thank you for your submission. Patchtest identified one or more issues with the patch. Please see the log below for more information: --- Testing patch /home/patchtest/share/mboxes/poky-kirkstone-poky-Remove-True-option-to-getVar-calls.patch FAIL: test target mailing list: Series sent to the wrong mailing list or some patches from the series correspond to different mailing lists (test_mbox.TestMbox.test_target_mailing_list) PASS: test Signed-off-by presence (test_mbox.TestMbox.test_signed_off_by_presence) PASS: test author valid (test_mbox.TestMbox.test_author_valid) PASS: test commit message presence (test_mbox.TestMbox.test_commit_message_presence) PASS: test commit message user tags (test_mbox.TestMbox.test_commit_message_user_tags) PASS: test max line length (test_metadata.TestMetadata.test_max_line_length) PASS: test mbox format (test_mbox.TestMbox.test_mbox_format) PASS: test non-AUH upgrade (test_mbox.TestMbox.test_non_auh_upgrade) PASS: test shortlog format (test_mbox.TestMbox.test_shortlog_format) PASS: test shortlog length (test_mbox.TestMbox.test_shortlog_length) SKIP: pretest pylint: No python related patches, skipping test (test_python_pylint.PyLint.pretest_pylint) SKIP: pretest src uri left files: No modified recipes, skipping pretest (test_metadata.TestMetadata.pretest_src_uri_left_files) SKIP: test CVE check ignore: No modified recipes or older target branch, skipping test (test_metadata.TestMetadata.test_cve_check_ignore) SKIP: test CVE tag format: No new CVE patches introduced (test_patch.TestPatch.test_cve_tag_format) SKIP: test Signed-off-by presence: No new CVE patches introduced (test_patch.TestPatch.test_signed_off_by_presence) SKIP: test Upstream-Status presence: No new CVE patches introduced (test_patch.TestPatch.test_upstream_status_presence_format) SKIP: test bugzilla entry format: No bug ID found (test_mbox.TestMbox.test_bugzilla_entry_format) SKIP: test lic files chksum modified not mentioned: No modified recipes, skipping test (test_metadata.TestMetadata.test_lic_files_chksum_modified_not_mentioned) SKIP: test lic files chksum presence: No added recipes, skipping test (test_metadata.TestMetadata.test_lic_files_chksum_presence) SKIP: test license presence: No added recipes, skipping test (test_metadata.TestMetadata.test_license_presence) SKIP: test pylint: No python related patches, skipping test (test_python_pylint.PyLint.test_pylint) SKIP: test series merge on head: Merge test is disabled for now (test_mbox.TestMbox.test_series_merge_on_head) SKIP: test src uri left files: No modified recipes, skipping pretest (test_metadata.TestMetadata.test_src_uri_left_files) SKIP: test summary presence: No added recipes, skipping test (test_metadata.TestMetadata.test_summary_presence) --- Please address the issues identified and submit a new revision of the patch, or alternatively, reply to this email with an explanation of why the patch should be accepted. If you believe these results are due to an error in patchtest, please submit a bug at https://bugzilla.yoctoproject.org/ (use the 'Patchtest' category under 'Yocto Project Subprojects'). For more information on specific failures, see: https://wiki.yoctoproject.org/wiki/Patchtest. Thank you!
diff --git a/meta-poky/classes/poky-sanity.bbclass b/meta-poky/classes/poky-sanity.bbclass index 81cd2eb6a6..a068c7368c 100644 --- a/meta-poky/classes/poky-sanity.bbclass +++ b/meta-poky/classes/poky-sanity.bbclass @@ -1,8 +1,8 @@ # Provide some extensions to sanity.bbclass to handle poky-specific conf file upgrades python poky_update_bblayersconf() { - current_version = int(d.getVar('POKY_BBLAYERS_CONF_VERSION', True) or -1) - latest_version = int(d.getVar('REQUIRED_POKY_BBLAYERS_CONF_VERSION', True) or -1) + current_version = int(d.getVar('POKY_BBLAYERS_CONF_VERSION') or -1) + latest_version = int(d.getVar('REQUIRED_POKY_BBLAYERS_CONF_VERSION') or -1) if current_version == -1 or latest_version == -1: # one or the other missing => malformed configuration raise NotImplementedError("You need to update bblayers.conf manually for this version transition") @@ -11,7 +11,7 @@ python poky_update_bblayersconf() { # check for out of date templateconf.cfg file lines = [] - fn = os.path.join(d.getVar('TOPDIR', True), 'conf/templateconf.cfg') + fn = os.path.join(d.getVar('TOPDIR'), 'conf/templateconf.cfg') lines = sanity_conf_read(fn) index, meta_yocto_line = sanity_conf_find_line(r'^meta-yocto/', lines) diff --git a/meta/classes/rust-bin.bbclass b/meta/classes/rust-bin.bbclass index c87343b3cf..360885cb8b 100644 --- a/meta/classes/rust-bin.bbclass +++ b/meta/classes/rust-bin.bbclass @@ -49,14 +49,14 @@ def relative_rpaths(paths, base): relpaths.add(os.path.join('$ORIGIN', os.path.relpath(p, base))) return '-rpath=' + ':'.join(relpaths) if len(relpaths) else '' -RUST_LIB_RPATH_FLAGS ?= "${@relative_rpaths(d.getVar('RUST_RPATH_ABS', True), d.getVar('rustlibdest', True))}" -RUST_BIN_RPATH_FLAGS ?= "${@relative_rpaths(d.getVar('RUST_RPATH_ABS', True), d.getVar('rustbindest', True))}" +RUST_LIB_RPATH_FLAGS ?= "${@relative_rpaths(d.getVar('RUST_RPATH_ABS'), d.getVar('rustlibdest'))}" +RUST_BIN_RPATH_FLAGS ?= "${@relative_rpaths(d.getVar('RUST_RPATH_ABS'), d.getVar('rustbindest'))}" def libfilename(d): - if d.getVar('CRATE_TYPE', True) == 'dylib': - return d.getVar('LIBNAME', True) + '.so' + if d.getVar('CRATE_TYPE') == 'dylib': + return d.getVar('LIBNAME') + '.so' else: - return d.getVar('LIBNAME', True) + '.rlib' + return d.getVar('LIBNAME') + '.rlib' def link_args(d, bin): linkargs = [] @@ -64,7 +64,7 @@ def link_args(d, bin): rpaths = d.getVar('RUST_BIN_RPATH_FLAGS', False) else: rpaths = d.getVar('RUST_LIB_RPATH_FLAGS', False) - if d.getVar('CRATE_TYPE', True) == 'dylib': + if d.getVar('CRATE_TYPE') == 'dylib': linkargs.append('-soname') linkargs.append(libfilename(d)) if len(rpaths): diff --git a/meta/recipes-devtools/rust/rust-cross-canadian-common.inc b/meta/recipes-devtools/rust/rust-cross-canadian-common.inc index df4901f1fa..00dab306cb 100644 --- a/meta/recipes-devtools/rust/rust-cross-canadian-common.inc +++ b/meta/recipes-devtools/rust/rust-cross-canadian-common.inc @@ -42,8 +42,8 @@ export WRAPPER_TARGET_LDFLAGS = "${TARGET_LDFLAGS}" export WRAPPER_TARGET_AR = "${TARGET_PREFIX}ar" python do_configure:prepend() { - targets = [d.getVar("TARGET_SYS", True), "{}-unknown-linux-gnu".format(d.getVar("HOST_ARCH", True))] - hosts = ["{}-unknown-linux-gnu".format(d.getVar("HOST_ARCH", True))] + targets = [d.getVar("TARGET_SYS"), "{}-unknown-linux-gnu".format(d.getVar("HOST_ARCH"))] + hosts = ["{}-unknown-linux-gnu".format(d.getVar("HOST_ARCH"))] } INSANE_SKIP:${RUSTLIB_TARGET_PN} = "file-rdeps arch ldflags"
getVar() now defaults to expanding by default, thus remove the True option from getVar() calls with a regex search and replace. Signed-off-by: Akash Hadke <akash.hadke27@gmail.com> --- meta-poky/classes/poky-sanity.bbclass | 6 +++--- meta/classes/rust-bin.bbclass | 12 ++++++------ .../rust/rust-cross-canadian-common.inc | 4 ++-- 3 files changed, 11 insertions(+), 11 deletions(-)