Merge pull request #837 from YoeDistro/yoe/mut

Convert to new override syntax

2 files changed, 17 insertions, 17 deletions

diff --git a/dynamic-layers/qt5-layer/recipes-qt/qt5/qtbase_%.bbappend b/dynamic-layers/qt5-layer/recipes-qt/qt5/qtbase_%.bbappend
index bf3fb66ee..0d5897adc 100644
--- a/dynamic-layers/qt5-layer/recipes-qt/qt5/qtbase_%.bbappend
+++ b/dynamic-layers/qt5-layer/recipes-qt/qt5/qtbase_%.bbappend
@@ -3,35 +3,35 @@
 # Copyright (C) 2016, 2017 O.S. Systems Software LTDA.
 # Copyright (C) 2017-2018 NXP
 
-FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
+FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:"
 
-SRC_URI_append_imxgpu = " \
+SRC_URI:append:imxgpu = " \
     file://0014-Add-IMX-GPU-support.patch \
     file://0001-egl.prf-Fix-build-error-when-egl-headers-need-platfo.patch \
 "
 
 PACKAGECONFIG_GL_IMX_GPU     = ""
-PACKAGECONFIG_GL_IMX_GPU_mx8 = "gbm kms"
+PACKAGECONFIG_GL_IMX_GPU:mx8 = "gbm kms"
 
-PACKAGECONFIG_GL_imxpxp   = "gles2"
-PACKAGECONFIG_GL_imxgpu2d = "${@bb.utils.contains('DISTRO_FEATURES', 'x11', ' gl', '', d)} \
+PACKAGECONFIG_GL:imxpxp   = "gles2"
+PACKAGECONFIG_GL:imxgpu2d = "${@bb.utils.contains('DISTRO_FEATURES', 'x11', ' gl', '', d)} \
                              ${PACKAGECONFIG_GL_IMX_GPU}"
-PACKAGECONFIG_GL_imxgpu3d = "gles2 \
+PACKAGECONFIG_GL:imxgpu3d = "gles2 \
                              ${PACKAGECONFIG_GL_IMX_GPU}"
-PACKAGECONFIG_GL_use-mainline-bsp ?= "gles2 gbm kms"
+PACKAGECONFIG_GL:use-mainline-bsp ?= "gles2 gbm kms"
 
 PACKAGECONFIG_PLATFORM          = ""
-PACKAGECONFIG_PLATFORM_imxgpu2d = "no-opengl linuxfb"
-PACKAGECONFIG_PLATFORM_imxgpu3d = " \
+PACKAGECONFIG_PLATFORM:imxgpu2d = "no-opengl linuxfb"
+PACKAGECONFIG_PLATFORM:imxgpu3d = " \
     ${@bb.utils.contains('DISTRO_FEATURES', 'x11',     '', \
        bb.utils.contains('DISTRO_FEATURES', 'wayland', '', \
                                                        'eglfs', d), d)}"
-PACKAGECONFIG_PLATFORM_use-mainline-bsp = "${@bb.utils.contains('DISTRO_FEATURES', 'x11', '', 'eglfs', d)}"
+PACKAGECONFIG_PLATFORM:use-mainline-bsp = "${@bb.utils.contains('DISTRO_FEATURES', 'x11', '', 'eglfs', d)}"
 PACKAGECONFIG += "${PACKAGECONFIG_PLATFORM}"
 
 PACKAGECONFIG_VULKAN_IMX_GPU       = ""
-PACKAGECONFIG_VULKAN_IMX_GPU_mx8   = "vulkan"
-PACKAGECONFIG_VULKAN_IMX_GPU_mx8mm = ""
+PACKAGECONFIG_VULKAN_IMX_GPU:mx8   = "vulkan"
+PACKAGECONFIG_VULKAN_IMX_GPU:mx8mm = ""
 PACKAGECONFIG_VULKAN               = ""
-PACKAGECONFIG_VULKAN_imxgpu        = "${PACKAGECONFIG_VULKAN_IMX_GPU}"
+PACKAGECONFIG_VULKAN:imxgpu        = "${PACKAGECONFIG_VULKAN_IMX_GPU}"
 PACKAGECONFIG += "${@bb.utils.contains('DISTRO_FEATURES', 'vulkan', '${PACKAGECONFIG_VULKAN}', '', d)}"
diff --git a/dynamic-layers/qt5-layer/recipes-qt/qt5/qtwayland_%.bbappend b/dynamic-layers/qt5-layer/recipes-qt/qt5/qtwayland_%.bbappend
index 168db0954..c1594e057 100644
--- a/dynamic-layers/qt5-layer/recipes-qt/qt5/qtwayland_%.bbappend
+++ b/dynamic-layers/qt5-layer/recipes-qt/qt5/qtwayland_%.bbappend
@@ -1,8 +1,8 @@
 # etnaviv mesa does not have glx
-PACKAGECONFIG_remove_use-mainline-bsp = "xcomposite-glx"
+PACKAGECONFIG:remove:use-mainline-bsp = "xcomposite-glx"
 
-PACKAGECONFIG_remove_mx6 = "xcomposite-egl xcomposite-glx"
-PACKAGECONFIG_remove_mx7 = "xcomposite-egl xcomposite-glx"
+PACKAGECONFIG:remove:mx6 = "xcomposite-egl xcomposite-glx"
+PACKAGECONFIG:remove:mx7 = "xcomposite-egl xcomposite-glx"
 
 # i.MX8 does never provide native x11, so required dependencies are not met
-PACKAGECONFIG_remove_mx8 = "xcomposite-egl xcomposite-glx"
+PACKAGECONFIG:remove:mx8 = "xcomposite-egl xcomposite-glx"