From 59d36c9832702989bfcca8a5af29fb2dff01efcc Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Mon, 2 Aug 2021 11:01:05 -0700 Subject: layer: Convert to new override syntax Signed-off-by: Khem Raj --- .../recipes-graphics/wayland/weston-init.bbappend | 2 +- .../recipes-browser/chromium/chromium-imx.inc | 4 ++-- .../packagegroup-fsl-mfgtool.bbappend | 2 +- .../clutter/clutter-1.0_%.bbappend | 2 +- .../recipes-graphics/cogl/cogl-1.0_%.bbappend | 2 +- .../recipes-graphics/wayland/weston-init.bbappend | 2 +- .../recipes-benchmark/glmark2/glmark2_%.bbappend | 6 ++--- .../recipes-devtools/luajit/luajit_%.bbappend | 4 ++-- .../openembedded-layer/recipes-dpaa/fmc/fmc_git.bb | 18 +++++++-------- .../xserver-common/xserver-common_%.bbappend | 6 ++--- .../qt4-layer/recipes-qt4/qt4/qt4-imx-support.inc | 12 +++++----- .../qt5-layer/recipes-qt/qt5/qtbase_%.bbappend | 26 +++++++++++----------- .../qt5-layer/recipes-qt/qt5/qtwayland_%.bbappend | 8 +++---- .../recipes-extended/libvirt/libvirt_%.bbappend | 8 +++---- 14 files changed, 51 insertions(+), 51 deletions(-) (limited to 'dynamic-layers') diff --git a/dynamic-layers/aglprofilegraphical/recipes-graphics/wayland/weston-init.bbappend b/dynamic-layers/aglprofilegraphical/recipes-graphics/wayland/weston-init.bbappend index 10b66c0e4..b7bf3298f 100644 --- a/dynamic-layers/aglprofilegraphical/recipes-graphics/wayland/weston-init.bbappend +++ b/dynamic-layers/aglprofilegraphical/recipes-graphics/wayland/weston-init.bbappend @@ -1,3 +1,3 @@ -do_install_append() { +do_install:append() { rm -f ${D}${sysconfdir}/xdg/weston/weston.ini } diff --git a/dynamic-layers/chromium-browser-layer/recipes-browser/chromium/chromium-imx.inc b/dynamic-layers/chromium-browser-layer/recipes-browser/chromium/chromium-imx.inc index cdd0f08fd..7d8065f9d 100644 --- a/dynamic-layers/chromium-browser-layer/recipes-browser/chromium/chromium-imx.inc +++ b/dynamic-layers/chromium-browser-layer/recipes-browser/chromium/chromium-imx.inc @@ -1,4 +1,4 @@ -DEPENDS_append_imxvpu = " imx-vpuwrap" +DEPENDS:append:imxvpu = " imx-vpuwrap" # Additional imx code and patches are included in the chromium-imx git repository. # The code below fetches this repository, copies the extra source over to the main @@ -26,7 +26,7 @@ do_patch[prefuncs] =+ "add_chromium_imx_patches" # * Lost context problems are not known to happen with Vivante GPUs, # so it is safe to use ignore-lost-context # * Proprietary codecs need to be enabled for h.264 and MP4 support -PACKAGECONFIG_append = " ignore-lost-context proprietary-codecs" +PACKAGECONFIG:append = " ignore-lost-context proprietary-codecs" copy_chromium_imx_files() { # sources in src/ are already organized in a manner diff --git a/dynamic-layers/filesystem-layer/recipes-fsl/packagegroups/packagegroup-fsl-mfgtool.bbappend b/dynamic-layers/filesystem-layer/recipes-fsl/packagegroups/packagegroup-fsl-mfgtool.bbappend index 1080a9f56..563c9e763 100644 --- a/dynamic-layers/filesystem-layer/recipes-fsl/packagegroups/packagegroup-fsl-mfgtool.bbappend +++ b/dynamic-layers/filesystem-layer/recipes-fsl/packagegroups/packagegroup-fsl-mfgtool.bbappend @@ -4,7 +4,7 @@ PACKAGES += " \ ${PN}-f2fs \ " -RDEPENDS_${PN}-f2fs = " \ +RDEPENDS:${PN}-f2fs = " \ ${PN}-base \ f2fs-tools \ " diff --git a/dynamic-layers/gnome-layer/recipes-graphics/clutter/clutter-1.0_%.bbappend b/dynamic-layers/gnome-layer/recipes-graphics/clutter/clutter-1.0_%.bbappend index 0b4c4861b..fb90c73e1 100644 --- a/dynamic-layers/gnome-layer/recipes-graphics/clutter/clutter-1.0_%.bbappend +++ b/dynamic-layers/gnome-layer/recipes-graphics/clutter/clutter-1.0_%.bbappend @@ -1,4 +1,4 @@ -PACKAGECONFIG_imxgpu3d ??= " \ +PACKAGECONFIG:imxgpu3d ??= " \ ${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'wayland egl', \ bb.utils.contains('DISTRO_FEATURES', 'x11', 'glx x11', \ '', d), d)} \ diff --git a/dynamic-layers/gnome-layer/recipes-graphics/cogl/cogl-1.0_%.bbappend b/dynamic-layers/gnome-layer/recipes-graphics/cogl/cogl-1.0_%.bbappend index afbaee432..e07d0d542 100644 --- a/dynamic-layers/gnome-layer/recipes-graphics/cogl/cogl-1.0_%.bbappend +++ b/dynamic-layers/gnome-layer/recipes-graphics/cogl/cogl-1.0_%.bbappend @@ -1,4 +1,4 @@ -PACKAGECONFIG_imxgpu3d ??= " \ +PACKAGECONFIG:imxgpu3d ??= " \ cogl-pango gles2 \ ${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'egl-wayland', \ bb.utils.contains('DISTRO_FEATURES', 'x11', 'egl-x11', \ diff --git a/dynamic-layers/ivi/recipes-graphics/wayland/weston-init.bbappend b/dynamic-layers/ivi/recipes-graphics/wayland/weston-init.bbappend index 72d991c7e..4fc41d058 100644 --- a/dynamic-layers/ivi/recipes-graphics/wayland/weston-init.bbappend +++ b/dynamic-layers/ivi/recipes-graphics/wayland/weston-init.bbappend @@ -1 +1 @@ -FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" +FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:" diff --git a/dynamic-layers/openembedded-layer/recipes-benchmark/glmark2/glmark2_%.bbappend b/dynamic-layers/openembedded-layer/recipes-benchmark/glmark2/glmark2_%.bbappend index 2e648ba34..998d11f7e 100644 --- a/dynamic-layers/openembedded-layer/recipes-benchmark/glmark2/glmark2_%.bbappend +++ b/dynamic-layers/openembedded-layer/recipes-benchmark/glmark2/glmark2_%.bbappend @@ -1,4 +1,4 @@ # Only _mx8 machine do provide virtual/libgbm required for any drm* flavour -DRM-REMOVE_imxgpu = "drm-gl drm-gles2" -DRM-REMOVE_imxgpu_mx8 = "" -PACKAGECONFIG_remove = "${DRM-REMOVE}" +DRM-REMOVE:imxgpu = "drm-gl drm-gles2" +DRM-REMOVE:imxgpu:mx8 = "" +PACKAGECONFIG:remove = "${DRM-REMOVE}" diff --git a/dynamic-layers/openembedded-layer/recipes-devtools/luajit/luajit_%.bbappend b/dynamic-layers/openembedded-layer/recipes-devtools/luajit/luajit_%.bbappend index 8c6138c54..d07f8ae14 100644 --- a/dynamic-layers/openembedded-layer/recipes-devtools/luajit/luajit_%.bbappend +++ b/dynamic-layers/openembedded-layer/recipes-devtools/luajit/luajit_%.bbappend @@ -1,4 +1,4 @@ -FILESEXTRAPATHS_prepend := "${THISDIR}/${BPN}:" +FILESEXTRAPATHS:prepend := "${THISDIR}/${BPN}:" -SRC_URI_append_qoriq-ppc = " file://ppc-fixplt.patch " +SRC_URI:append:qoriq-ppc = " file://ppc-fixplt.patch " diff --git a/dynamic-layers/openembedded-layer/recipes-dpaa/fmc/fmc_git.bb b/dynamic-layers/openembedded-layer/recipes-dpaa/fmc/fmc_git.bb index 1793ec06f..9c6be782d 100644 --- a/dynamic-layers/openembedded-layer/recipes-dpaa/fmc/fmc_git.bb +++ b/dynamic-layers/openembedded-layer/recipes-dpaa/fmc/fmc_git.bb @@ -19,15 +19,15 @@ EXTRA_OEMAKE_virtclass-native = 'FMCHOSTMODE=1 FMD_USPACE_HEADER_PATH="${STAGING TCLAP_HEADER_PATH="${STAGING_INCDIR}" ' EXTRA_OEMAKE_PLATFORM ?= "" -EXTRA_OEMAKE_PLATFORM_ls1043a = "ls1043" -EXTRA_OEMAKE_PLATFORM_ls1046a = "ls1046" -EXTRA_OEMAKE_PLATFORM_ls1088a = "ls1088" -EXTRA_OEMAKE_PLATFORM_p1020 = "p4080ds" -EXTRA_OEMAKE_PLATFORM_p2020 = "p4080ds" -EXTRA_OEMAKE_PLATFORM_p2041 = "p4080ds" -EXTRA_OEMAKE_PLATFORM_p3041 = "p4080ds" -EXTRA_OEMAKE_PLATFORM_p4080 = "p4080ds" -EXTRA_OEMAKE_PLATFORM_p5040 = "p4080ds" +EXTRA_OEMAKE_PLATFORM:ls1043a = "ls1043" +EXTRA_OEMAKE_PLATFORM:ls1046a = "ls1046" +EXTRA_OEMAKE_PLATFORM:ls1088a = "ls1088" +EXTRA_OEMAKE_PLATFORM:p1020 = "p4080ds" +EXTRA_OEMAKE_PLATFORM:p2020 = "p4080ds" +EXTRA_OEMAKE_PLATFORM:p2041 = "p4080ds" +EXTRA_OEMAKE_PLATFORM:p3041 = "p4080ds" +EXTRA_OEMAKE_PLATFORM:p4080 = "p4080ds" +EXTRA_OEMAKE_PLATFORM:p5040 = "p4080ds" do_compile () { diff --git a/dynamic-layers/openembedded-layer/recipes-graphics/xserver-common/xserver-common_%.bbappend b/dynamic-layers/openembedded-layer/recipes-graphics/xserver-common/xserver-common_%.bbappend index f4f435048..be6945744 100644 --- a/dynamic-layers/openembedded-layer/recipes-graphics/xserver-common/xserver-common_%.bbappend +++ b/dynamic-layers/openembedded-layer/recipes-graphics/xserver-common/xserver-common_%.bbappend @@ -1,8 +1,8 @@ # i.MX extra configuration -FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" +FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:" -SRC_URI_append_imxgpu3d = " \ +SRC_URI:append:imxgpu3d = " \ file://0016-xserver-common-enable-iglx-module.patch \ " -PACKAGE_ARCH_imxgpu3d = "${MACHINE_SOCARCH}" +PACKAGE_ARCH:imxgpu3d = "${MACHINE_SOCARCH}" diff --git a/dynamic-layers/qt4-layer/recipes-qt4/qt4/qt4-imx-support.inc b/dynamic-layers/qt4-layer/recipes-qt4/qt4/qt4-imx-support.inc index 187681a8b..8950c151b 100644 --- a/dynamic-layers/qt4-layer/recipes-qt4/qt4/qt4-imx-support.inc +++ b/dynamic-layers/qt4-layer/recipes-qt4/qt4/qt4-imx-support.inc @@ -1,4 +1,4 @@ -FILESEXTRAPATHS_prepend := "${THISDIR}/qt4:" +FILESEXTRAPATHS:prepend := "${THISDIR}/qt4:" python __anonymous () { families = ['mx6'] @@ -8,21 +8,21 @@ python __anonymous () { d.appendVarFlag('do_configure', 'depends', ' virtual/kernel:do_shared_workdir') } -SRC_URI_append_imxgpu2d += " \ +SRC_URI:append:imxgpu2d += " \ file://0001-Add-support-for-i.MX-codecs-to-phonon.patch \ file://0002-i.MX-video-renderer-Allow-v4l-device-from-environmen.patch \ file://0003-i.MX6-force-egl-visual-ID-33.patch \ " -DEPENDS_append_imxgpu2d = " virtual/kernel virtual/libgles2" -QT_GLFLAGS_imxgpu2d = "-opengl es2 -openvg" -QT_CONFIG_FLAGS_append_imxgpu2d = " -I${STAGING_KERNEL_DIR}/include/uapi \ +DEPENDS:append:imxgpu2d = " virtual/kernel virtual/libgles2" +QT_GLFLAGS:imxgpu2d = "-opengl es2 -openvg" +QT_CONFIG_FLAGS:append:imxgpu2d = " -I${STAGING_KERNEL_DIR}/include/uapi \ -I${STAGING_KERNEL_DIR}/include/ \ -DLINUX=1 -DEGL_API_FB=1 \ -DQT_QPA_EXPERIMENTAL_TOUCHEVENT=1" # The QT_CONFIG_FLAGS can pollute *.la files with -Dxxx -do_compile_append_mx6 () { +do_compile:append:mx6 () { find lib -name "*.la" | xargs -n1 sed -i 's/-D.*=1//g' } 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" diff --git a/dynamic-layers/virtualization-layer/recipes-extended/libvirt/libvirt_%.bbappend b/dynamic-layers/virtualization-layer/recipes-extended/libvirt/libvirt_%.bbappend index c7e6d32e4..f64637bd3 100644 --- a/dynamic-layers/virtualization-layer/recipes-extended/libvirt/libvirt_%.bbappend +++ b/dynamic-layers/virtualization-layer/recipes-extended/libvirt/libvirt_%.bbappend @@ -1,9 +1,9 @@ -PACKAGECONFIG_qoriq-ppc = "qemu yajl lxc test remote macvtap libvirtd netcf udev python" +PACKAGECONFIG:qoriq-ppc = "qemu yajl lxc test remote macvtap libvirtd netcf udev python" -FILESEXTRAPATHS_prepend := "${THISDIR}/${BPN}:" -SRC_URI_append_qoriq-ppc = " file://qemu.conf" +FILESEXTRAPATHS:prepend := "${THISDIR}/${BPN}:" +SRC_URI:append:qoriq-ppc = " file://qemu.conf" -do_install_append_qoriq-ppc() { +do_install:append:qoriq-ppc() { install -m 0644 ${WORKDIR}/qemu.conf ${D}${sysconfdir}/libvirt/qemu.conf } -- cgit v1.2.3-54-g00ecf