From 0f66db40306e31c3adf152f47d2537109720ead5 Mon Sep 17 00:00:00 2001
From: Andrei Kartashev <a.kartashev@yadro.com>
Date: Tue, 17 Aug 2021 21:47:15 +0300
Subject: meta-yadro: Yocto override syntax change

Convert with convert-overrides.py
Sync local.conf.sample with:
- poky/meta-poky/conf/local.conf.sample
- meta-facebook/meta-tiogapass/conf/local.conf.sample
Additional manual changes (not found by convert-overrides.py) in
- meta-yadro/meta-nicole/recipes-kernel/linux/linux-aspeed_%.bbappend
- meta-yadro/meta-nicole/recipes-phosphor/images/obmc-phosphor-image.bbappend
- meta-yadro/meta-nicole/recipes-phosphor/settings/phosphor-settings-manager_%.bbappend

Tested: image compiles.

Signed-off-by: Andrei Kartashev <a.kartashev@yadro.com>
Change-Id: I959669bad43ce09c0817b2a002e6db546fb98f7f
---
 meta-yadro/recipes-phosphor/cli/obmc-yadro-cli_git.bb                | 4 ++--
 meta-yadro/recipes-phosphor/cli/obmc-yadro-fwupdate_git.bb           | 2 +-
 meta-yadro/recipes-phosphor/dbus/phosphor-dbus-interfaces_%.bbappend | 4 ++--
 meta-yadro/recipes-phosphor/ipmi/phosphor-ipmi-config.bbappend       | 2 +-
 meta-yadro/recipes-phosphor/ipmi/phosphor-ipmi-host_%.bbappend       | 2 +-
 5 files changed, 7 insertions(+), 7 deletions(-)

(limited to 'meta-yadro/recipes-phosphor')

diff --git a/meta-yadro/recipes-phosphor/cli/obmc-yadro-cli_git.bb b/meta-yadro/recipes-phosphor/cli/obmc-yadro-cli_git.bb
index 5cdf3164da..2564ce38ee 100644
--- a/meta-yadro/recipes-phosphor/cli/obmc-yadro-cli_git.bb
+++ b/meta-yadro/recipes-phosphor/cli/obmc-yadro-cli_git.bb
@@ -10,7 +10,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=86d3f3a95c324c9479bd8986968f4327"
 
 # Dependencies
 DEPENDS = "phosphor-user-manager"
-RDEPENDS_${PN} = " \
+RDEPENDS:${PN} = " \
     ${VIRTUAL-RUNTIME_base-utils} \
     bash \
     obmc-yadro-fwupdate \
@@ -26,7 +26,7 @@ RDEPENDS_${PN} = " \
 # They should be appended by bbappend file in their layers
 
 # Directory with command handlers
-FILES_${PN} += "${datadir}/cli"
+FILES:${PN} += "${datadir}/cli"
 
 MACHINE_NAME ?= "${MACHINE}"
 # Custom installation procedure
diff --git a/meta-yadro/recipes-phosphor/cli/obmc-yadro-fwupdate_git.bb b/meta-yadro/recipes-phosphor/cli/obmc-yadro-fwupdate_git.bb
index dd7f39716e..95eef8fc05 100644
--- a/meta-yadro/recipes-phosphor/cli/obmc-yadro-fwupdate_git.bb
+++ b/meta-yadro/recipes-phosphor/cli/obmc-yadro-fwupdate_git.bb
@@ -19,7 +19,7 @@ PACKAGECONFIG[reboot-guard-support] = "-Dreboot-guard-support=true,-Dreboot-guar
 PACKAGECONFIG[openpower-support] = "-Dopenpower-support=true,-Dopenpower-support=false"
 
 PACKAGECONFIG ??= " obmc-phosphor-image reboot-guard-support "
-PACKAGECONFIG_append_df-openpower = "openpower-support"
+PACKAGECONFIG:append_df-openpower = "openpower-support"
 
 SRC_URI = "git://github.com/YADRO-KNS/obmc-yadro-fwupdate"
 SRCREV = "0e3c0714f344a2f7f289c851434955360e6f075b"
diff --git a/meta-yadro/recipes-phosphor/dbus/phosphor-dbus-interfaces_%.bbappend b/meta-yadro/recipes-phosphor/dbus/phosphor-dbus-interfaces_%.bbappend
index 8a5b4c3637..c2d267912b 100644
--- a/meta-yadro/recipes-phosphor/dbus/phosphor-dbus-interfaces_%.bbappend
+++ b/meta-yadro/recipes-phosphor/dbus/phosphor-dbus-interfaces_%.bbappend
@@ -1,5 +1,5 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
+FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:"
 
-SRC_URI_append = "\
+SRC_URI:append = "\
     file://0001-Add-boot-initiator-mailbox-interface.patch \
 "
diff --git a/meta-yadro/recipes-phosphor/ipmi/phosphor-ipmi-config.bbappend b/meta-yadro/recipes-phosphor/ipmi/phosphor-ipmi-config.bbappend
index 72d991c7e5..4fc41d0580 100644
--- a/meta-yadro/recipes-phosphor/ipmi/phosphor-ipmi-config.bbappend
+++ b/meta-yadro/recipes-phosphor/ipmi/phosphor-ipmi-config.bbappend
@@ -1 +1 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
+FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:"
diff --git a/meta-yadro/recipes-phosphor/ipmi/phosphor-ipmi-host_%.bbappend b/meta-yadro/recipes-phosphor/ipmi/phosphor-ipmi-host_%.bbappend
index b4b1a2f1ed..faa3f579ee 100644
--- a/meta-yadro/recipes-phosphor/ipmi/phosphor-ipmi-host_%.bbappend
+++ b/meta-yadro/recipes-phosphor/ipmi/phosphor-ipmi-host_%.bbappend
@@ -1,4 +1,4 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
+FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:"
 
 SRC_URI += "\
     file://0001-Add-support-for-persistent-only-settings.patch \
-- 
cgit v1.2.3