From a8dbd14daaac8b5c52326262dbc43975836cc0df Mon Sep 17 00:00:00 2001
From: Scott Murray <scott.murray@konsulko.com>
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 <scott.murray@konsulko.com>
Change-Id: Ic649d942ac043edc52976a3d4190590bb1c125e7
---
 meta-agl-drm-lease/README.md                                      | 2 +-
 .../recipes-kernel/linux-renesas/linux-renesas_%.bbappend         | 4 ++--
 .../recipes-graphics/drm-lease-manager/drm-lease-manager_git.bb   | 8 ++++----
 meta-agl-drm-lease/recipes-graphics/kmscube/kmscube_git.bbappend  | 2 +-
 meta-agl-drm-lease/recipes-graphics/weston/weston_8.0.0.bbappend  | 6 +++---
 5 files changed, 11 insertions(+), 11 deletions(-)

(limited to 'meta-agl-drm-lease')

diff --git a/meta-agl-drm-lease/README.md b/meta-agl-drm-lease/README.md
index 2c5ba05d..b572fbce 100644
--- a/meta-agl-drm-lease/README.md
+++ b/meta-agl-drm-lease/README.md
@@ -22,7 +22,7 @@ lease support to the following packages:
 image, add the following to your local.conf
 
 ```
-IMAGE_INSTALL_append = " kmscube"
+IMAGE_INSTALL:append = " kmscube"
 ```
 
 ## Starting the DRM lease manager
diff --git a/meta-agl-drm-lease/dynamic-layers/meta-rcar-gen3/recipes-kernel/linux-renesas/linux-renesas_%.bbappend b/meta-agl-drm-lease/dynamic-layers/meta-rcar-gen3/recipes-kernel/linux-renesas/linux-renesas_%.bbappend
index e0a434c3..4e48edfd 100644
--- a/meta-agl-drm-lease/dynamic-layers/meta-rcar-gen3/recipes-kernel/linux-renesas/linux-renesas_%.bbappend
+++ b/meta-agl-drm-lease/dynamic-layers/meta-rcar-gen3/recipes-kernel/linux-renesas/linux-renesas_%.bbappend
@@ -1,7 +1,7 @@
 COMPATIBLE_MACHINE = "rcar-gen3"
-FILESEXTRAPATHS_prepend := "${THISDIR}/files:"
+FILESEXTRAPATHS:prepend := "${THISDIR}/files:"
 
-SRC_URI_append = " \
+SRC_URI:append = " \
     file://0001-drm-enable-dumb-buffer-ops-for-render-nodes.patch \
     file://0002-drm-rcar-du-support-render-node.patch \
 "
diff --git a/meta-agl-drm-lease/recipes-graphics/drm-lease-manager/drm-lease-manager_git.bb b/meta-agl-drm-lease/recipes-graphics/drm-lease-manager/drm-lease-manager_git.bb
index 4fcb7852..6a79ec2e 100644
--- a/meta-agl-drm-lease/recipes-graphics/drm-lease-manager/drm-lease-manager_git.bb
+++ b/meta-agl-drm-lease/recipes-graphics/drm-lease-manager/drm-lease-manager_git.bb
@@ -17,16 +17,16 @@ inherit ptest
 
 DEPENDS = "libdrm libcheck fff"
 
-do_install_append() {
+do_install:append() {
     install -d ${D}/${systemd_unitdir}/system
     install -m 0644 ${WORKDIR}/drm-lease-manager.service ${D}/${systemd_unitdir}/system
     rm -rf ${D}/${localstatedir}
 }
 
-SYSTEMD_SERVICE_${PN} = "drm-lease-manager.service"
+SYSTEMD_SERVICE:${PN} = "drm-lease-manager.service"
 
 EXTRA_OEMESON += "${@bb.utils.contains('PTEST_ENABLED', '1', '-Denable-tests=true', '', d)}"
-RDEPENDS_${PN}-ptest = "libcheck"
+RDEPENDS:${PN}-ptest = "libcheck"
 
 do_install_ptest() {
     install ${B}/libdlmclient/test/libdlmclient-test ${D}${PTEST_PATH}
@@ -35,4 +35,4 @@ do_install_ptest() {
 }
 
 PACKAGES =+ "libdlmclient"
-FILES_libdlmclient = "${libdir}/libdlmclient${SOLIBS}"
+FILES:libdlmclient = "${libdir}/libdlmclient${SOLIBS}"
diff --git a/meta-agl-drm-lease/recipes-graphics/kmscube/kmscube_git.bbappend b/meta-agl-drm-lease/recipes-graphics/kmscube/kmscube_git.bbappend
index fb4f9972..bc9e8b34 100644
--- a/meta-agl-drm-lease/recipes-graphics/kmscube/kmscube_git.bbappend
+++ b/meta-agl-drm-lease/recipes-graphics/kmscube/kmscube_git.bbappend
@@ -1,4 +1,4 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
+FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:"
 
 
 SRC_URI += "file://0001-texturator-Use-correct-GL-extension-header.patch \
diff --git a/meta-agl-drm-lease/recipes-graphics/weston/weston_8.0.0.bbappend b/meta-agl-drm-lease/recipes-graphics/weston/weston_8.0.0.bbappend
index b3d63db0..9e4630d8 100644
--- a/meta-agl-drm-lease/recipes-graphics/weston/weston_8.0.0.bbappend
+++ b/meta-agl-drm-lease/recipes-graphics/weston/weston_8.0.0.bbappend
@@ -1,6 +1,6 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
+FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:"
 
-SRC_URI_append = " \
+SRC_URI:append = " \
             file://0001-backend-drm-Add-method-to-import-DRM-fd.patch \
             file://0002-Add-DRM-lease-support.patch \
             file://0003-launcher-do-not-touch-VT-tty-while-using-non-default.patch \
@@ -9,4 +9,4 @@ SRC_URI_append = " \
             "
 
 PACKAGECONFIG[drm-lease] = "-Ddrm-lease=true,-Ddrm-lease=false,drm-lease-manager"
-PACKAGECONFIG_append = " drm-lease"
+PACKAGECONFIG:append = " drm-lease"
-- 
cgit 1.2.3-korg