From ab6de74f7df8de02fbc3cd92cbfa241d9b70dd1c Mon Sep 17 00:00:00 2001
From: Mike Garrett <mike.garrett@hpe.com>
Date: Tue, 24 Aug 2021 17:56:32 -0500
Subject: meta-hpe: Changes to support Yocto syntax

Changes to support Yocto syntax changes and latest 'honister' release

Signed-off-by: Mike Garrett <mike.garrett@hpe.com>
Change-Id: I9cc4eb78b90d9b73bcd0440e6f6f6334fe459481
---
 .../image/obmc-phosphor-image.bbappend             |  8 ++++----
 .../initrdscripts/obmc-phosphor-initfs.bbappend    |  8 ++++----
 .../packagegroups/packagegroup-hpe-apps.bb         | 24 +++++++++++-----------
 .../packagegroups/packagegroup-obmc-apps.bbappend  |  6 +++---
 4 files changed, 23 insertions(+), 23 deletions(-)

(limited to 'meta-hpe/meta-common')

diff --git a/meta-hpe/meta-common/recipes-phosphor/image/obmc-phosphor-image.bbappend b/meta-hpe/meta-common/recipes-phosphor/image/obmc-phosphor-image.bbappend
index 7c21fb4d2..721ad10ad 100644
--- a/meta-hpe/meta-common/recipes-phosphor/image/obmc-phosphor-image.bbappend
+++ b/meta-hpe/meta-common/recipes-phosphor/image/obmc-phosphor-image.bbappend
@@ -47,19 +47,19 @@ do_generate_static[depends] += " \
         "
 
 
-make_image_links_append() {
+make_image_links:append() {
     ln -sf ${DEPLOY_DIR_IMAGE}/hpe-section image-section
 }
 
-do_mk_static_symlinks_append() {
+do_mk_static_symlinks:append() {
     ln -sf hpe-section image-section
 }
 
-do_generate_static_prepend() {
+do_generate_static:prepend() {
     bb.build.exec_func("do_generate_hpe_image", d)
 }
 
-do_generate_static_append() {
+do_generate_static:append() {
     _append_image(os.path.join(d.getVar('DEPLOY_DIR_IMAGE', True),
                                'hpe-section'),
                   int(d.getVar('FLASH_SECTION_OFFSET', True)),
diff --git a/meta-hpe/meta-common/recipes-phosphor/initrdscripts/obmc-phosphor-initfs.bbappend b/meta-hpe/meta-common/recipes-phosphor/initrdscripts/obmc-phosphor-initfs.bbappend
index cdf163cea..ab76653ff 100644
--- a/meta-hpe/meta-common/recipes-phosphor/initrdscripts/obmc-phosphor-initfs.bbappend
+++ b/meta-hpe/meta-common/recipes-phosphor/initrdscripts/obmc-phosphor-initfs.bbappend
@@ -1,11 +1,11 @@
-FILESEXTRAPATHS_prepend :="${THISDIR}/files:"
+FILESEXTRAPATHS:prepend :="${THISDIR}/files:"
 
 SRC_URI += "file://gxp-obmc-init.sh \
            "
 
-do_install_append() {
+do_install:append() {
         install -m 0755 ${WORKDIR}/gxp-obmc-init.sh ${D}/init
 }
 
-FILES_${PN} += " /init /shutdown /update /whitelist /dev "
-FILES_${PN} += " /init-options /init-download-url "
+FILES:${PN} += " /init /shutdown /update /whitelist /dev "
+FILES:${PN} += " /init-options /init-download-url "
diff --git a/meta-hpe/meta-common/recipes-phosphor/packagegroups/packagegroup-hpe-apps.bb b/meta-hpe/meta-common/recipes-phosphor/packagegroups/packagegroup-hpe-apps.bb
index 82a748b91..3f16d41e7 100644
--- a/meta-hpe/meta-common/recipes-phosphor/packagegroups/packagegroup-hpe-apps.bb
+++ b/meta-hpe/meta-common/recipes-phosphor/packagegroups/packagegroup-hpe-apps.bb
@@ -16,31 +16,31 @@ PROVIDES += "virtual/obmc-fan-mgmt"
 PROVIDES += "virtual/obmc-flash-mgmt"
 PROVIDES += "virtual/obmc-system-mgmt"
 
-RPROVIDES_${PN}-chassis += "virtual-obmc-chassis-mgmt"
-RPROVIDES_${PN}-fans += "virtual-obmc-fan-mgmt"
-RPROVIDES_${PN}-flash += "virtual-obmc-flash-mgmt"
-RPROVIDES_${PN}-system += "virtual-obmc-system-mgmt"
+RPROVIDES:${PN}-chassis += "virtual-obmc-chassis-mgmt"
+RPROVIDES:${PN}-fans += "virtual-obmc-fan-mgmt"
+RPROVIDES:${PN}-flash += "virtual-obmc-flash-mgmt"
+RPROVIDES:${PN}-system += "virtual-obmc-system-mgmt"
 
-SUMMARY_${PN}-chassis = "HPE Chassis"
-RDEPENDS_${PN}-chassis = " \
+SUMMARY:${PN}-chassis = "HPE Chassis"
+RDEPENDS:${PN}-chassis = " \
         obmc-phosphor-buttons-signals \
         obmc-phosphor-buttons-handler \
         obmc-op-control-power \
         obmc-host-failure-reboots \
         "
 
-SUMMARY_${PN}-fans = "HPE Fans"
-RDEPENDS_${PN}-fans = " \
+SUMMARY:${PN}-fans = "HPE Fans"
+RDEPENDS:${PN}-fans = " \
         phosphor-pid-control \
         "
 
-SUMMARY_${PN}-flash = "HPE Flash"
-RDEPENDS_${PN}-flash = " \
+SUMMARY:${PN}-flash = "HPE Flash"
+RDEPENDS:${PN}-flash = " \
         obmc-control-bmc \
         "
 
-SUMMARY_${PN}-system = "HPE System"
-RDEPENDS_${PN}-system = " \
+SUMMARY:${PN}-system = "HPE System"
+RDEPENDS:${PN}-system = " \
         bmcweb \
         phosphor-webui \
         phosphor-ipmi-ipmb \
diff --git a/meta-hpe/meta-common/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bbappend b/meta-hpe/meta-common/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bbappend
index fc6a05510..101e9c1c0 100644
--- a/meta-hpe/meta-common/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bbappend
+++ b/meta-hpe/meta-common/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bbappend
@@ -1,10 +1,10 @@
-RDEPENDS_${PN}-logging += "phosphor-logging"
-RDEPENDS_${PN}-extras += " bmcweb \
+RDEPENDS:${PN}-logging += "phosphor-logging"
+RDEPENDS:${PN}-extras += " bmcweb \
                            phosphor-webui \
                            phosphor-image-signing \
                            phosphor-pid-control \
 "
 
-RDEPENDS_${PN}-fan-control = " \
+RDEPENDS:${PN}-fan-control = " \
          ${VIRTUAL-RUNTIME_obmc-fan-control} \
          "
-- 
cgit v1.2.3