From 2de8c6037ff56bf950c6af048fccc9d07f952387 Mon Sep 17 00:00:00 2001
From: Konstantin Aladyshev <aladyshev22@gmail.com>
Date: Wed, 1 Sep 2021 11:34:44 +0300
Subject: meta-amd: fix compilation errors with latest Yocto

Make the following changes to fix compilation errors:
- add honister to the LAYERSERIES_COMPAT variable,
- increase CONF_VERSION to 2,
- use new bitbake override syntax

Signed-off-by: Konstantin Aladyshev <aladyshev22@gmail.com>
Change-Id: I971f0f0f7110e0350994ced151ca429444885056
---
 meta-amd/recipes-phosphor/console/obmc-console_%.bbappend           | 6 +++---
 meta-amd/recipes-phosphor/fans/phosphor-pid-control_%.bbappend      | 4 ++--
 meta-amd/recipes-phosphor/logging/phosphor-hostlogger_%.bbappend    | 4 ++--
 meta-amd/recipes-phosphor/sel-logger/phosphor-sel-logger_%.bbappend | 2 +-
 4 files changed, 8 insertions(+), 8 deletions(-)

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

diff --git a/meta-amd/recipes-phosphor/console/obmc-console_%.bbappend b/meta-amd/recipes-phosphor/console/obmc-console_%.bbappend
index 7f9c460e2..a53372431 100644
--- a/meta-amd/recipes-phosphor/console/obmc-console_%.bbappend
+++ b/meta-amd/recipes-phosphor/console/obmc-console_%.bbappend
@@ -1,10 +1,10 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}/${MACHINE}:"
+FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}/${MACHINE}:"
 OBMC_CONSOLE_HOST_TTY = "ttyS0"
 
-SRC_URI_remove = "file://${BPN}.conf"
+SRC_URI:remove = "file://${BPN}.conf"
 SRC_URI += "file://server.ttyS0.conf"
 
-do_install_append() {
+do_install:append() {
         # Remove upstream-provided configuration
         rm -rf ${D}${sysconfdir}/${BPN}
 
diff --git a/meta-amd/recipes-phosphor/fans/phosphor-pid-control_%.bbappend b/meta-amd/recipes-phosphor/fans/phosphor-pid-control_%.bbappend
index 83567e906..4cdfe5a9e 100644
--- a/meta-amd/recipes-phosphor/fans/phosphor-pid-control_%.bbappend
+++ b/meta-amd/recipes-phosphor/fans/phosphor-pid-control_%.bbappend
@@ -1,3 +1,3 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
+FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:"
 
-EXTRA_OECONF_append = " --enable-configure-dbus=yes"
+EXTRA_OECONF:append = " --enable-configure-dbus=yes"
diff --git a/meta-amd/recipes-phosphor/logging/phosphor-hostlogger_%.bbappend b/meta-amd/recipes-phosphor/logging/phosphor-hostlogger_%.bbappend
index 9ae1d42c6..1f2e6c038 100644
--- a/meta-amd/recipes-phosphor/logging/phosphor-hostlogger_%.bbappend
+++ b/meta-amd/recipes-phosphor/logging/phosphor-hostlogger_%.bbappend
@@ -1,8 +1,8 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}/${MACHINE}:"
+FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}/${MACHINE}:"
 
 # Default service instance to install (single-host mode)
 DEFAULT_INSTANCE = "ttyS0"
 
-SRC_URI_remove = "file://${BPN}.conf"
+SRC_URI:remove = "file://${BPN}.conf"
 SRC_URI += "file://ttyS0.conf"
 
diff --git a/meta-amd/recipes-phosphor/sel-logger/phosphor-sel-logger_%.bbappend b/meta-amd/recipes-phosphor/sel-logger/phosphor-sel-logger_%.bbappend
index ac98c7ce7..ca35bcb6a 100644
--- a/meta-amd/recipes-phosphor/sel-logger/phosphor-sel-logger_%.bbappend
+++ b/meta-amd/recipes-phosphor/sel-logger/phosphor-sel-logger_%.bbappend
@@ -1 +1 @@
-PACKAGECONFIG_append = " log-threshold log-pulse"
+PACKAGECONFIG:append = " log-threshold log-pulse"
-- 
cgit v1.2.3