From a8dbd14daaac8b5c52326262dbc43975836cc0df Mon Sep 17 00:00:00 2001 From: Scott Murray Date: Fri, 20 Aug 2021 13:57:33 -0400 Subject: Convert to new override syntax This is effectively a manual cherry-pick of commit: 37d3b1b316470fdcfebc59d5522bfbfefc025ff6 from the master branch with additional review and fixups. The intent of these changes is to minimize the effort to backport fixes from the master branch, which has been updated in preparation for the switch to the next Yocto LTS release in early 2022. Bug-AGL: SPEC-4144 Signed-off-by: Scott Murray Change-Id: Ic649d942ac043edc52976a3d4190590bb1c125e7 --- .../meta-rcar-gen3/recipes-connectivity/openssl/openssl_1.1.%.bbappend | 2 +- .../recipes-graphics/gles-module/gles-user-module.bbappend | 2 +- .../kernel-module-vsp2driver/kernel-module-vsp2driver.bbappend | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) (limited to 'meta-agl-lxc/dynamic-layers') diff --git a/meta-agl-lxc/dynamic-layers/meta-rcar-gen3/recipes-connectivity/openssl/openssl_1.1.%.bbappend b/meta-agl-lxc/dynamic-layers/meta-rcar-gen3/recipes-connectivity/openssl/openssl_1.1.%.bbappend index e30136f2..6060e6b1 100644 --- a/meta-agl-lxc/dynamic-layers/meta-rcar-gen3/recipes-connectivity/openssl/openssl_1.1.%.bbappend +++ b/meta-agl-lxc/dynamic-layers/meta-rcar-gen3/recipes-connectivity/openssl/openssl_1.1.%.bbappend @@ -1,4 +1,4 @@ # Add a hook to disable depending on cryptodev-module for containers CRYPTODEV_RDEPENDS = "cryptodev-module" -CRYPTODEV_RDEPENDS_aglcontainerguest = "" +CRYPTODEV_RDEPENDS:aglcontainerguest = "" PACKAGECONFIG[cryptodev-linux] = "enable-devcryptoeng,disable-devcryptoeng,cryptodev-linux,,${CRYPTODEV_RDEPENDS}" diff --git a/meta-agl-lxc/dynamic-layers/meta-rcar-gen3/recipes-graphics/gles-module/gles-user-module.bbappend b/meta-agl-lxc/dynamic-layers/meta-rcar-gen3/recipes-graphics/gles-module/gles-user-module.bbappend index 41cdea3b..c942f687 100644 --- a/meta-agl-lxc/dynamic-layers/meta-rcar-gen3/recipes-graphics/gles-module/gles-user-module.bbappend +++ b/meta-agl-lxc/dynamic-layers/meta-rcar-gen3/recipes-graphics/gles-module/gles-user-module.bbappend @@ -1 +1 @@ -RDEPENDS_${PN}_remove_aglcontainerguest = "kernel-module-gles" +RDEPENDS:${PN}:remove:aglcontainerguest = "kernel-module-gles" diff --git a/meta-agl-lxc/dynamic-layers/meta-rcar-gen3/recipes-kernel/kernel-module-vsp2driver/kernel-module-vsp2driver.bbappend b/meta-agl-lxc/dynamic-layers/meta-rcar-gen3/recipes-kernel/kernel-module-vsp2driver/kernel-module-vsp2driver.bbappend index f41a0ec4..057613fb 100644 --- a/meta-agl-lxc/dynamic-layers/meta-rcar-gen3/recipes-kernel/kernel-module-vsp2driver/kernel-module-vsp2driver.bbappend +++ b/meta-agl-lxc/dynamic-layers/meta-rcar-gen3/recipes-kernel/kernel-module-vsp2driver/kernel-module-vsp2driver.bbappend @@ -6,4 +6,4 @@ do_install:aglcontainerguest:append() { } PACKAGES:append:aglcontainerguest = " ${PN}-dev" -FILES_${PN}-dev:aglcontainerguest += "${includedir}" +FILES:${PN}-dev:aglcontainerguest += "${includedir}" -- cgit 1.2.3-korg