From 12ad591d3038db609db5290d8bbe809a34c743de Mon Sep 17 00:00:00 2001
From: Scott Murray <scott.murray@konsulko.com>
Date: Fri, 20 Aug 2021 13:58:45 -0400
Subject: Convert to new override syntax

This is effectively a manual cherry-pick and squash of commits:

4249268041b879b3d2bae338d5de88f4f2d54b26
07f4ab8c2833ae5377b97cc9e3820bed67e539d0

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: I3b47f1b7d62038b314a17763d24a64f6d4e15e72
---
 recipes-core/dbus/dbus_agldemo.inc        | 6 +++---
 recipes-core/dbus/libdbus-c++_agldemo.inc | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

(limited to 'recipes-core/dbus')

diff --git a/recipes-core/dbus/dbus_agldemo.inc b/recipes-core/dbus/dbus_agldemo.inc
index 379c5435e..a642d3e7d 100644
--- a/recipes-core/dbus/dbus_agldemo.inc
+++ b/recipes-core/dbus/dbus_agldemo.inc
@@ -1,4 +1,4 @@
-FILESEXTRAPATHS_append := ":${THISDIR}/dbus"
+FILESEXTRAPATHS:append := ":${THISDIR}/dbus"
 
 SRC_URI += "file://dbus.service \
             file://dbus.socket \
@@ -7,7 +7,7 @@ SRC_URI += "file://dbus.service \
 
 inherit systemd
 
-do_install_append() {
+do_install:append() {
     if [ "${PN}" != "nativesdk-dbus" ]; then
         if ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then
             install -m 644 -p -D ${WORKDIR}/dbus.service ${D}${systemd_user_unitdir}/dbus.service
@@ -22,7 +22,7 @@ do_install_append() {
     fi
 }
 
-FILES_${PN} += " \
+FILES:${PN} += " \
     ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', '${systemd_user_unitdir}/dbus.*', '', d)} \
     ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', '${systemd_system_unitdir}/user@.service.d/dbus_env.conf', '', d)} \
     "
diff --git a/recipes-core/dbus/libdbus-c++_agldemo.inc b/recipes-core/dbus/libdbus-c++_agldemo.inc
index 4c135cc1c..d91ce4598 100644
--- a/recipes-core/dbus/libdbus-c++_agldemo.inc
+++ b/recipes-core/dbus/libdbus-c++_agldemo.inc
@@ -1,2 +1,2 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/libdbus-c++:"
-SRC_URI_append = " file://dbus-c++-threading.patch"
+FILESEXTRAPATHS:prepend := "${THISDIR}/libdbus-c++:"
+SRC_URI:append = " file://dbus-c++-threading.patch"
-- 
cgit 1.2.3-korg