summaryrefslogtreecommitdiff
path: root/meta-ampere/meta-jade/recipes-phosphor/ipmi
diff options
context:
space:
mode:
authorThang Q. Nguyen <thang@os.amperecomputing.com>2021-08-07 08:09:50 +0300
committerThang Q. Nguyen <thang@os.amperecomputing.com>2021-08-07 09:46:45 +0300
commitfa1aa4d9bba2b95f28828ad7c473b63cb66037e4 (patch)
treec7c6ac7cf6031883c14ecdabec68108e4688feee /meta-ampere/meta-jade/recipes-phosphor/ipmi
parent76a963a5f1eb2bb5adcd7fb0f81089d5e06aca1a (diff)
downloadopenbmc-fa1aa4d9bba2b95f28828ad7c473b63cb66037e4.tar.xz
meta-ampere: Cleanup for Yocto override syntax change
Run convert-overrides.py meta-ampere and update missing changes as below: - Change all _mtjade to :mtjade - Change all _${PN} to :${PN} Tested: 1. Check compilation without problem. 2. Check basic functions like switch UART mux, power control. Signed-off-by: Thang Q. Nguyen <thang@os.amperecomputing.com> Change-Id: I42038b2a98ed1951d6c770bdf49f5fc440f8163e
Diffstat (limited to 'meta-ampere/meta-jade/recipes-phosphor/ipmi')
-rw-r--r--meta-ampere/meta-jade/recipes-phosphor/ipmi/phosphor-ipmi-config.bbappend2
-rw-r--r--meta-ampere/meta-jade/recipes-phosphor/ipmi/phosphor-ipmi-fru_%.bbappend10
-rw-r--r--meta-ampere/meta-jade/recipes-phosphor/ipmi/phosphor-ipmi-host_%.bbappend12
-rw-r--r--meta-ampere/meta-jade/recipes-phosphor/ipmi/phosphor-ipmi-net_%.bbappend2
4 files changed, 13 insertions, 13 deletions
diff --git a/meta-ampere/meta-jade/recipes-phosphor/ipmi/phosphor-ipmi-config.bbappend b/meta-ampere/meta-jade/recipes-phosphor/ipmi/phosphor-ipmi-config.bbappend
index 83a929746..23358f003 100644
--- a/meta-ampere/meta-jade/recipes-phosphor/ipmi/phosphor-ipmi-config.bbappend
+++ b/meta-ampere/meta-jade/recipes-phosphor/ipmi/phosphor-ipmi-config.bbappend
@@ -1 +1 @@
-FILESEXTRAPATHS_append_mtjade := "${THISDIR}/${PN}:"
+FILESEXTRAPATHS:append:mtjade := "${THISDIR}/${PN}:"
diff --git a/meta-ampere/meta-jade/recipes-phosphor/ipmi/phosphor-ipmi-fru_%.bbappend b/meta-ampere/meta-jade/recipes-phosphor/ipmi/phosphor-ipmi-fru_%.bbappend
index be3e7fe5e..5150e2312 100644
--- a/meta-ampere/meta-jade/recipes-phosphor/ipmi/phosphor-ipmi-fru_%.bbappend
+++ b/meta-ampere/meta-jade/recipes-phosphor/ipmi/phosphor-ipmi-fru_%.bbappend
@@ -1,12 +1,12 @@
inherit obmc-phosphor-systemd
-DEPENDS_append_mtjade = " mtjade-yaml-config"
+DEPENDS:append:mtjade = " mtjade-yaml-config"
-EXTRA_OECONF_mtjade = " \
+EXTRA_OECONF:mtjade = " \
YAML_GEN=${STAGING_DIR_HOST}${datadir}/mtjade-yaml-config/ipmi-fru-read.yaml \
PROP_YAML=${STAGING_DIR_HOST}${datadir}/mtjade-yaml-config/ipmi-extra-properties.yaml \
"
-FILESEXTRAPATHS_prepend_mtjade := "${THISDIR}/${PN}:"
+FILESEXTRAPATHS:prepend:mtjade := "${THISDIR}/${PN}:"
EEPROM_NAMES = "motherboard"
@@ -16,11 +16,11 @@ EEPROMS = "${@compose_list(d, 'EEPROMFMT', 'EEPROM_NAMES')}"
EEPROMS_ESCAPED = "${@compose_list(d, 'EEPROM_ESCAPEDFMT', 'EEPROM_NAMES')}"
ENVFMT = "obmc/eeproms/{0}"
-SYSTEMD_ENVIRONMENT_FILE_${PN}_append_mtjade := "${@compose_list(d, 'ENVFMT', 'EEPROMS')}"
+SYSTEMD_ENVIRONMENT_FILE:${PN}:append:mtjade := "${@compose_list(d, 'ENVFMT', 'EEPROMS')}"
TMPL = "obmc-read-eeprom@.service"
TGT = "multi-user.target"
INSTFMT = "obmc-read-eeprom@{0}.service"
FMT = "../${TMPL}:${TGT}.wants/${INSTFMT}"
-SYSTEMD_LINK_${PN}_append_mtjade := "${@compose_list(d, 'FMT', 'EEPROMS_ESCAPED')}"
+SYSTEMD_LINK:${PN}:append:mtjade := "${@compose_list(d, 'FMT', 'EEPROMS_ESCAPED')}"
diff --git a/meta-ampere/meta-jade/recipes-phosphor/ipmi/phosphor-ipmi-host_%.bbappend b/meta-ampere/meta-jade/recipes-phosphor/ipmi/phosphor-ipmi-host_%.bbappend
index b8ea8d8d5..fce5b74eb 100644
--- a/meta-ampere/meta-jade/recipes-phosphor/ipmi/phosphor-ipmi-host_%.bbappend
+++ b/meta-ampere/meta-jade/recipes-phosphor/ipmi/phosphor-ipmi-host_%.bbappend
@@ -1,23 +1,23 @@
-FILESEXTRAPATHS_append_mtjade := "${THISDIR}/${PN}:"
+FILESEXTRAPATHS:append:mtjade := "${THISDIR}/${PN}:"
-DEPENDS_append_mtjade = " mtjade-yaml-config"
+DEPENDS:append:mtjade = " mtjade-yaml-config"
-RRECOMMENDS_${PN} += "ipmitool"
-RDEPENDS_${PN} += "bash"
+RRECOMMENDS:${PN} += "ipmitool"
+RDEPENDS:${PN} += "bash"
SRC_URI += " \
file://ampere-phosphor-softpoweroff \
file://ampere.xyz.openbmc_project.Ipmi.Internal.SoftPowerOff.service \
"
-EXTRA_OECONF_mtjade = " \
+EXTRA_OECONF:mtjade = " \
SENSOR_YAML_GEN=${STAGING_DIR_HOST}${datadir}/mtjade-yaml-config/ipmi-sensors-${MACHINE}.yaml \
FRU_YAML_GEN=${STAGING_DIR_HOST}${datadir}/mtjade-yaml-config/ipmi-fru-read.yaml \
"
AMPERE_SOFTPOWEROFF_TMPL = "ampere.xyz.openbmc_project.Ipmi.Internal.SoftPowerOff.service"
-do_install_append_mtjade(){
+do_install:append:mtjade(){
install -d ${D}${includedir}/phosphor-ipmi-host
install -m 0644 -D ${S}/selutility.hpp ${D}${includedir}/phosphor-ipmi-host
install -m 0755 ${WORKDIR}/ampere-phosphor-softpoweroff ${D}/${bindir}/phosphor-softpoweroff
diff --git a/meta-ampere/meta-jade/recipes-phosphor/ipmi/phosphor-ipmi-net_%.bbappend b/meta-ampere/meta-jade/recipes-phosphor/ipmi/phosphor-ipmi-net_%.bbappend
index 33802713d..f37f4f50e 100644
--- a/meta-ampere/meta-jade/recipes-phosphor/ipmi/phosphor-ipmi-net_%.bbappend
+++ b/meta-ampere/meta-jade/recipes-phosphor/ipmi/phosphor-ipmi-net_%.bbappend
@@ -1,7 +1,7 @@
DEFAULT_RMCPP_IFACE = "eth1"
ALT_RMCPP_IFACE = "eth0"
-SYSTEMD_SERVICE_${PN} += " \
+SYSTEMD_SERVICE:${PN} += " \
${PN}@${ALT_RMCPP_IFACE}.service \
${PN}@${ALT_RMCPP_IFACE}.socket \
"