From c5a5bce25764de55420664b6896fd76ba5d18f45 Mon Sep 17 00:00:00 2001 From: Samuli Piippo Date: Tue, 20 Nov 2018 13:43:51 +0200 Subject: Remove default expansion parameter from getVar getVar defaults to expanding the variable, the second True parameter is unnecessary. Change-Id: Iafaf179c67ffedaba2946c078c1810a80198cf5e Reviewed-by: Mikko Gronoff --- meta-boot2qt-distro/conf/bblayers.conf.boundary.sample | 2 +- meta-boot2qt-distro/conf/bblayers.conf.draak.sample | 2 +- meta-boot2qt-distro/conf/bblayers.conf.emulator.sample | 2 +- meta-boot2qt-distro/conf/bblayers.conf.fsl-imx8.sample | 2 +- meta-boot2qt-distro/conf/bblayers.conf.fsl.sample | 2 +- meta-boot2qt-distro/conf/bblayers.conf.intel.sample | 2 +- meta-boot2qt-distro/conf/bblayers.conf.jetson.sample | 2 +- meta-boot2qt-distro/conf/bblayers.conf.nvidia-tegra.sample | 2 +- meta-boot2qt-distro/conf/bblayers.conf.rcar-gen3.sample | 2 +- meta-boot2qt-distro/conf/bblayers.conf.rpi.sample | 2 +- meta-boot2qt-distro/conf/bblayers.conf.sample | 2 +- meta-boot2qt-distro/conf/bblayers.conf.smx6.sample | 2 +- meta-boot2qt-distro/conf/bblayers.conf.toradex.sample | 2 +- meta-boot2qt-distro/conf/distro/b2qt.conf | 2 +- meta-boot2qt-distro/conf/distro/include/fsl-imx8.inc | 2 +- meta-boot2qt-distro/conf/distro/include/toradex.inc | 2 +- .../nativesdk-packagegroup-b2qt-embedded-toolchain-host.bb | 2 +- .../recipes-qt/images/b2qt-embedded-ci-image.bb | 6 +++--- .../recipes-qt/meta/meta-b2qt-automotive-qbsp.bb | 6 +++--- .../recipes-qt/meta/meta-b2qt-embedded-qbsp.bb | 6 +++--- ...ivesdk-packagegroup-b2qt-embedded-qt5-toolchain-host.bb | 2 +- meta-boot2qt/classes/abi-arch.bbclass | 4 ++-- meta-boot2qt/classes/qbsp.bbclass | 4 ++-- meta-boot2qt/classes/qt5-features.bbclass | 2 +- meta-boot2qt/classes/sdk-sources.bbclass | 14 +++++++------- 25 files changed, 39 insertions(+), 39 deletions(-) diff --git a/meta-boot2qt-distro/conf/bblayers.conf.boundary.sample b/meta-boot2qt-distro/conf/bblayers.conf.boundary.sample index 14d9c0b..c3b405e 100644 --- a/meta-boot2qt-distro/conf/bblayers.conf.boundary.sample +++ b/meta-boot2qt-distro/conf/bblayers.conf.boundary.sample @@ -33,7 +33,7 @@ POKY_BBLAYERS_CONF_VERSION = "2" BBPATH = "${TOPDIR}" BBFILES ?= "" -BSPDIR := "${@os.path.abspath(os.path.dirname(d.getVar('FILE', True)) + '/../..')}" +BSPDIR := "${@os.path.abspath(os.path.dirname(d.getVar('FILE')) + '/../..')}" BBLAYERS ?= " \ ${BSPDIR}/sources/poky/meta \ diff --git a/meta-boot2qt-distro/conf/bblayers.conf.draak.sample b/meta-boot2qt-distro/conf/bblayers.conf.draak.sample index 91e2add..e6b76a5 100644 --- a/meta-boot2qt-distro/conf/bblayers.conf.draak.sample +++ b/meta-boot2qt-distro/conf/bblayers.conf.draak.sample @@ -33,7 +33,7 @@ POKY_BBLAYERS_CONF_VERSION = "2" BBPATH = "${TOPDIR}" BBFILES ?= "" -BSPDIR := "${@os.path.abspath(os.path.dirname(d.getVar('FILE', True)) + '/../..')}" +BSPDIR := "${@os.path.abspath(os.path.dirname(d.getVar('FILE')) + '/../..')}" BBLAYERS ?= " \ ${BSPDIR}/sources/poky/meta \ diff --git a/meta-boot2qt-distro/conf/bblayers.conf.emulator.sample b/meta-boot2qt-distro/conf/bblayers.conf.emulator.sample index bf32887..a544874 100644 --- a/meta-boot2qt-distro/conf/bblayers.conf.emulator.sample +++ b/meta-boot2qt-distro/conf/bblayers.conf.emulator.sample @@ -33,7 +33,7 @@ POKY_BBLAYERS_CONF_VERSION = "2" BBPATH = "${TOPDIR}" BBFILES ?= "" -BSPDIR := "${@os.path.abspath(os.path.dirname(d.getVar('FILE', True)) + '/../..')}" +BSPDIR := "${@os.path.abspath(os.path.dirname(d.getVar('FILE')) + '/../..')}" BBLAYERS ?= " \ ${BSPDIR}/sources/poky/meta \ diff --git a/meta-boot2qt-distro/conf/bblayers.conf.fsl-imx8.sample b/meta-boot2qt-distro/conf/bblayers.conf.fsl-imx8.sample index 504577d..a34189a 100644 --- a/meta-boot2qt-distro/conf/bblayers.conf.fsl-imx8.sample +++ b/meta-boot2qt-distro/conf/bblayers.conf.fsl-imx8.sample @@ -33,7 +33,7 @@ POKY_BBLAYERS_CONF_VERSION = "2" BBPATH = "${TOPDIR}" BBFILES ?= "" -BSPDIR := "${@os.path.abspath(os.path.dirname(d.getVar('FILE', True)) + '/../..')}" +BSPDIR := "${@os.path.abspath(os.path.dirname(d.getVar('FILE')) + '/../..')}" BBLAYERS ?= " \ ${BSPDIR}/sources/poky/meta \ diff --git a/meta-boot2qt-distro/conf/bblayers.conf.fsl.sample b/meta-boot2qt-distro/conf/bblayers.conf.fsl.sample index e6afe33..87aa512 100644 --- a/meta-boot2qt-distro/conf/bblayers.conf.fsl.sample +++ b/meta-boot2qt-distro/conf/bblayers.conf.fsl.sample @@ -33,7 +33,7 @@ POKY_BBLAYERS_CONF_VERSION = "2" BBPATH = "${TOPDIR}" BBFILES ?= "" -BSPDIR := "${@os.path.abspath(os.path.dirname(d.getVar('FILE', True)) + '/../..')}" +BSPDIR := "${@os.path.abspath(os.path.dirname(d.getVar('FILE')) + '/../..')}" BBLAYERS ?= " \ ${BSPDIR}/sources/poky/meta \ diff --git a/meta-boot2qt-distro/conf/bblayers.conf.intel.sample b/meta-boot2qt-distro/conf/bblayers.conf.intel.sample index efe626a..0903d8f 100644 --- a/meta-boot2qt-distro/conf/bblayers.conf.intel.sample +++ b/meta-boot2qt-distro/conf/bblayers.conf.intel.sample @@ -33,7 +33,7 @@ POKY_BBLAYERS_CONF_VERSION = "2" BBPATH = "${TOPDIR}" BBFILES ?= "" -BSPDIR := "${@os.path.abspath(os.path.dirname(d.getVar('FILE', True)) + '/../..')}" +BSPDIR := "${@os.path.abspath(os.path.dirname(d.getVar('FILE')) + '/../..')}" BBLAYERS ?= " \ ${BSPDIR}/sources/poky/meta \ diff --git a/meta-boot2qt-distro/conf/bblayers.conf.jetson.sample b/meta-boot2qt-distro/conf/bblayers.conf.jetson.sample index eccc371..241d330 100644 --- a/meta-boot2qt-distro/conf/bblayers.conf.jetson.sample +++ b/meta-boot2qt-distro/conf/bblayers.conf.jetson.sample @@ -33,7 +33,7 @@ POKY_BBLAYERS_CONF_VERSION = "2" BBPATH = "${TOPDIR}" BBFILES ?= "" -BSPDIR := "${@os.path.abspath(os.path.dirname(d.getVar('FILE', True)) + '/../..')}" +BSPDIR := "${@os.path.abspath(os.path.dirname(d.getVar('FILE')) + '/../..')}" BBLAYERS ?= " \ ${BSPDIR}/sources/poky/meta \ diff --git a/meta-boot2qt-distro/conf/bblayers.conf.nvidia-tegra.sample b/meta-boot2qt-distro/conf/bblayers.conf.nvidia-tegra.sample index d042805..c94805c 100644 --- a/meta-boot2qt-distro/conf/bblayers.conf.nvidia-tegra.sample +++ b/meta-boot2qt-distro/conf/bblayers.conf.nvidia-tegra.sample @@ -33,7 +33,7 @@ POKY_BBLAYERS_CONF_VERSION = "2" BBPATH = "${TOPDIR}" BBFILES ?= "" -BSPDIR := "${@os.path.abspath(os.path.dirname(d.getVar('FILE', True)) + '/../..')}" +BSPDIR := "${@os.path.abspath(os.path.dirname(d.getVar('FILE')) + '/../..')}" BBLAYERS ?= " \ ${BSPDIR}/sources/poky/meta \ diff --git a/meta-boot2qt-distro/conf/bblayers.conf.rcar-gen3.sample b/meta-boot2qt-distro/conf/bblayers.conf.rcar-gen3.sample index 0836f5a..c2abc8e 100644 --- a/meta-boot2qt-distro/conf/bblayers.conf.rcar-gen3.sample +++ b/meta-boot2qt-distro/conf/bblayers.conf.rcar-gen3.sample @@ -33,7 +33,7 @@ POKY_BBLAYERS_CONF_VERSION = "2" BBPATH = "${TOPDIR}" BBFILES ?= "" -BSPDIR := "${@os.path.abspath(os.path.dirname(d.getVar('FILE', True)) + '/../..')}" +BSPDIR := "${@os.path.abspath(os.path.dirname(d.getVar('FILE')) + '/../..')}" BBLAYERS ?= " \ ${BSPDIR}/sources/poky/meta \ diff --git a/meta-boot2qt-distro/conf/bblayers.conf.rpi.sample b/meta-boot2qt-distro/conf/bblayers.conf.rpi.sample index c701d0e..99f144f 100644 --- a/meta-boot2qt-distro/conf/bblayers.conf.rpi.sample +++ b/meta-boot2qt-distro/conf/bblayers.conf.rpi.sample @@ -33,7 +33,7 @@ POKY_BBLAYERS_CONF_VERSION = "2" BBPATH = "${TOPDIR}" BBFILES ?= "" -BSPDIR := "${@os.path.abspath(os.path.dirname(d.getVar('FILE', True)) + '/../..')}" +BSPDIR := "${@os.path.abspath(os.path.dirname(d.getVar('FILE')) + '/../..')}" BBLAYERS ?= " \ ${BSPDIR}/sources/poky/meta \ diff --git a/meta-boot2qt-distro/conf/bblayers.conf.sample b/meta-boot2qt-distro/conf/bblayers.conf.sample index bf32887..a544874 100644 --- a/meta-boot2qt-distro/conf/bblayers.conf.sample +++ b/meta-boot2qt-distro/conf/bblayers.conf.sample @@ -33,7 +33,7 @@ POKY_BBLAYERS_CONF_VERSION = "2" BBPATH = "${TOPDIR}" BBFILES ?= "" -BSPDIR := "${@os.path.abspath(os.path.dirname(d.getVar('FILE', True)) + '/../..')}" +BSPDIR := "${@os.path.abspath(os.path.dirname(d.getVar('FILE')) + '/../..')}" BBLAYERS ?= " \ ${BSPDIR}/sources/poky/meta \ diff --git a/meta-boot2qt-distro/conf/bblayers.conf.smx6.sample b/meta-boot2qt-distro/conf/bblayers.conf.smx6.sample index 5a09ec9..73f6da8 100644 --- a/meta-boot2qt-distro/conf/bblayers.conf.smx6.sample +++ b/meta-boot2qt-distro/conf/bblayers.conf.smx6.sample @@ -33,7 +33,7 @@ POKY_BBLAYERS_CONF_VERSION = "2" BBPATH = "${TOPDIR}" BBFILES ?= "" -BSPDIR := "${@os.path.abspath(os.path.dirname(d.getVar('FILE', True)) + '/../..')}" +BSPDIR := "${@os.path.abspath(os.path.dirname(d.getVar('FILE')) + '/../..')}" BBLAYERS ?= " \ ${BSPDIR}/sources/poky/meta \ diff --git a/meta-boot2qt-distro/conf/bblayers.conf.toradex.sample b/meta-boot2qt-distro/conf/bblayers.conf.toradex.sample index f30ba79..9562c63 100644 --- a/meta-boot2qt-distro/conf/bblayers.conf.toradex.sample +++ b/meta-boot2qt-distro/conf/bblayers.conf.toradex.sample @@ -33,7 +33,7 @@ POKY_BBLAYERS_CONF_VERSION = "2" BBPATH = "${TOPDIR}" BBFILES ?= "" -BSPDIR := "${@os.path.abspath(os.path.dirname(d.getVar('FILE', True)) + '/../..')}" +BSPDIR := "${@os.path.abspath(os.path.dirname(d.getVar('FILE')) + '/../..')}" BBLAYERS ?= " \ ${BSPDIR}/sources/poky/meta \ diff --git a/meta-boot2qt-distro/conf/distro/b2qt.conf b/meta-boot2qt-distro/conf/distro/b2qt.conf index ad091e7..4e3e42f 100644 --- a/meta-boot2qt-distro/conf/distro/b2qt.conf +++ b/meta-boot2qt-distro/conf/distro/b2qt.conf @@ -33,7 +33,7 @@ DISTRO = "b2qt" DISTRO_NAME = "Boot to Qt for Embedded Linux" SDK_VERSION := "${DISTRO_VERSION}" -SDK_MACHINE = "${@d.getVar('SDKMACHINE', True) or '${SDK_ARCH}'}" +SDK_MACHINE = "${@d.getVar('SDKMACHINE') or '${SDK_ARCH}'}" SDK_NAME = "${DISTRO}-${SDK_MACHINE}-${IMAGE_BASENAME}" TOOLCHAIN_OUTPUTNAME = "${SDK_NAME}-${MACHINE}" BUILDCFG_VARS += "SDKMACHINE" diff --git a/meta-boot2qt-distro/conf/distro/include/fsl-imx8.inc b/meta-boot2qt-distro/conf/distro/include/fsl-imx8.inc index 4e4256b..2ad63f5 100644 --- a/meta-boot2qt-distro/conf/distro/include/fsl-imx8.inc +++ b/meta-boot2qt-distro/conf/distro/include/fsl-imx8.inc @@ -61,7 +61,7 @@ BBMASK += "\ meta-fsl-bsp-release/imx/meta-sdk/recipes-qt5/qt5 \ " -KERNEL_MODULE_PACKAGE_SUFFIX ?= "-${@d.getVar('KERNEL_VERSION', True).replace('_','-')}" +KERNEL_MODULE_PACKAGE_SUFFIX ?= "-${@d.getVar('KERNEL_VERSION').replace('_','-')}" EXTRA_OECONF_append_pn-gstreamer1.0-plugins-base = " --disable-introspection" MACHINE_GSTREAMER_1_0_PLUGIN += "imx-gst1.0-plugin" diff --git a/meta-boot2qt-distro/conf/distro/include/toradex.inc b/meta-boot2qt-distro/conf/distro/include/toradex.inc index f61aad7..9a252d0 100644 --- a/meta-boot2qt-distro/conf/distro/include/toradex.inc +++ b/meta-boot2qt-distro/conf/distro/include/toradex.inc @@ -42,7 +42,7 @@ PREFERRED_PROVIDER_u-boot = "u-boot-toradex" WKS_FILE_DEPENDS += "u-boot-script-toradex" -MACHINEDIR = "${@d.getVar('MACHINE', True).replace('-','_')}" +MACHINEDIR = "${@d.getVar('MACHINE').replace('-','_')}" IMAGE_BOOT_FILES += " \ fwd_blk.img;flash_blk.img \ fwd_eth.img;flash_eth.img \ diff --git a/meta-boot2qt-distro/recipes-core/packagegroups/nativesdk-packagegroup-b2qt-embedded-toolchain-host.bb b/meta-boot2qt-distro/recipes-core/packagegroups/nativesdk-packagegroup-b2qt-embedded-toolchain-host.bb index c22a46c..ba3be58 100644 --- a/meta-boot2qt-distro/recipes-core/packagegroups/nativesdk-packagegroup-b2qt-embedded-toolchain-host.bb +++ b/meta-boot2qt-distro/recipes-core/packagegroups/nativesdk-packagegroup-b2qt-embedded-toolchain-host.bb @@ -36,7 +36,7 @@ inherit nativesdk packagegroup MACHINE_EXTRA_INSTALL_SDK_HOST ?= "" python __anonymous() { - overrides = d.getVar("OVERRIDES", True).split(":") + overrides = d.getVar("OVERRIDES").split(":") if "mingw32" not in overrides: d.appendVar("OVERRIDES", ":linux") } diff --git a/meta-boot2qt-distro/recipes-qt/images/b2qt-embedded-ci-image.bb b/meta-boot2qt-distro/recipes-qt/images/b2qt-embedded-ci-image.bb index 1afeb7e..8d63166 100644 --- a/meta-boot2qt-distro/recipes-qt/images/b2qt-embedded-ci-image.bb +++ b/meta-boot2qt-distro/recipes-qt/images/b2qt-embedded-ci-image.bb @@ -55,11 +55,11 @@ python remove_qt_from_rootfs() { import subprocess # remove qtbase and all dependent packages - image_rootfs = d.getVar('IMAGE_ROOTFS', True) - opkg_conf = d.getVar("IPKGCONF_TARGET", True) + image_rootfs = d.getVar('IMAGE_ROOTFS') + opkg_conf = d.getVar("IPKGCONF_TARGET") opkg_cmd = bb.utils.which(os.getenv('PATH'), "opkg") opkg_args = "--volatile-cache -f %s -o %s " % (opkg_conf, image_rootfs) - opkg_args += d.getVar("OPKG_ARGS", True) + opkg_args += d.getVar("OPKG_ARGS") cmd = "%s %s --force-remove --force-removal-of-dependent-packages remove %s" % \ (opkg_cmd, opkg_args, 'qtbase') diff --git a/meta-boot2qt-distro/recipes-qt/meta/meta-b2qt-automotive-qbsp.bb b/meta-boot2qt-distro/recipes-qt/meta/meta-b2qt-automotive-qbsp.bb index f115070..fe2ab16 100644 --- a/meta-boot2qt-distro/recipes-qt/meta/meta-b2qt-automotive-qbsp.bb +++ b/meta-boot2qt-distro/recipes-qt/meta/meta-b2qt-automotive-qbsp.bb @@ -38,11 +38,11 @@ S = "${WORKDIR}" inherit qbsp -PV := "${@d.getVar('PV', True).split('+')[0]}" +PV := "${@d.getVar('PV').split('+')[0]}" -VERSION_SHORT = "${@d.getVar('PV', True).replace('.','')}" +VERSION_SHORT = "${@d.getVar('PV').replace('.','')}" QBSP_NAME = "Automotive ${PV}" -QBSP_MACHINE = "${@d.getVar('MACHINE', True).replace('-','')}" +QBSP_MACHINE = "${@d.getVar('MACHINE').replace('-','')}" QBSP_INSTALLER_COMPONENT = "automotive.${VERSION_SHORT}.yocto.${QBSP_MACHINE}" QBSP_INSTALL_PATH = "/${PV}/Automotive/${MACHINE}" diff --git a/meta-boot2qt-distro/recipes-qt/meta/meta-b2qt-embedded-qbsp.bb b/meta-boot2qt-distro/recipes-qt/meta/meta-b2qt-embedded-qbsp.bb index a599e23..c85d3ba 100644 --- a/meta-boot2qt-distro/recipes-qt/meta/meta-b2qt-embedded-qbsp.bb +++ b/meta-boot2qt-distro/recipes-qt/meta/meta-b2qt-embedded-qbsp.bb @@ -38,11 +38,11 @@ S = "${WORKDIR}" inherit qbsp -PV := "${@d.getVar('PV', True).split('+')[0]}" +PV := "${@d.getVar('PV').split('+')[0]}" -VERSION_SHORT = "${@d.getVar('PV', True).replace('.','')}" +VERSION_SHORT = "${@d.getVar('PV').replace('.','')}" QBSP_NAME = "Boot2Qt ${PV}" -QBSP_MACHINE = "${@d.getVar('MACHINE', True).replace('-','')}" +QBSP_MACHINE = "${@d.getVar('MACHINE').replace('-','')}" QBSP_INSTALLER_COMPONENT = "embedded.b2qt.${VERSION_SHORT}.yocto.${QBSP_MACHINE}" QBSP_INSTALL_PATH = "/${PV}/Boot2Qt/${MACHINE}" diff --git a/meta-boot2qt-distro/recipes-qt/packagegroups/nativesdk-packagegroup-b2qt-embedded-qt5-toolchain-host.bb b/meta-boot2qt-distro/recipes-qt/packagegroups/nativesdk-packagegroup-b2qt-embedded-qt5-toolchain-host.bb index 2adad90..79749fc 100644 --- a/meta-boot2qt-distro/recipes-qt/packagegroups/nativesdk-packagegroup-b2qt-embedded-qt5-toolchain-host.bb +++ b/meta-boot2qt-distro/recipes-qt/packagegroups/nativesdk-packagegroup-b2qt-embedded-qt5-toolchain-host.bb @@ -34,7 +34,7 @@ PR = "r0" inherit nativesdk packagegroup python __anonymous() { - overrides = d.getVar("OVERRIDES", True).split(":") + overrides = d.getVar("OVERRIDES").split(":") if "mingw32" not in overrides: d.appendVar("OVERRIDES", ":linux") } diff --git a/meta-boot2qt/classes/abi-arch.bbclass b/meta-boot2qt/classes/abi-arch.bbclass index 23b9b1c..63f9d1e 100644 --- a/meta-boot2qt/classes/abi-arch.bbclass +++ b/meta-boot2qt/classes/abi-arch.bbclass @@ -33,7 +33,7 @@ valid_archs = "arm x86 itanium mips ppc sh" def map_abi_arch(a, d): import re - valid_archs = d.getVar('valid_archs', True).split() + valid_archs = d.getVar('valid_archs').split() if re.match('i.86$', a): return 'x86' elif re.match('x86.64$', a): return 'x86' @@ -46,4 +46,4 @@ def map_abi_arch(a, d): else: bb.error("cannot map '%s' to a abi architecture" % a) -ABI = "${@map_abi_arch(d.getVar('TARGET_ARCH', True), d)}" +ABI = "${@map_abi_arch(d.getVar('TARGET_ARCH'), d)}" diff --git a/meta-boot2qt/classes/qbsp.bbclass b/meta-boot2qt/classes/qbsp.bbclass index 7c6f7ef..fbfd266 100644 --- a/meta-boot2qt/classes/qbsp.bbclass +++ b/meta-boot2qt/classes/qbsp.bbclass @@ -50,7 +50,7 @@ do_qbsp[depends] += "\ " QBSP_VERSION ?= "${PV}${VERSION_AUTO_INCREMENT}" -QBSP_INSTALLER_COMPONENT ?= "${@d.getVar('MACHINE', True).replace('-','')}" +QBSP_INSTALLER_COMPONENT ?= "${@d.getVar('MACHINE').replace('-','')}" QBSP_INSTALL_PATH ?= "/Extras/${MACHINE}" QBSP_LICENSE_FILE ?= "" @@ -69,7 +69,7 @@ SDK_NAME = "${DISTRO}-${SDK_MACHINE}-${QBSP_SDK_TASK}-${MACHINE}.${SDK_POSTFIX}" SDK_POSTFIX = "sh" SDK_POSTFIX_sdkmingw32 = "7z" REAL_MULTIMACH_TARGET_SYS = "${TUNE_PKGARCH}${TARGET_VENDOR}-${TARGET_OS}" -SDK_MACHINE = "${@d.getVar('SDKMACHINE', True) or '${SDK_ARCH}'}" +SDK_MACHINE = "${@d.getVar('SDKMACHINE') or '${SDK_ARCH}'}" B = "${WORKDIR}/build" diff --git a/meta-boot2qt/classes/qt5-features.bbclass b/meta-boot2qt/classes/qt5-features.bbclass index 89b3ee6..8e90811 100644 --- a/meta-boot2qt/classes/qt5-features.bbclass +++ b/meta-boot2qt/classes/qt5-features.bbclass @@ -31,7 +31,7 @@ FEATURES := "${THISDIR}/features/${QT_MODULE}.opt" do_configure[file-checksums] += "${FEATURES}:True" def qt_features(d): - featurefile = d.getVar('FEATURES', True) + featurefile = d.getVar('FEATURES') with open(featurefile, 'r') as f: features = f.read().replace('\n', ' ') return features diff --git a/meta-boot2qt/classes/sdk-sources.bbclass b/meta-boot2qt/classes/sdk-sources.bbclass index b12f371..10454b4 100644 --- a/meta-boot2qt/classes/sdk-sources.bbclass +++ b/meta-boot2qt/classes/sdk-sources.bbclass @@ -28,11 +28,11 @@ ############################################################################ python do_fetch () { - src_uri = (d.getVar('SRC_URI', True) or "").split() + src_uri = (d.getVar('SRC_URI') or "").split() if len(src_uri) == 0: return - sdk_path = d.getVar('QT_SDK_PATH', True) or "" + sdk_path = d.getVar('QT_SDK_PATH') or "" if len(sdk_path) != 0: uris = list(src_uri); for url in uris: @@ -53,13 +53,13 @@ python do_fetch () { python do_unpack () { sdk_uds = []; - src_uri = (d.getVar('SRC_URI', True) or "").split() + src_uri = (d.getVar('SRC_URI') or "").split() if len(src_uri) == 0: return - rootdir = d.getVar('WORKDIR', True) + rootdir = d.getVar('WORKDIR') - sdk_path = d.getVar('QT_SDK_PATH', True) or "" + sdk_path = d.getVar('QT_SDK_PATH') or "" if len(sdk_path) != 0: uris = list(src_uri); for url in uris: @@ -81,8 +81,8 @@ python do_unpack () { def unpack_local_uri(ud, d): import subprocess - rootdir = d.getVar('WORKDIR', True) - sdk_path = d.getVar('QT_SDK_PATH', True) + rootdir = d.getVar('WORKDIR') + sdk_path = d.getVar('QT_SDK_PATH') destdir = os.path.join(rootdir, ud[5].get("destsuffix", "git")) srcdir = os.path.join(sdk_path, ud[5].get("sdk-uri")) -- cgit v1.2.3-54-g00ecf