From 12fc939cde971ea2094201e48fe095c41138f4aa Mon Sep 17 00:00:00 2001
From: Patrick Williams <patrick@stwcx.xyz>
Date: Fri, 6 Aug 2021 09:16:53 -0500
Subject: meta-phosphor: prep for new override syntax

Signed-off-by: Patrick Williams <patrick@stwcx.xyz>
Change-Id: I588025b614416c43aa2d053765ab53bacf890cb5
---
 .../i2c-tools/i2c-tools_%.bbappend                 |  2 +-
 .../recipes-devtools/iotools/iotools_1.6.bb        |  4 ++--
 .../recipes-devtools/python/pyphosphor_git.bb      | 28 +++++++++++-----------
 .../recipes-devtools/python/python3_%.bbappend     |  4 ++--
 .../recipes-devtools/rsync/rsync_%.bbappend        |  4 ++--
 5 files changed, 21 insertions(+), 21 deletions(-)

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

diff --git a/meta-phosphor/recipes-devtools/i2c-tools/i2c-tools_%.bbappend b/meta-phosphor/recipes-devtools/i2c-tools/i2c-tools_%.bbappend
index 349888e8d..e08b15965 100644
--- a/meta-phosphor/recipes-devtools/i2c-tools/i2c-tools_%.bbappend
+++ b/meta-phosphor/recipes-devtools/i2c-tools/i2c-tools_%.bbappend
@@ -1,3 +1,3 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
+FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:"
 SRC_URI =+ "file://0001-4-byte-read-support-466.patch \
             file://0001-i2cget-Add-support-for-i2c-block-data.patch"
diff --git a/meta-phosphor/recipes-devtools/iotools/iotools_1.6.bb b/meta-phosphor/recipes-devtools/iotools/iotools_1.6.bb
index af2cc76ac..f4b36d616 100644
--- a/meta-phosphor/recipes-devtools/iotools/iotools_1.6.bb
+++ b/meta-phosphor/recipes-devtools/iotools/iotools_1.6.bb
@@ -9,7 +9,7 @@ PV = "v1.6+git${SRCPV}"
 inherit obmc-phosphor-systemd
 
 S = "${WORKDIR}/git"
