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-oe/recipes-devtools/nodejs/nodejs_16.20.2.bb | 2 +- .../suitesparse/suitesparse_5.10.1.bb | 12 ++++++------ meta-oe/recipes-kernel/spidev-test/spidev-test.bb | 2 +- meta-oe/recipes-kernel/usbip-tools/usbip-tools.bb | 2 +- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/meta-oe/recipes-devtools/nodejs/nodejs_16.20.2.bb b/meta-oe/recipes-devtools/nodejs/nodejs_16.20.2.bb index 95b36c926d..ca5deda99e 100644 --- a/meta-oe/recipes-devtools/nodejs/nodejs_16.20.2.bb +++ b/meta-oe/recipes-devtools/nodejs/nodejs_16.20.2.bb @@ -120,7 +120,7 @@ python do_create_v8_qemu_wrapper () { on the host.""" qemu_libdirs = [d.expand('${STAGING_DIR_HOST}${libdir}'), d.expand('${STAGING_DIR_HOST}${base_libdir}')] - qemu_cmd = qemu_wrapper_cmdline(d, d.getVar('STAGING_DIR_HOST', True), + qemu_cmd = qemu_wrapper_cmdline(d, d.getVar('STAGING_DIR_HOST'), qemu_libdirs) wrapper_path = d.expand('${B}/v8-qemu-wrapper.sh') with open(wrapper_path, 'w') as wrapper_file: diff --git a/meta-oe/recipes-devtools/suitesparse/suitesparse_5.10.1.bb b/meta-oe/recipes-devtools/suitesparse/suitesparse_5.10.1.bb index 56cbfce20e..13e6fd066c 100644 --- a/meta-oe/recipes-devtools/suitesparse/suitesparse_5.10.1.bb +++ b/meta-oe/recipes-devtools/suitesparse/suitesparse_5.10.1.bb @@ -19,14 +19,14 @@ RPROVIDES:${PN} = "mongoose graphblas" # the command line. To get around this problem, set these variables to only the # program name and prepend the rest of the value onto the corresponding FLAGS # variable. -CFLAGS:prepend := "${@" ".join(d.getVar('CC', True).split()[1:])} " -export CC := "${@d.getVar('CC', True).split()[0]}" +CFLAGS:prepend := "${@" ".join(d.getVar('CC').split()[1:])} " +export CC := "${@d.getVar('CC').split()[0]}" -CXXFLAGS:prepend := "${@" ".join(d.getVar('CXX', True).split()[1:])} " -export CXX := "${@d.getVar('CXX', True).split()[0]}" +CXXFLAGS:prepend := "${@" ".join(d.getVar('CXX').split()[1:])} " +export CXX := "${@d.getVar('CXX').split()[0]}" -LDFLAGS:prepend := "${@" ".join(d.getVar('LD', True).split()[1:])} " -export LD := "${@d.getVar('LD', True).split()[0]}" +LDFLAGS:prepend := "${@" ".join(d.getVar('LD').split()[1:])} " +export LD := "${@d.getVar('LD').split()[0]}" export CMAKE_OPTIONS = " \ -DCMAKE_INSTALL_PREFIX=${D}${prefix} \ diff --git a/meta-oe/recipes-kernel/spidev-test/spidev-test.bb b/meta-oe/recipes-kernel/spidev-test/spidev-test.bb index 81e8327032..2e8c5cbb8d 100644 --- a/meta-oe/recipes-kernel/spidev-test/spidev-test.bb +++ b/meta-oe/recipes-kernel/spidev-test/spidev-test.bb @@ -23,7 +23,7 @@ do_install() { PACKAGE_ARCH = "${MACHINE_ARCH}" python do_package:prepend() { - d.setVar('PKGV', d.getVar("KERNEL_VERSION", True).split("-")[0]) + d.setVar('PKGV', d.getVar("KERNEL_VERSION").split("-")[0]) } B = "${WORKDIR}/${BPN}-${PV}" diff --git a/meta-oe/recipes-kernel/usbip-tools/usbip-tools.bb b/meta-oe/recipes-kernel/usbip-tools/usbip-tools.bb index 47938969bb..e7e4ca50af 100644 --- a/meta-oe/recipes-kernel/usbip-tools/usbip-tools.bb +++ b/meta-oe/recipes-kernel/usbip-tools/usbip-tools.bb @@ -65,5 +65,5 @@ PACKAGE_ARCH = "${MACHINE_ARCH}" # Even though the libusbip is set to version 0.0.1, set the package version to match kernel # e.g. usbip-tools-5.14.21-r0.qemux86_64.rpm for qemu package using kernel 5.14.21 python do_package:prepend() { - d.setVar('PKGV', d.getVar("KERNEL_VERSION", True).split("-")[0]) + d.setVar('PKGV', d.getVar("KERNEL_VERSION").split("-")[0]) } \ No newline at end of file -- 2.25.1
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#114766): https://lists.openembedded.org/g/openembedded-devel/message/114766 Mute This Topic: https://lists.openembedded.org/mt/110532939/21656 Group Owner: [email protected] Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub [[email protected]] -=-=-=-=-=-=-=-=-=-=-=-
