diff options
author | Samuli Piippo <samuli.piippo@qt.io> | 2018-11-20 13:43:51 +0200 |
---|---|---|
committer | Samuli Piippo <samuli.piippo@qt.io> | 2018-11-21 11:43:18 +0000 |
commit | c5a5bce25764de55420664b6896fd76ba5d18f45 (patch) | |
tree | 37946f9fcb4cf9dc9f09e0f693cb2b95a1c1f775 | |
parent | 41105c273d58293be70f23d8e0ac24f41042d3f0 (diff) | |
download | meta-boot2qt-c5a5bce25764de55420664b6896fd76ba5d18f45.tar.gz |
Remove default expansion parameter from getVarv5.12.0-rc
getVar defaults to expanding the variable, the second True
parameter is unnecessary.
Change-Id: Iafaf179c67ffedaba2946c078c1810a80198cf5e
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
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" | |||
33 | 33 | ||
34 | BBPATH = "${TOPDIR}" | 34 | BBPATH = "${TOPDIR}" |
35 | BBFILES ?= "" | 35 | BBFILES ?= "" |
36 | BSPDIR := "${@os.path.abspath(os.path.dirname(d.getVar('FILE', True)) + '/../..')}" | 36 | BSPDIR := "${@os.path.abspath(os.path.dirname(d.getVar('FILE')) + '/../..')}" |
37 | 37 | ||
38 | BBLAYERS ?= " \ | 38 | BBLAYERS ?= " \ |
39 | ${BSPDIR}/sources/poky/meta \ | 39 | ${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" | |||
33 | 33 | ||
34 | BBPATH = "${TOPDIR}" | 34 | BBPATH = "${TOPDIR}" |
35 | BBFILES ?= "" | 35 | BBFILES ?= "" |
36 | BSPDIR := "${@os.path.abspath(os.path.dirname(d.getVar('FILE', True)) + '/../..')}" | 36 | BSPDIR := "${@os.path.abspath(os.path.dirname(d.getVar('FILE')) + '/../..')}" |
37 | 37 | ||
38 | BBLAYERS ?= " \ | 38 | BBLAYERS ?= " \ |
39 | ${BSPDIR}/sources/poky/meta \ | 39 | ${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" | |||
33 | 33 | ||
34 | BBPATH = "${TOPDIR}" | 34 | BBPATH = "${TOPDIR}" |
35 | BBFILES ?= "" | 35 | BBFILES ?= "" |
36 | BSPDIR := "${@os.path.abspath(os.path.dirname(d.getVar('FILE', True)) + '/../..')}" | 36 | BSPDIR := "${@os.path.abspath(os.path.dirname(d.getVar('FILE')) + '/../..')}" |
37 | 37 | ||
38 | BBLAYERS ?= " \ | 38 | BBLAYERS ?= " \ |
39 | ${BSPDIR}/sources/poky/meta \ | 39 | ${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" | |||
33 | 33 | ||
34 | BBPATH = "${TOPDIR}" | 34 | BBPATH = "${TOPDIR}" |
35 | BBFILES ?= "" | 35 | BBFILES ?= "" |
36 | BSPDIR := "${@os.path.abspath(os.path.dirname(d.getVar('FILE', True)) + '/../..')}" | 36 | BSPDIR := "${@os.path.abspath(os.path.dirname(d.getVar('FILE')) + '/../..')}" |
37 | 37 | ||
38 | BBLAYERS ?= " \ | 38 | BBLAYERS ?= " \ |
39 | ${BSPDIR}/sources/poky/meta \ | 39 | ${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" | |||
33 | 33 | ||
34 | BBPATH = "${TOPDIR}" | 34 | BBPATH = "${TOPDIR}" |
35 | BBFILES ?= "" | 35 | BBFILES ?= "" |
36 | BSPDIR := "${@os.path.abspath(os.path.dirname(d.getVar('FILE', True)) + '/../..')}" | 36 | BSPDIR := "${@os.path.abspath(os.path.dirname(d.getVar('FILE')) + '/../..')}" |
37 | 37 | ||
38 | BBLAYERS ?= " \ | 38 | BBLAYERS ?= " \ |
39 | ${BSPDIR}/sources/poky/meta \ | 39 | ${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" | |||
33 | 33 | ||
34 | BBPATH = "${TOPDIR}" | 34 | BBPATH = "${TOPDIR}" |
35 | BBFILES ?= "" | 35 | BBFILES ?= "" |
36 | BSPDIR := "${@os.path.abspath(os.path.dirname(d.getVar('FILE', True)) + '/../..')}" | 36 | BSPDIR := "${@os.path.abspath(os.path.dirname(d.getVar('FILE')) + '/../..')}" |
37 | 37 | ||
38 | BBLAYERS ?= " \ | 38 | BBLAYERS ?= " \ |
39 | ${BSPDIR}/sources/poky/meta \ | 39 | ${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" | |||
33 | 33 | ||
34 | BBPATH = "${TOPDIR}" | 34 | BBPATH = "${TOPDIR}" |
35 | BBFILES ?= "" | 35 | BBFILES ?= "" |
36 | BSPDIR := "${@os.path.abspath(os.path.dirname(d.getVar('FILE', True)) + '/../..')}" | 36 | BSPDIR := "${@os.path.abspath(os.path.dirname(d.getVar('FILE')) + '/../..')}" |
37 | 37 | ||
38 | BBLAYERS ?= " \ | 38 | BBLAYERS ?= " \ |
39 | ${BSPDIR}/sources/poky/meta \ | 39 | ${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" | |||
33 | 33 | ||
34 | BBPATH = "${TOPDIR}" | 34 | BBPATH = "${TOPDIR}" |
35 | BBFILES ?= "" | 35 | BBFILES ?= "" |
36 | BSPDIR := "${@os.path.abspath(os.path.dirname(d.getVar('FILE', True)) + '/../..')}" | 36 | BSPDIR := "${@os.path.abspath(os.path.dirname(d.getVar('FILE')) + '/../..')}" |
37 | 37 | ||
38 | BBLAYERS ?= " \ | 38 | BBLAYERS ?= " \ |
39 | ${BSPDIR}/sources/poky/meta \ | 39 | ${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" | |||
33 | 33 | ||
34 | BBPATH = "${TOPDIR}" | 34 | BBPATH = "${TOPDIR}" |
35 | BBFILES ?= "" | 35 | BBFILES ?= "" |
36 | BSPDIR := "${@os.path.abspath(os.path.dirname(d.getVar('FILE', True)) + '/../..')}" | 36 | BSPDIR := "${@os.path.abspath(os.path.dirname(d.getVar('FILE')) + '/../..')}" |
37 | 37 | ||
38 | BBLAYERS ?= " \ | 38 | BBLAYERS ?= " \ |
39 | ${BSPDIR}/sources/poky/meta \ | 39 | ${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" | |||
33 | 33 | ||
34 | BBPATH = "${TOPDIR}" | 34 | BBPATH = "${TOPDIR}" |
35 | BBFILES ?= "" | 35 | BBFILES ?= "" |
36 | BSPDIR := "${@os.path.abspath(os.path.dirname(d.getVar('FILE', True)) + '/../..')}" | 36 | BSPDIR := "${@os.path.abspath(os.path.dirname(d.getVar('FILE')) + '/../..')}" |
37 | 37 | ||
38 | BBLAYERS ?= " \ | 38 | BBLAYERS ?= " \ |
39 | ${BSPDIR}/sources/poky/meta \ | 39 | ${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" | |||
33 | 33 | ||
34 | BBPATH = "${TOPDIR}" | 34 | BBPATH = "${TOPDIR}" |
35 | BBFILES ?= "" | 35 | BBFILES ?= "" |
36 | BSPDIR := "${@os.path.abspath(os.path.dirname(d.getVar('FILE', True)) + '/../..')}" | 36 | BSPDIR := "${@os.path.abspath(os.path.dirname(d.getVar('FILE')) + '/../..')}" |
37 | 37 | ||
38 | BBLAYERS ?= " \ | 38 | BBLAYERS ?= " \ |
39 | ${BSPDIR}/sources/poky/meta \ | 39 | ${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" | |||
33 | 33 | ||
34 | BBPATH = "${TOPDIR}" | 34 | BBPATH = "${TOPDIR}" |
35 | BBFILES ?= "" | 35 | BBFILES ?= "" |
36 | BSPDIR := "${@os.path.abspath(os.path.dirname(d.getVar('FILE', True)) + '/../..')}" | 36 | BSPDIR := "${@os.path.abspath(os.path.dirname(d.getVar('FILE')) + '/../..')}" |
37 | 37 | ||
38 | BBLAYERS ?= " \ | 38 | BBLAYERS ?= " \ |
39 | ${BSPDIR}/sources/poky/meta \ | 39 | ${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" | |||
33 | 33 | ||
34 | BBPATH = "${TOPDIR}" | 34 | BBPATH = "${TOPDIR}" |
35 | BBFILES ?= "" | 35 | BBFILES ?= "" |
36 | BSPDIR := "${@os.path.abspath(os.path.dirname(d.getVar('FILE', True)) + '/../..')}" | 36 | BSPDIR := "${@os.path.abspath(os.path.dirname(d.getVar('FILE')) + '/../..')}" |
37 | 37 | ||
38 | BBLAYERS ?= " \ | 38 | BBLAYERS ?= " \ |
39 | ${BSPDIR}/sources/poky/meta \ | 39 | ${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" | |||
33 | DISTRO_NAME = "Boot to Qt for Embedded Linux" | 33 | DISTRO_NAME = "Boot to Qt for Embedded Linux" |
34 | SDK_VERSION := "${DISTRO_VERSION}" | 34 | SDK_VERSION := "${DISTRO_VERSION}" |
35 | 35 | ||
36 | SDK_MACHINE = "${@d.getVar('SDKMACHINE', True) or '${SDK_ARCH}'}" | 36 | SDK_MACHINE = "${@d.getVar('SDKMACHINE') or '${SDK_ARCH}'}" |
37 | SDK_NAME = "${DISTRO}-${SDK_MACHINE}-${IMAGE_BASENAME}" | 37 | SDK_NAME = "${DISTRO}-${SDK_MACHINE}-${IMAGE_BASENAME}" |
38 | TOOLCHAIN_OUTPUTNAME = "${SDK_NAME}-${MACHINE}" | 38 | TOOLCHAIN_OUTPUTNAME = "${SDK_NAME}-${MACHINE}" |
39 | BUILDCFG_VARS += "SDKMACHINE" | 39 | 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 += "\ | |||
61 | meta-fsl-bsp-release/imx/meta-sdk/recipes-qt5/qt5 \ | 61 | meta-fsl-bsp-release/imx/meta-sdk/recipes-qt5/qt5 \ |
62 | " | 62 | " |
63 | 63 | ||
64 | KERNEL_MODULE_PACKAGE_SUFFIX ?= "-${@d.getVar('KERNEL_VERSION', True).replace('_','-')}" | 64 | KERNEL_MODULE_PACKAGE_SUFFIX ?= "-${@d.getVar('KERNEL_VERSION').replace('_','-')}" |
65 | EXTRA_OECONF_append_pn-gstreamer1.0-plugins-base = " --disable-introspection" | 65 | EXTRA_OECONF_append_pn-gstreamer1.0-plugins-base = " --disable-introspection" |
66 | 66 | ||
67 | MACHINE_GSTREAMER_1_0_PLUGIN += "imx-gst1.0-plugin" | 67 | 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" | |||
42 | 42 | ||
43 | WKS_FILE_DEPENDS += "u-boot-script-toradex" | 43 | WKS_FILE_DEPENDS += "u-boot-script-toradex" |
44 | 44 | ||
45 | MACHINEDIR = "${@d.getVar('MACHINE', True).replace('-','_')}" | 45 | MACHINEDIR = "${@d.getVar('MACHINE').replace('-','_')}" |
46 | IMAGE_BOOT_FILES += " \ | 46 | IMAGE_BOOT_FILES += " \ |
47 | fwd_blk.img;flash_blk.img \ | 47 | fwd_blk.img;flash_blk.img \ |
48 | fwd_eth.img;flash_eth.img \ | 48 | 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 | |||
36 | MACHINE_EXTRA_INSTALL_SDK_HOST ?= "" | 36 | MACHINE_EXTRA_INSTALL_SDK_HOST ?= "" |
37 | 37 | ||
38 | python __anonymous() { | 38 | python __anonymous() { |
39 | overrides = d.getVar("OVERRIDES", True).split(":") | 39 | overrides = d.getVar("OVERRIDES").split(":") |
40 | if "mingw32" not in overrides: | 40 | if "mingw32" not in overrides: |
41 | d.appendVar("OVERRIDES", ":linux") | 41 | d.appendVar("OVERRIDES", ":linux") |
42 | } | 42 | } |
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() { | |||
55 | import subprocess | 55 | import subprocess |
56 | 56 | ||
57 | # remove qtbase and all dependent packages | 57 | # remove qtbase and all dependent packages |
58 | image_rootfs = d.getVar('IMAGE_ROOTFS', True) | 58 | image_rootfs = d.getVar('IMAGE_ROOTFS') |
59 | opkg_conf = d.getVar("IPKGCONF_TARGET", True) | 59 | opkg_conf = d.getVar("IPKGCONF_TARGET") |
60 | opkg_cmd = bb.utils.which(os.getenv('PATH'), "opkg") | 60 | opkg_cmd = bb.utils.which(os.getenv('PATH'), "opkg") |
61 | opkg_args = "--volatile-cache -f %s -o %s " % (opkg_conf, image_rootfs) | 61 | opkg_args = "--volatile-cache -f %s -o %s " % (opkg_conf, image_rootfs) |
62 | opkg_args += d.getVar("OPKG_ARGS", True) | 62 | opkg_args += d.getVar("OPKG_ARGS") |
63 | 63 | ||
64 | cmd = "%s %s --force-remove --force-removal-of-dependent-packages remove %s" % \ | 64 | cmd = "%s %s --force-remove --force-removal-of-dependent-packages remove %s" % \ |
65 | (opkg_cmd, opkg_args, 'qtbase') | 65 | (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}" | |||
38 | 38 | ||
39 | inherit qbsp | 39 | inherit qbsp |
40 | 40 | ||
41 | PV := "${@d.getVar('PV', True).split('+')[0]}" | 41 | PV := "${@d.getVar('PV').split('+')[0]}" |
42 | 42 | ||
43 | VERSION_SHORT = "${@d.getVar('PV', True).replace('.','')}" | 43 | VERSION_SHORT = "${@d.getVar('PV').replace('.','')}" |
44 | QBSP_NAME = "Automotive ${PV}" | 44 | QBSP_NAME = "Automotive ${PV}" |
45 | QBSP_MACHINE = "${@d.getVar('MACHINE', True).replace('-','')}" | 45 | QBSP_MACHINE = "${@d.getVar('MACHINE').replace('-','')}" |
46 | QBSP_INSTALLER_COMPONENT = "automotive.${VERSION_SHORT}.yocto.${QBSP_MACHINE}" | 46 | QBSP_INSTALLER_COMPONENT = "automotive.${VERSION_SHORT}.yocto.${QBSP_MACHINE}" |
47 | QBSP_INSTALL_PATH = "/${PV}/Automotive/${MACHINE}" | 47 | QBSP_INSTALL_PATH = "/${PV}/Automotive/${MACHINE}" |
48 | 48 | ||
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}" | |||
38 | 38 | ||
39 | inherit qbsp | 39 | inherit qbsp |
40 | 40 | ||
41 | PV := "${@d.getVar('PV', True).split('+')[0]}" | 41 | PV := "${@d.getVar('PV').split('+')[0]}" |
42 | 42 | ||
43 | VERSION_SHORT = "${@d.getVar('PV', True).replace('.','')}" | 43 | VERSION_SHORT = "${@d.getVar('PV').replace('.','')}" |
44 | QBSP_NAME = "Boot2Qt ${PV}" | 44 | QBSP_NAME = "Boot2Qt ${PV}" |
45 | QBSP_MACHINE = "${@d.getVar('MACHINE', True).replace('-','')}" | 45 | QBSP_MACHINE = "${@d.getVar('MACHINE').replace('-','')}" |
46 | QBSP_INSTALLER_COMPONENT = "embedded.b2qt.${VERSION_SHORT}.yocto.${QBSP_MACHINE}" | 46 | QBSP_INSTALLER_COMPONENT = "embedded.b2qt.${VERSION_SHORT}.yocto.${QBSP_MACHINE}" |
47 | QBSP_INSTALL_PATH = "/${PV}/Boot2Qt/${MACHINE}" | 47 | QBSP_INSTALL_PATH = "/${PV}/Boot2Qt/${MACHINE}" |
48 | 48 | ||
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" | |||
34 | inherit nativesdk packagegroup | 34 | inherit nativesdk packagegroup |
35 | 35 | ||
36 | python __anonymous() { | 36 | python __anonymous() { |
37 | overrides = d.getVar("OVERRIDES", True).split(":") | 37 | overrides = d.getVar("OVERRIDES").split(":") |
38 | if "mingw32" not in overrides: | 38 | if "mingw32" not in overrides: |
39 | d.appendVar("OVERRIDES", ":linux") | 39 | d.appendVar("OVERRIDES", ":linux") |
40 | } | 40 | } |
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" | |||
33 | def map_abi_arch(a, d): | 33 | def map_abi_arch(a, d): |
34 | import re | 34 | import re |
35 | 35 | ||
36 | valid_archs = d.getVar('valid_archs', True).split() | 36 | valid_archs = d.getVar('valid_archs').split() |
37 | 37 | ||
38 | if re.match('i.86$', a): return 'x86' | 38 | if re.match('i.86$', a): return 'x86' |
39 | elif re.match('x86.64$', a): return 'x86' | 39 | elif re.match('x86.64$', a): return 'x86' |
@@ -46,4 +46,4 @@ def map_abi_arch(a, d): | |||
46 | else: | 46 | else: |
47 | bb.error("cannot map '%s' to a abi architecture" % a) | 47 | bb.error("cannot map '%s' to a abi architecture" % a) |
48 | 48 | ||
49 | ABI = "${@map_abi_arch(d.getVar('TARGET_ARCH', True), d)}" | 49 | 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] += "\ | |||
50 | " | 50 | " |
51 | 51 | ||
52 | QBSP_VERSION ?= "${PV}${VERSION_AUTO_INCREMENT}" | 52 | QBSP_VERSION ?= "${PV}${VERSION_AUTO_INCREMENT}" |
53 | QBSP_INSTALLER_COMPONENT ?= "${@d.getVar('MACHINE', True).replace('-','')}" | 53 | QBSP_INSTALLER_COMPONENT ?= "${@d.getVar('MACHINE').replace('-','')}" |
54 | QBSP_INSTALL_PATH ?= "/Extras/${MACHINE}" | 54 | QBSP_INSTALL_PATH ?= "/Extras/${MACHINE}" |
55 | 55 | ||
56 | QBSP_LICENSE_FILE ?= "" | 56 | QBSP_LICENSE_FILE ?= "" |
@@ -69,7 +69,7 @@ SDK_NAME = "${DISTRO}-${SDK_MACHINE}-${QBSP_SDK_TASK}-${MACHINE}.${SDK_POSTFIX}" | |||
69 | SDK_POSTFIX = "sh" | 69 | SDK_POSTFIX = "sh" |
70 | SDK_POSTFIX_sdkmingw32 = "7z" | 70 | SDK_POSTFIX_sdkmingw32 = "7z" |
71 | REAL_MULTIMACH_TARGET_SYS = "${TUNE_PKGARCH}${TARGET_VENDOR}-${TARGET_OS}" | 71 | REAL_MULTIMACH_TARGET_SYS = "${TUNE_PKGARCH}${TARGET_VENDOR}-${TARGET_OS}" |
72 | SDK_MACHINE = "${@d.getVar('SDKMACHINE', True) or '${SDK_ARCH}'}" | 72 | SDK_MACHINE = "${@d.getVar('SDKMACHINE') or '${SDK_ARCH}'}" |
73 | 73 | ||
74 | B = "${WORKDIR}/build" | 74 | B = "${WORKDIR}/build" |
75 | 75 | ||
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" | |||
31 | do_configure[file-checksums] += "${FEATURES}:True" | 31 | do_configure[file-checksums] += "${FEATURES}:True" |
32 | 32 | ||
33 | def qt_features(d): | 33 | def qt_features(d): |
34 | featurefile = d.getVar('FEATURES', True) | 34 | featurefile = d.getVar('FEATURES') |
35 | with open(featurefile, 'r') as f: | 35 | with open(featurefile, 'r') as f: |
36 | features = f.read().replace('\n', ' ') | 36 | features = f.read().replace('\n', ' ') |
37 | return features | 37 | 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 @@ | |||
28 | ############################################################################ | 28 | ############################################################################ |
29 | 29 | ||
30 | python do_fetch () { | 30 | python do_fetch () { |
31 | src_uri = (d.getVar('SRC_URI', True) or "").split() | 31 | src_uri = (d.getVar('SRC_URI') or "").split() |
32 | if len(src_uri) == 0: | 32 | if len(src_uri) == 0: |
33 | return | 33 | return |
34 | 34 | ||
35 | sdk_path = d.getVar('QT_SDK_PATH', True) or "" | 35 | sdk_path = d.getVar('QT_SDK_PATH') or "" |
36 | if len(sdk_path) != 0: | 36 | if len(sdk_path) != 0: |
37 | uris = list(src_uri); | 37 | uris = list(src_uri); |
38 | for url in uris: | 38 | for url in uris: |
@@ -53,13 +53,13 @@ python do_fetch () { | |||
53 | 53 | ||
54 | python do_unpack () { | 54 | python do_unpack () { |
55 | sdk_uds = []; | 55 | sdk_uds = []; |
56 | src_uri = (d.getVar('SRC_URI', True) or "").split() | 56 | src_uri = (d.getVar('SRC_URI') or "").split() |
57 | if len(src_uri) == 0: | 57 | if len(src_uri) == 0: |
58 | return | 58 | return |
59 | 59 | ||
60 | rootdir = d.getVar('WORKDIR', True) | 60 | rootdir = d.getVar('WORKDIR') |
61 | 61 | ||
62 | sdk_path = d.getVar('QT_SDK_PATH', True) or "" | 62 | sdk_path = d.getVar('QT_SDK_PATH') or "" |
63 | if len(sdk_path) != 0: | 63 | if len(sdk_path) != 0: |
64 | uris = list(src_uri); | 64 | uris = list(src_uri); |
65 | for url in uris: | 65 | for url in uris: |
@@ -81,8 +81,8 @@ python do_unpack () { | |||
81 | 81 | ||
82 | def unpack_local_uri(ud, d): | 82 | def unpack_local_uri(ud, d): |
83 | import subprocess | 83 | import subprocess |
84 | rootdir = d.getVar('WORKDIR', True) | 84 | rootdir = d.getVar('WORKDIR') |
85 | sdk_path = d.getVar('QT_SDK_PATH', True) | 85 | sdk_path = d.getVar('QT_SDK_PATH') |
86 | 86 | ||
87 | destdir = os.path.join(rootdir, ud[5].get("destsuffix", "git")) | 87 | destdir = os.path.join(rootdir, ud[5].get("destsuffix", "git")) |
88 | srcdir = os.path.join(sdk_path, ud[5].get("sdk-uri")) | 88 | srcdir = os.path.join(sdk_path, ud[5].get("sdk-uri")) |