meta-fii/meta-kudo: follow the new Yocto override syntax change
Changing the syntax for various yocto files ie. (_ to :) changes to
bb, bbappend and conf files.
Signed-off-by: Mohaimen Alsamarai <mohaimen.alsamarai@fii-na.com>
Change-Id: If25577ee9d98398c1a1ab7f85a0373c46af70245
diff --git a/meta-fii/meta-kudo/recipes-kudo/host/ampere-hostctrl.bb b/meta-fii/meta-kudo/recipes-kudo/host/ampere-hostctrl.bb
index affbcf7..461aeb5 100644
--- a/meta-fii/meta-kudo/recipes-kudo/host/ampere-hostctrl.bb
+++ b/meta-fii/meta-kudo/recipes-kudo/host/ampere-hostctrl.bb
@@ -20,10 +20,10 @@
"
DEPENDS = "systemd"
-RDEPENDS_${PN} = "bash"
+RDEPENDS:${PN} = "bash"
SYSTEMD_PACKAGES = "${PN}"
-SYSTEMD_SERVICE_${PN} = " \
+SYSTEMD_SERVICE:${PN} = " \
ampere-host-shutdown.service \
ampere-host-reset.service \
ampere-chassis-poweroff.service \
diff --git a/meta-fii/meta-kudo/recipes-kudo/hotswap-power-cycle/hotswap-power-cycle.bb b/meta-fii/meta-kudo/recipes-kudo/hotswap-power-cycle/hotswap-power-cycle.bb
index d01b898..12098ad 100644
--- a/meta-fii/meta-kudo/recipes-kudo/hotswap-power-cycle/hotswap-power-cycle.bb
+++ b/meta-fii/meta-kudo/recipes-kudo/hotswap-power-cycle/hotswap-power-cycle.bb
@@ -7,10 +7,10 @@
inherit systemd
DEPENDS += "systemd"
-RDEPENDS_${PN} += "bash"
+RDEPENDS:${PN} += "bash"
-FILESEXTRAPATHS_prepend := "${THISDIR}/files:"
-SRC_URI_append_kudo = " file://hotswap-power-cycle.service"
+FILESEXTRAPATHS:prepend := "${THISDIR}/files:"
+SRC_URI:append:kudo = " file://hotswap-power-cycle.service"
do_install() {
install -d ${D}${systemd_unitdir}/system/
@@ -18,4 +18,4 @@
}
SYSTEMD_PACKAGES = "${PN}"
-SYSTEMD_SERVICE_${PN} = " hotswap-power-cycle.service"
+SYSTEMD_SERVICE:${PN} = " hotswap-power-cycle.service"
diff --git a/meta-fii/meta-kudo/recipes-kudo/ipmi/fii-ipmi-oem_git.bb b/meta-fii/meta-kudo/recipes-kudo/ipmi/fii-ipmi-oem_git.bb
index c0793ad..b56ce44 100644
--- a/meta-fii/meta-kudo/recipes-kudo/ipmi/fii-ipmi-oem_git.bb
+++ b/meta-fii/meta-kudo/recipes-kudo/ipmi/fii-ipmi-oem_git.bb
@@ -20,7 +20,7 @@
HOSTIPMI_PROVIDER_LIBRARY += "${LIBRARY_NAMES}"
NETIPMI_PROVIDER_LIBRARY += "${LIBRARY_NAMES}"
-FILES_${PN}_append = " ${libdir}/ipmid-providers/lib*${SOLIBS}"
-FILES_${PN}_append = " ${libdir}/host-ipmid/lib*${SOLIBS}"
-FILES_${PN}_append = " ${libdir}/net-ipmid/lib*${SOLIBS}"
-FILES_${PN}-dev_append = " ${libdir}/ipmid-providers/lib*${SOLIBSDEV}"
+FILES:${PN}:append = " ${libdir}/ipmid-providers/lib*${SOLIBS}"
+FILES:${PN}:append = " ${libdir}/host-ipmid/lib*${SOLIBS}"
+FILES:${PN}:append = " ${libdir}/net-ipmid/lib*${SOLIBS}"
+FILES:${PN}-dev:append = " ${libdir}/ipmid-providers/lib*${SOLIBSDEV}"
diff --git a/meta-fii/meta-kudo/recipes-kudo/kudo-fw-utility/kudo-bios-update.bb b/meta-fii/meta-kudo/recipes-kudo/kudo-fw-utility/kudo-bios-update.bb
index b126bfc..9fb7d24 100644
--- a/meta-fii/meta-kudo/recipes-kudo/kudo-fw-utility/kudo-bios-update.bb
+++ b/meta-fii/meta-kudo/recipes-kudo/kudo-fw-utility/kudo-bios-update.bb
@@ -10,18 +10,18 @@
DEPENDS += "systemd"
DEPENDS += "phosphor-ipmi-flash"
-RDEPENDS_${PN} += "libsystemd"
-RDEPENDS_${PN} += "bash"
+RDEPENDS:${PN} += "libsystemd"
+RDEPENDS:${PN} += "bash"
-FILES_${PN} += "${datadir}/phosphor-ipmi-flash/config-bios.json"
+FILES:${PN} += "${datadir}/phosphor-ipmi-flash/config-bios.json"
-SRC_URI_append_kudo = " \
+SRC_URI:append:kudo = " \
file://phosphor-ipmi-flash-bios-update.service \
file://config-bios.json \
"
SYSTEMD_PACKAGES = "${PN}"
-SYSTEMD_SERVICE_${PN}_append_kudo = " \
+SYSTEMD_SERVICE:${PN}:append:kudo = " \
phosphor-ipmi-flash-bios-update.service \
"
diff --git a/meta-fii/meta-kudo/recipes-kudo/kudo-fw-utility/kudo-bmc-update.bb b/meta-fii/meta-kudo/recipes-kudo/kudo-fw-utility/kudo-bmc-update.bb
index 184f3ef..71daad3 100644
--- a/meta-fii/meta-kudo/recipes-kudo/kudo-fw-utility/kudo-bmc-update.bb
+++ b/meta-fii/meta-kudo/recipes-kudo/kudo-fw-utility/kudo-bmc-update.bb
@@ -6,11 +6,11 @@
LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/Apache-2.0;md5=89aea4e17d99a7cacdbeed46a0096b10"
DEPENDS += "phosphor-ipmi-flash"
-RDEPENDS_${PN} += "bash"
+RDEPENDS:${PN} += "bash"
-FILES_${PN} += "${datadir}/phosphor-ipmi-flash/config-bmc.json"
+FILES:${PN} += "${datadir}/phosphor-ipmi-flash/config-bmc.json"
-SRC_URI_append_kudo = " \
+SRC_URI:append:kudo = " \
file://config-bmc.json \
"
diff --git a/meta-fii/meta-kudo/recipes-kudo/kudo-fw-utility/kudo-cpld-update.bb b/meta-fii/meta-kudo/recipes-kudo/kudo-fw-utility/kudo-cpld-update.bb
index b2fd820..d32b280 100644
--- a/meta-fii/meta-kudo/recipes-kudo/kudo-fw-utility/kudo-cpld-update.bb
+++ b/meta-fii/meta-kudo/recipes-kudo/kudo-fw-utility/kudo-cpld-update.bb
@@ -10,13 +10,13 @@
DEPENDS += "systemd"
DEPENDS += "phosphor-ipmi-flash"
-RDEPENDS_${PN} += "libsystemd"
-RDEPENDS_${PN} += "bash"
+RDEPENDS:${PN} += "libsystemd"
+RDEPENDS:${PN} += "bash"
-FILES_${PN} += "${datadir}/phosphor-ipmi-flash/config-bmccpld.json"
-FILES_${PN} += "${datadir}/phosphor-ipmi-flash/config-mbcpld.json"
+FILES:${PN} += "${datadir}/phosphor-ipmi-flash/config-bmccpld.json"
+FILES:${PN} += "${datadir}/phosphor-ipmi-flash/config-mbcpld.json"
-SRC_URI_append_kudo = " \
+SRC_URI:append:kudo = " \
file://phosphor-ipmi-flash-bmccpld-update.service \
file://phosphor-ipmi-flash-mbcpld-update.service \
file://config-bmccpld.json \
@@ -24,7 +24,7 @@
"
SYSTEMD_PACKAGES = "${PN}"
-SYSTEMD_SERVICE_${PN}_append_kudo = " \
+SYSTEMD_SERVICE:${PN}:append:kudo = " \
phosphor-ipmi-flash-bmccpld-update.service \
phosphor-ipmi-flash-mbcpld-update.service \
"
@@ -36,4 +36,4 @@
install -d ${D}${systemd_system_unitdir}
install -m 0644 ${WORKDIR}/phosphor-ipmi-flash-bmccpld-update.service ${D}${systemd_system_unitdir}
install -m 0644 ${WORKDIR}/phosphor-ipmi-flash-mbcpld-update.service ${D}${systemd_system_unitdir}
-}
\ No newline at end of file
+}
diff --git a/meta-fii/meta-kudo/recipes-kudo/kudo-fw-utility/kudo-fw.bb b/meta-fii/meta-kudo/recipes-kudo/kudo-fw-utility/kudo-fw.bb
index 03ce088..28d276f 100644
--- a/meta-fii/meta-kudo/recipes-kudo/kudo-fw-utility/kudo-fw.bb
+++ b/meta-fii/meta-kudo/recipes-kudo/kudo-fw-utility/kudo-fw.bb
@@ -10,8 +10,8 @@
DEPENDS += "systemd"
DEPENDS += "phosphor-ipmi-flash"
-RDEPENDS_${PN} += "libsystemd"
-RDEPENDS_${PN} += "bash"
+RDEPENDS:${PN} += "libsystemd"
+RDEPENDS:${PN} += "bash"
SRC_URI = " \
@@ -22,7 +22,7 @@
"
SYSTEMD_PACKAGES = "${PN}"
-SYSTEMD_SERVICE_${PN} = " \
+SYSTEMD_SERVICE:${PN} = " \
kudo-fw-ver.service \
"
diff --git a/meta-fii/meta-kudo/recipes-kudo/kudo-fw-utility/kudo-scp-update.bb b/meta-fii/meta-kudo/recipes-kudo/kudo-fw-utility/kudo-scp-update.bb
index 2c82ac8..70c40e6 100644
--- a/meta-fii/meta-kudo/recipes-kudo/kudo-fw-utility/kudo-scp-update.bb
+++ b/meta-fii/meta-kudo/recipes-kudo/kudo-fw-utility/kudo-scp-update.bb
@@ -10,13 +10,13 @@
DEPENDS += "systemd"
DEPENDS += "phosphor-ipmi-flash"
-RDEPENDS_${PN} += "libsystemd"
-RDEPENDS_${PN} += "bash"
+RDEPENDS:${PN} += "libsystemd"
+RDEPENDS:${PN} += "bash"
-FILES_${PN} += "${datadir}/phosphor-ipmi-flash/config-scp.json"
-FILES_${PN} += "${datadir}/phosphor-ipmi-flash/config-scpback.json"
+FILES:${PN} += "${datadir}/phosphor-ipmi-flash/config-scp.json"
+FILES:${PN} += "${datadir}/phosphor-ipmi-flash/config-scpback.json"
-SRC_URI_append_kudo = " \
+SRC_URI:append:kudo = " \
file://phosphor-ipmi-flash-scp-update.service \
file://phosphor-ipmi-flash-scpback-update.service \
file://config-scp.json \
@@ -24,7 +24,7 @@
"
SYSTEMD_PACKAGES = "${PN}"
-SYSTEMD_SERVICE_${PN}_append_kudo = " \
+SYSTEMD_SERVICE:${PN}:append:kudo = " \
phosphor-ipmi-flash-scp-update.service \
phosphor-ipmi-flash-scpback-update.service \
"
diff --git a/meta-fii/meta-kudo/recipes-kudo/kudo-sys-utility/kudo-boot.bb b/meta-fii/meta-kudo/recipes-kudo/kudo-sys-utility/kudo-boot.bb
index 87e4f74..c800f26 100644
--- a/meta-fii/meta-kudo/recipes-kudo/kudo-sys-utility/kudo-boot.bb
+++ b/meta-fii/meta-kudo/recipes-kudo/kudo-sys-utility/kudo-boot.bb
@@ -9,8 +9,8 @@
inherit obmc-phosphor-systemd
DEPENDS += "systemd"
-RDEPENDS_${PN} += "libsystemd"
-RDEPENDS_${PN} += "bash"
+RDEPENDS:${PN} += "libsystemd"
+RDEPENDS:${PN} += "bash"
SRC_URI = " \
file://init_once.sh \
@@ -18,7 +18,7 @@
"
SYSTEMD_PACKAGES = "${PN}"
-SYSTEMD_SERVICE_${PN} = " \
+SYSTEMD_SERVICE:${PN} = " \
host-powerctrl.service \
"
diff --git a/meta-fii/meta-kudo/recipes-kudo/kudo-sys-utility/kudo-cmd.bb b/meta-fii/meta-kudo/recipes-kudo/kudo-sys-utility/kudo-cmd.bb
index f4e0bb0..324bd64 100644
--- a/meta-fii/meta-kudo/recipes-kudo/kudo-sys-utility/kudo-cmd.bb
+++ b/meta-fii/meta-kudo/recipes-kudo/kudo-sys-utility/kudo-cmd.bb
@@ -5,7 +5,7 @@
LICENSE = "Apache-2.0"
LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/Apache-2.0;md5=89aea4e17d99a7cacdbeed46a0096b10"
-RDEPENDS_${PN} += "bash"
+RDEPENDS:${PN} += "bash"
SRC_URI = " \
file://kudo.sh \
diff --git a/meta-fii/meta-kudo/recipes-kudo/kudo-system/kudo-entity-association-map.bb b/meta-fii/meta-kudo/recipes-kudo/kudo-system/kudo-entity-association-map.bb
index 85006da..0b0ac37 100644
--- a/meta-fii/meta-kudo/recipes-kudo/kudo-system/kudo-entity-association-map.bb
+++ b/meta-fii/meta-kudo/recipes-kudo/kudo-system/kudo-entity-association-map.bb
@@ -5,7 +5,7 @@
SRC_URI += "file://kudo_entity_association_map.json"
-FILES_${PN} = " \
+FILES:${PN} = " \
${datadir}/ipmi-entity-association/entity_association_map.json \
"
diff --git a/meta-fii/meta-kudo/recipes-kudo/network/usb-network.bb b/meta-fii/meta-kudo/recipes-kudo/network/usb-network.bb
index 249e454..6e7be67 100644
--- a/meta-fii/meta-kudo/recipes-kudo/network/usb-network.bb
+++ b/meta-fii/meta-kudo/recipes-kudo/network/usb-network.bb
@@ -4,18 +4,18 @@
inherit allarch systemd
DEPENDS += "systemd"
-RDEPENDS_${PN} += "libsystemd"
-RDEPENDS_${PN} += "bash"
+RDEPENDS:${PN} += "libsystemd"
+RDEPENDS:${PN} += "bash"
-SRC_URI_append += " \
+SRC_URI:append += " \
file://usb_network.sh \
file://usb_network.service \
file://00-bmc-usb0.network \
"
SYSTEMD_PACKAGES = "${PN}"
-SYSTEMD_SERVICE_${PN}_append = " usb_network.service"
-FILES_${PN} += "${sysconfdir_native}/systemd/network/00-bmc-usb0.network"
+SYSTEMD_SERVICE:${PN}:append = " usb_network.service"
+FILES:${PN} += "${sysconfdir_native}/systemd/network/00-bmc-usb0.network"
do_install() {
install -d ${D}/${sbindir}
diff --git a/meta-fii/meta-kudo/recipes-kudo/packagegroups/packagegroup-kudo-apps.bb b/meta-fii/meta-kudo/recipes-kudo/packagegroups/packagegroup-kudo-apps.bb
index cc32052..a46e3a0 100644
--- a/meta-fii/meta-kudo/recipes-kudo/packagegroups/packagegroup-kudo-apps.bb
+++ b/meta-fii/meta-kudo/recipes-kudo/packagegroups/packagegroup-kudo-apps.bb
@@ -14,20 +14,20 @@
PROVIDES += "virtual/obmc-system-mgmt"
PROVIDES += "virtual/obmc-fan-mgmt"
-RPROVIDES_${PN}-kudo-system += "virtual-obmc-system-mgmt"
-RPROVIDES_${PN}-kudo-fw += "virtual-obmc-flash-mgmt"
-RPROVIDES_${PN}-fan-mgmt += "virtual-obmc-fan-mgmt"
+RPROVIDES:${PN}-kudo-system += "virtual-obmc-system-mgmt"
+RPROVIDES:${PN}-kudo-fw += "virtual-obmc-flash-mgmt"
+RPROVIDES:${PN}-fan-mgmt += "virtual-obmc-fan-mgmt"
-SUMMARY_${PN}-kudo-chassis = "kudo chassis"
-RDEPENDS_${PN}-kudo-chassis = " \
+SUMMARY:${PN}-kudo-chassis = "kudo chassis"
+RDEPENDS:${PN}-kudo-chassis = " \
phosphor-hostlogger \
obmc-op-control-power \
obmc-phosphor-buttons-signals \
obmc-phosphor-buttons-handler \
"
-SUMMARY_${PN}-kudo-system = "kudo System"
-RDEPENDS_${PN}-kudo-system = " \
+SUMMARY:${PN}-kudo-system = "kudo System"
+RDEPENDS:${PN}-kudo-system = " \
ipmitool \
ethtool \
memtester \
@@ -44,8 +44,8 @@
phosphor-state-manager \
"
-SUMMARY_${PN}-kudo-fw = "kudo Firmware"
-RDEPENDS_${PN}-kudo-fw = " \
+SUMMARY:${PN}-kudo-fw = "kudo Firmware"
+RDEPENDS:${PN}-kudo-fw = " \
kudo-fw \
kudo-bios-update \
kudo-bmc-update \
@@ -53,8 +53,8 @@
kudo-scp-update \
"
-SUMMARY_${PN}-fan-mgmt = "kudo fan mgmt"
-RDEPENDS_${PN}-fan-mgmt = " \
+SUMMARY:${PN}-fan-mgmt = "kudo fan mgmt"
+RDEPENDS:${PN}-fan-mgmt = " \
pwm-init \
phosphor-pid-control \
"