-FILES_${PN} = "${sbindir}"
+FILES:${PN} = "${sbindir}"
 
 do_compile() {
     # CC is overridden in the Makefile, so override it harder in the invocation
@@ -23,4 +23,4 @@ do_install() {
     install -m 0755 iotools ${D}${sbindir}
 }
 
-SYSTEMD_SERVICE_${PN} += "iotools-setup.service"
+SYSTEMD_SERVICE:${PN} += "iotools-setup.service"
diff --git a/meta-phosphor/recipes-devtools/python/pyphosphor_git.bb b/meta-phosphor/recipes-devtools/python/pyphosphor_git.bb
index a0383d5fd..ad11a078d 100644
--- a/meta-phosphor/recipes-devtools/python/pyphosphor_git.bb
+++ b/meta-phosphor/recipes-devtools/python/pyphosphor_git.bb
@@ -20,33 +20,33 @@ PACKAGE_BEFORE_PN = " \
         ${PN}-dbus \
         "
 
-RDEPENDS_${PN}-utils-ns += "${PN}-ns"
-RDEPENDS_${PN}-dbus-ns += "${PN}-ns"
-RDEPENDS_${PN}-utils += "${PN}-utils-ns"
-RDEPENDS_${PN}-wsgi-apps-ns += "${PN}-wsgi-ns"
-RDEPENDS_${PN}-wsgi-ns += "${PN}-ns"
-RDEPENDS_${PN}-dbus += " \
+RDEPENDS:${PN}-utils-ns += "${PN}-ns"
+RDEPENDS:${PN}-dbus-ns += "${PN}-ns"
+RDEPENDS:${PN}-utils += "${PN}-utils-ns"
+RDEPENDS:${PN}-wsgi-apps-ns += "${PN}-wsgi-ns"
+RDEPENDS:${PN}-wsgi-ns += "${PN}-ns"
+RDEPENDS:${PN}-dbus += " \
         ${PN}-dbus-ns \
         python-dbus \
         python-xml \
         python-json \
         python-pickle \
         "
-RDEPENDS_${PN} += " \
+RDEPENDS:${PN} += " \
         ${PN}-ns \
         ${PN}-dbus \
         python-subprocess \
         python-dbus \
         "
 
-FILES_${PN}-ns = "${PYTHON_SITEPACKAGES_DIR}/obmc/__init__.py*"
-FILES_${PN}-utils-ns = "${PYTHON_SITEPACKAGES_DIR}/obmc/utils/__init__.py*"
-FILES_${PN}-dbus-ns = "${PYTHON_SITEPACKAGES_DIR}/obmc/dbuslib/__init__.py*"
-FILES_${PN}-wsgi-ns = "${PYTHON_SITEPACKAGES_DIR}/obmc/wsgi/__init__.py*"
-FILES_${PN}-wsgi-apps-ns = "${PYTHON_SITEPACKAGES_DIR}/obmc/wsgi/apps/__init__.py*"
+FILES:${PN}-ns = "${PYTHON_SITEPACKAGES_DIR}/obmc/__init__.py*"
+FILES:${PN}-utils-ns = "${PYTHON_SITEPACKAGES_DIR}/obmc/utils/__init__.py*"
+FILES:${PN}-dbus-ns = "${PYTHON_SITEPACKAGES_DIR}/obmc/dbuslib/__init__.py*"
+FILES:${PN}-wsgi-ns = "${PYTHON_SITEPACKAGES_DIR}/obmc/wsgi/__init__.py*"
+FILES:${PN}-wsgi-apps-ns = "${PYTHON_SITEPACKAGES_DIR}/obmc/wsgi/apps/__init__.py*"
 
-FILES_${PN}-utils = "${PYTHON_SITEPACKAGES_DIR}/obmc/utils"
-FILES_${PN}-dbus = "${PYTHON_SITEPACKAGES_DIR}/obmc/dbuslib"
+FILES:${PN}-utils = "${PYTHON_SITEPACKAGES_DIR}/obmc/utils"
+FILES:${PN}-dbus = "${PYTHON_SITEPACKAGES_DIR}/obmc/dbuslib"
 
 SRC_URI += "git://github.com/openbmc/pyphosphor"
 
diff --git a/meta-phosphor/recipes-devtools/python/python3_%.bbappend b/meta-phosphor/recipes-devtools/python/python3_%.bbappend
index 324b28ce0..a2dafcf6c 100644
--- a/meta-phosphor/recipes-devtools/python/python3_%.bbappend
+++ b/meta-phosphor/recipes-devtools/python/python3_%.bbappend
@@ -1,12 +1,12 @@
 inherit update-alternatives
 
-ALTERNATIVE_${PN}-core += "python"
+ALTERNATIVE:${PN}-core += "python"
 ALTERNATIVE_LINK_NAME[python] = "${bindir}/python"
 ALTERNATIVE_TARGET[python] = "${bindir}/python3"
 
 # python3 takes up a lot of space that most embedded systems
 # do not have, so remove some un-needed files from the rootfs
-do_install_append_class-target() {
+do_install:append:class-target() {
     # Even though python3 is built with --without-ensurepip, it still installs
     # a large, compressed version of pip.  Remove it to free up the space.
     rm -rf ${D}${libdir}/python${PYTHON_MAJMIN}/ensurepip
diff --git a/meta-phosphor/recipes-devtools/rsync/rsync_%.bbappend b/meta-phosphor/recipes-devtools/rsync/rsync_%.bbappend
index a7061c088..f4f3b42d0 100644
--- a/meta-phosphor/recipes-devtools/rsync/rsync_%.bbappend
+++ b/meta-phosphor/recipes-devtools/rsync/rsync_%.bbappend
@@ -1,7 +1,7 @@
-EXTRA_OECONF_append_class-target += " --disable-largefile --disable-locale \
+EXTRA_OECONF:append:class-target += " --disable-largefile --disable-locale \
                                       --disable-iconv --without-included-popt \
                                       --without-included-zlib"
 
 PACKAGECONFIG = ""
 
-DEPENDS_append_class-target = " popt zlib"
+DEPENDS:append:class-target = " popt zlib"
-- 
cgit v1.2.3