ibm: power: Replace rainier with p10bmc
The IBM rainier machine name is being replaced with the generic p10bmc.
Change-Id: I8dece8c720fd520de7a6857a7311b62a65c054ba
Signed-off-by: Adriana Kobylak <anoo@us.ibm.com>
diff --git a/meta-ibm/recipes-phosphor/power/phosphor-power/rainier/psu.json b/meta-ibm/recipes-phosphor/power/phosphor-power/p10bmc/psu.json
similarity index 100%
rename from meta-ibm/recipes-phosphor/power/phosphor-power/rainier/psu.json
rename to meta-ibm/recipes-phosphor/power/phosphor-power/p10bmc/psu.json
diff --git a/meta-ibm/recipes-phosphor/power/phosphor-power_%.bbappend b/meta-ibm/recipes-phosphor/power/phosphor-power_%.bbappend
index 3c652ce..c8084b3 100644
--- a/meta-ibm/recipes-phosphor/power/phosphor-power_%.bbappend
+++ b/meta-ibm/recipes-phosphor/power/phosphor-power_%.bbappend
@@ -5,11 +5,11 @@
SRC_URI += "file://psu.json"
EXTRA_OEMESON_append_ibm-ac-server = " -Ducd90160-yaml=${STAGING_DIR_HOST}${datadir}/power-sequencer/ucd90160.yaml"
-EXTRA_OEMESON_append_rainier = " -Ducd90160-yaml=${STAGING_DIR_HOST}${datadir}/power-sequencer/ucd90160.yaml -Dibm-vpd=true"
+EXTRA_OEMESON_append_p10bmc = " -Ducd90160-yaml=${STAGING_DIR_HOST}${datadir}/power-sequencer/ucd90160.yaml -Dibm-vpd=true"
EXTRA_OEMESON_append_mihawk = " -Dpower_sequencer=mihawk-cpld"
DEPENDS_append_ibm-ac-server = " power-sequencer"
-DEPENDS_append_rainier = " power-sequencer"
+DEPENDS_append_p10bmc = " power-sequencer"
do_install_append(){
install -D ${WORKDIR}/psu.json ${D}${datadir}/phosphor-power/psu.json
diff --git a/meta-ibm/recipes-phosphor/power/power-sequencer.bb b/meta-ibm/recipes-phosphor/power/power-sequencer.bb
index cd58222..6fc1133 100644
--- a/meta-ibm/recipes-phosphor/power/power-sequencer.bb
+++ b/meta-ibm/recipes-phosphor/power/power-sequencer.bb
@@ -6,10 +6,10 @@
inherit allarch
SRC_URI_append_ibm-ac-server = " file://ucd90160.yaml"
-SRC_URI_append_rainier = " file://ucd90160.yaml"
+SRC_URI_append_p10bmc = " file://ucd90160.yaml"
FILES_${PN}_append_ibm-ac-server = " ${datadir}/power-sequencer/ucd90160.yaml"
-FILES_${PN}_append_rainier = " ${datadir}/power-sequencer/ucd90160.yaml"
+FILES_${PN}_append_p10bmc = " ${datadir}/power-sequencer/ucd90160.yaml"
S = "${WORKDIR}"
@@ -19,7 +19,7 @@
install -D ucd90160.yaml ${DEST}/ucd90160.yaml
}
-do_install_append_rainier() {
+do_install_append_p10bmc() {
DEST=${D}${datadir}/power-sequencer
install -D ucd90160.yaml ${DEST}/ucd90160.yaml
diff --git a/meta-ibm/recipes-phosphor/power/power-sequencer/rainier/ucd90160.yaml b/meta-ibm/recipes-phosphor/power/power-sequencer/p10bmc/ucd90160.yaml
similarity index 100%
rename from meta-ibm/recipes-phosphor/power/power-sequencer/rainier/ucd90160.yaml
rename to meta-ibm/recipes-phosphor/power/power-sequencer/p10bmc/ucd90160.yaml