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 <[email protected]> --- 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(-) 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" -- 2.25.1
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#209703): https://lists.openembedded.org/g/openembedded-core/message/209703 Mute This Topic: https://lists.openembedded.org/mt/110584109/21656 Group Owner: [email protected] Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [[email protected]] -=-=-=-=-=-=-=-=-=-=-=-
