ibm: fans: Replace rainier with p10bmc
The IBM rainier machine name is being replaced with the generic p10bmc.
Tested: Built rainier and verified the fan files were installed, ex:
obmc-phosphor-image/1.0-r0/rootfs/usr/share/phosphor-fan-presence/control/ibm,rainier-4u/zones.json
obmc-phosphor-image/1.0-r0/rootfs/usr/share/phosphor-fan-presence/control/ibm,rainier-2u/zones.json
obmc-phosphor-image/1.0-r0/rootfs/usr/share/phosphor-fan-presence/control/ibm,everest/zones.json
Change-Id: I10edb9e30716cffa3f510fe94822eadb08326912
Signed-off-by: Adriana Kobylak <anoo@us.ibm.com>
diff --git a/meta-ibm/recipes-phosphor/dbus/fan-policy.bb b/meta-ibm/recipes-phosphor/dbus/fan-policy.bb
index 59e6347..8bfecd3 100644
--- a/meta-ibm/recipes-phosphor/dbus/fan-policy.bb
+++ b/meta-ibm/recipes-phosphor/dbus/fan-policy.bb
@@ -12,8 +12,8 @@
SRC_URI_append_ibm-ac-server = " file://water-cooled.yaml"
SRC_URI += "file://fan-errors.yaml"
-SRC_URI_remove_rainier = "file://air-cooled.yaml"
-SRC_URI_remove_rainier = "file://fan-errors.yaml"
+SRC_URI_remove_p10bmc = "file://air-cooled.yaml"
+SRC_URI_remove_p10bmc = "file://fan-errors.yaml"
do_install_append_ibm-ac-server() {
install -D ${WORKDIR}/air-cooled.yaml ${D}${config_dir}/air-cooled.yaml
@@ -30,5 +30,5 @@
FILES_${PN}_append_ibm-ac-server = " ${config_dir}/water-cooled.yaml"
FILES_${PN} += "${config_dir}/fan-errors.yaml"
-FILES_${PN}_remove_rainier = "${config_dir}/air-cooled.yaml"
-FILES_${PN}_remove_rainier = "${config_dir}/fan-errors.yaml"
+FILES_${PN}_remove_p10bmc = "${config_dir}/air-cooled.yaml"
+FILES_${PN}_remove_p10bmc = "${config_dir}/fan-errors.yaml"
diff --git a/meta-ibm/recipes-phosphor/fans/fan-watchdog/rainier/obmc/fan-watchdog/fan-watchdog.conf b/meta-ibm/recipes-phosphor/fans/fan-watchdog/p10bmc/obmc/fan-watchdog/fan-watchdog.conf
similarity index 100%
rename from meta-ibm/recipes-phosphor/fans/fan-watchdog/rainier/obmc/fan-watchdog/fan-watchdog.conf
rename to meta-ibm/recipes-phosphor/fans/fan-watchdog/p10bmc/obmc/fan-watchdog/fan-watchdog.conf
diff --git a/meta-ibm/recipes-phosphor/fans/fan-watchdog/rainier/obmc/fan-watchdog/reset-fan-watchdog.conf b/meta-ibm/recipes-phosphor/fans/fan-watchdog/p10bmc/obmc/fan-watchdog/reset-fan-watchdog.conf
similarity index 100%
rename from meta-ibm/recipes-phosphor/fans/fan-watchdog/rainier/obmc/fan-watchdog/reset-fan-watchdog.conf
rename to meta-ibm/recipes-phosphor/fans/fan-watchdog/p10bmc/obmc/fan-watchdog/reset-fan-watchdog.conf
diff --git a/meta-ibm/recipes-phosphor/fans/phosphor-fan-monitor-config.bbappend b/meta-ibm/recipes-phosphor/fans/phosphor-fan-monitor-config.bbappend
index 8b63927..2c15e03 100644
--- a/meta-ibm/recipes-phosphor/fans/phosphor-fan-monitor-config.bbappend
+++ b/meta-ibm/recipes-phosphor/fans/phosphor-fan-monitor-config.bbappend
@@ -1,7 +1,7 @@
FILESEXTRAPATHS_prepend := "${THISDIR}/${BPN}:"
SRC_URI_witherspoon = "file://config.json"
-SRC_URI_rainier = "file://rainier-2u/config.json \
+SRC_URI_p10bmc = "file://rainier-2u/config.json \
file://rainier-4u/config.json \
file://rainier-1s4u/config.json \
file://everest/config.json \
@@ -12,7 +12,7 @@
install -m 0644 ${WORKDIR}/config.json ${D}/${datadir}/phosphor-fan-presence/monitor/
}
-do_install_rainier() {
+do_install_p10bmc() {
# Install Rainier-2U/4U fan monitor config files
install -d ${D}/${datadir}/phosphor-fan-presence/monitor/ibm,rainier-2u/
install -d ${D}/${datadir}/phosphor-fan-presence/monitor/ibm,rainier-4u/
@@ -29,8 +29,8 @@
FILES_${PN}_append_witherspoon = " ${datadir}/phosphor-fan-presence/monitor/config.json"
FILES_${PN}_remove_witherspoon = "${monitor_datadir}/monitor.yaml"
-FILES_${PN}_remove_rainier = "${monitor_datadir}/monitor.yaml"
-FILES_${PN}_append_rainier = " ${datadir}/phosphor-fan-presence/monitor/ibm,rainier-2u/config.json"
-FILES_${PN}_append_rainier = " ${datadir}/phosphor-fan-presence/monitor/ibm,rainier-4u/config.json"
-FILES_${PN}_append_rainier = " ${datadir}/phosphor-fan-presence/monitor/ibm,rainier-1s4u/config.json"
-FILES_${PN}_append_rainier = " ${datadir}/phosphor-fan-presence/monitor/ibm,everest/config.json"
+FILES_${PN}_remove_p10bmc = "${monitor_datadir}/monitor.yaml"
+FILES_${PN}_append_p10bmc = " ${datadir}/phosphor-fan-presence/monitor/ibm,rainier-2u/config.json"
+FILES_${PN}_append_p10bmc = " ${datadir}/phosphor-fan-presence/monitor/ibm,rainier-4u/config.json"
+FILES_${PN}_append_p10bmc = " ${datadir}/phosphor-fan-presence/monitor/ibm,rainier-1s4u/config.json"
+FILES_${PN}_append_p10bmc = " ${datadir}/phosphor-fan-presence/monitor/ibm,everest/config.json"
diff --git a/meta-ibm/recipes-phosphor/fans/phosphor-fan-monitor-config/rainier/everest/config.json b/meta-ibm/recipes-phosphor/fans/phosphor-fan-monitor-config/p10bmc/everest/config.json
similarity index 100%
rename from meta-ibm/recipes-phosphor/fans/phosphor-fan-monitor-config/rainier/everest/config.json
rename to meta-ibm/recipes-phosphor/fans/phosphor-fan-monitor-config/p10bmc/everest/config.json
diff --git a/meta-ibm/recipes-phosphor/fans/phosphor-fan-monitor-config/rainier/rainier-1s4u/config.json b/meta-ibm/recipes-phosphor/fans/phosphor-fan-monitor-config/p10bmc/rainier-1s4u/config.json
similarity index 100%
rename from meta-ibm/recipes-phosphor/fans/phosphor-fan-monitor-config/rainier/rainier-1s4u/config.json
rename to meta-ibm/recipes-phosphor/fans/phosphor-fan-monitor-config/p10bmc/rainier-1s4u/config.json
diff --git a/meta-ibm/recipes-phosphor/fans/phosphor-fan-monitor-config/rainier/rainier-2u/config.json b/meta-ibm/recipes-phosphor/fans/phosphor-fan-monitor-config/p10bmc/rainier-2u/config.json
similarity index 100%
rename from meta-ibm/recipes-phosphor/fans/phosphor-fan-monitor-config/rainier/rainier-2u/config.json
rename to meta-ibm/recipes-phosphor/fans/phosphor-fan-monitor-config/p10bmc/rainier-2u/config.json
diff --git a/meta-ibm/recipes-phosphor/fans/phosphor-fan-monitor-config/rainier/rainier-4u/config.json b/meta-ibm/recipes-phosphor/fans/phosphor-fan-monitor-config/p10bmc/rainier-4u/config.json
similarity index 100%
rename from meta-ibm/recipes-phosphor/fans/phosphor-fan-monitor-config/rainier/rainier-4u/config.json
rename to meta-ibm/recipes-phosphor/fans/phosphor-fan-monitor-config/p10bmc/rainier-4u/config.json
diff --git a/meta-ibm/recipes-phosphor/fans/phosphor-fan-presence-config.bbappend b/meta-ibm/recipes-phosphor/fans/phosphor-fan-presence-config.bbappend
index 8817592..2306ee5 100644
--- a/meta-ibm/recipes-phosphor/fans/phosphor-fan-presence-config.bbappend
+++ b/meta-ibm/recipes-phosphor/fans/phosphor-fan-presence-config.bbappend
@@ -1,7 +1,7 @@
FILESEXTRAPATHS_prepend := "${THISDIR}/${BPN}:"
SRC_URI_witherspoon = "file://config.json"
-SRC_URI_rainier = "file://rainier-2u/config.json \
+SRC_URI_p10bmc = "file://rainier-2u/config.json \
file://rainier-4u/config.json \
file://rainier-1s4u/config.json \
file://everest/config.json \
@@ -11,7 +11,7 @@
install -d ${D}/${datadir}/phosphor-fan-presence/presence/
install -m 0644 ${WORKDIR}/config.json ${D}/${datadir}/phosphor-fan-presence/presence/
}
-do_install_rainier() {
+do_install_p10bmc() {
# Install Rainier-2U/4U fan presence config files
install -d ${D}/${datadir}/phosphor-fan-presence/presence/ibm,rainier-2u/
install -d ${D}/${datadir}/phosphor-fan-presence/presence/ibm,rainier-4u/
@@ -28,8 +28,8 @@
FILES_${PN}_append_witherspoon = " ${datadir}/phosphor-fan-presence/presence/config.json"
FILES_${PN}_remove_witherspoon = "${presence_datadir}/config.yaml"
-FILES_${PN}_remove_rainier = "${presence_datadir}/config.yaml"
-FILES_${PN}_append_rainier = " ${datadir}/phosphor-fan-presence/presence/ibm,rainier-2u/config.json"
-FILES_${PN}_append_rainier = " ${datadir}/phosphor-fan-presence/presence/ibm,rainier-4u/config.json"
-FILES_${PN}_append_rainier = " ${datadir}/phosphor-fan-presence/presence/ibm,rainier-1s4u/config.json"
-FILES_${PN}_append_rainier = " ${datadir}/phosphor-fan-presence/presence/ibm,everest/config.json"
+FILES_${PN}_remove_p10bmc = "${presence_datadir}/config.yaml"
+FILES_${PN}_append_p10bmc = " ${datadir}/phosphor-fan-presence/presence/ibm,rainier-2u/config.json"
+FILES_${PN}_append_p10bmc = " ${datadir}/phosphor-fan-presence/presence/ibm,rainier-4u/config.json"
+FILES_${PN}_append_p10bmc = " ${datadir}/phosphor-fan-presence/presence/ibm,rainier-1s4u/config.json"
+FILES_${PN}_append_p10bmc = " ${datadir}/phosphor-fan-presence/presence/ibm,everest/config.json"
diff --git a/meta-ibm/recipes-phosphor/fans/phosphor-fan-presence-config/rainier/everest/config.json b/meta-ibm/recipes-phosphor/fans/phosphor-fan-presence-config/p10bmc/everest/config.json
similarity index 100%
rename from meta-ibm/recipes-phosphor/fans/phosphor-fan-presence-config/rainier/everest/config.json
rename to meta-ibm/recipes-phosphor/fans/phosphor-fan-presence-config/p10bmc/everest/config.json
diff --git a/meta-ibm/recipes-phosphor/fans/phosphor-fan-presence-config/rainier/rainier-1s4u/config.json b/meta-ibm/recipes-phosphor/fans/phosphor-fan-presence-config/p10bmc/rainier-1s4u/config.json
similarity index 100%
rename from meta-ibm/recipes-phosphor/fans/phosphor-fan-presence-config/rainier/rainier-1s4u/config.json
rename to meta-ibm/recipes-phosphor/fans/phosphor-fan-presence-config/p10bmc/rainier-1s4u/config.json
diff --git a/meta-ibm/recipes-phosphor/fans/phosphor-fan-presence-config/rainier/rainier-2u/config.json b/meta-ibm/recipes-phosphor/fans/phosphor-fan-presence-config/p10bmc/rainier-2u/config.json
similarity index 100%
rename from meta-ibm/recipes-phosphor/fans/phosphor-fan-presence-config/rainier/rainier-2u/config.json
rename to meta-ibm/recipes-phosphor/fans/phosphor-fan-presence-config/p10bmc/rainier-2u/config.json
diff --git a/meta-ibm/recipes-phosphor/fans/phosphor-fan-presence-config/rainier/rainier-4u/config.json b/meta-ibm/recipes-phosphor/fans/phosphor-fan-presence-config/p10bmc/rainier-4u/config.json
similarity index 100%
rename from meta-ibm/recipes-phosphor/fans/phosphor-fan-presence-config/rainier/rainier-4u/config.json
rename to meta-ibm/recipes-phosphor/fans/phosphor-fan-presence-config/p10bmc/rainier-4u/config.json
diff --git a/meta-ibm/recipes-phosphor/fans/phosphor-fan/rainier/everest/fans.json b/meta-ibm/recipes-phosphor/fans/phosphor-fan/p10bmc/everest/fans.json
similarity index 100%
rename from meta-ibm/recipes-phosphor/fans/phosphor-fan/rainier/everest/fans.json
rename to meta-ibm/recipes-phosphor/fans/phosphor-fan/p10bmc/everest/fans.json
diff --git a/meta-ibm/recipes-phosphor/fans/phosphor-fan/rainier/everest/zones.json b/meta-ibm/recipes-phosphor/fans/phosphor-fan/p10bmc/everest/zones.json
similarity index 100%
rename from meta-ibm/recipes-phosphor/fans/phosphor-fan/rainier/everest/zones.json
rename to meta-ibm/recipes-phosphor/fans/phosphor-fan/p10bmc/everest/zones.json
diff --git a/meta-ibm/recipes-phosphor/fans/phosphor-fan/rainier/manager.json b/meta-ibm/recipes-phosphor/fans/phosphor-fan/p10bmc/manager.json
similarity index 100%
rename from meta-ibm/recipes-phosphor/fans/phosphor-fan/rainier/manager.json
rename to meta-ibm/recipes-phosphor/fans/phosphor-fan/p10bmc/manager.json
diff --git a/meta-ibm/recipes-phosphor/fans/phosphor-fan/rainier/rainier-1s4u/fans.json b/meta-ibm/recipes-phosphor/fans/phosphor-fan/p10bmc/rainier-1s4u/fans.json
similarity index 100%
rename from meta-ibm/recipes-phosphor/fans/phosphor-fan/rainier/rainier-1s4u/fans.json
rename to meta-ibm/recipes-phosphor/fans/phosphor-fan/p10bmc/rainier-1s4u/fans.json
diff --git a/meta-ibm/recipes-phosphor/fans/phosphor-fan/rainier/rainier-1s4u/zones.json b/meta-ibm/recipes-phosphor/fans/phosphor-fan/p10bmc/rainier-1s4u/zones.json
similarity index 100%
rename from meta-ibm/recipes-phosphor/fans/phosphor-fan/rainier/rainier-1s4u/zones.json
rename to meta-ibm/recipes-phosphor/fans/phosphor-fan/p10bmc/rainier-1s4u/zones.json
diff --git a/meta-ibm/recipes-phosphor/fans/phosphor-fan/rainier/rainier-2u/zones.json b/meta-ibm/recipes-phosphor/fans/phosphor-fan/p10bmc/rainier-2u/zones.json
similarity index 100%
rename from meta-ibm/recipes-phosphor/fans/phosphor-fan/rainier/rainier-2u/zones.json
rename to meta-ibm/recipes-phosphor/fans/phosphor-fan/p10bmc/rainier-2u/zones.json
diff --git a/meta-ibm/recipes-phosphor/fans/phosphor-fan/rainier/rainier-4u/zones.json b/meta-ibm/recipes-phosphor/fans/phosphor-fan/p10bmc/rainier-4u/zones.json
similarity index 100%
rename from meta-ibm/recipes-phosphor/fans/phosphor-fan/rainier/rainier-4u/zones.json
rename to meta-ibm/recipes-phosphor/fans/phosphor-fan/p10bmc/rainier-4u/zones.json
diff --git a/meta-ibm/recipes-phosphor/fans/phosphor-fan/rainier/rainier/fans.json b/meta-ibm/recipes-phosphor/fans/phosphor-fan/p10bmc/rainier/fans.json
similarity index 100%
rename from meta-ibm/recipes-phosphor/fans/phosphor-fan/rainier/rainier/fans.json
rename to meta-ibm/recipes-phosphor/fans/phosphor-fan/p10bmc/rainier/fans.json
diff --git a/meta-ibm/recipes-phosphor/fans/phosphor-fan_%.bbappend b/meta-ibm/recipes-phosphor/fans/phosphor-fan_%.bbappend
index bc04bda..7de4216 100644
--- a/meta-ibm/recipes-phosphor/fans/phosphor-fan_%.bbappend
+++ b/meta-ibm/recipes-phosphor/fans/phosphor-fan_%.bbappend
@@ -34,16 +34,16 @@
SYSTEMD_OVERRIDE_phosphor-fan-control_witherspoon += "fan-watchdog-monitor.conf:phosphor-fan-control@0.service.d/fan-watchdog-monitor.conf"
SYSTEMD_OVERRIDE_phosphor-fan-monitor_witherspoon += "fan-watchdog-monitor.conf:phosphor-fan-monitor-init@0.service.d/fan-watchdog-monitor.conf"
SYSTEMD_OVERRIDE_phosphor-fan-monitor_witherspoon += "fan-watchdog-monitor.conf:phosphor-fan-monitor@0.service.d/fan-watchdog-monitor.conf"
-SYSTEMD_OVERRIDE_phosphor-fan-control_rainier += "fan-watchdog-monitor.conf:phosphor-fan-control-init@0.service.d/fan-watchdog-monitor.conf"
-SYSTEMD_OVERRIDE_phosphor-fan-control_rainier += "fan-watchdog-monitor.conf:phosphor-fan-control@0.service.d/fan-watchdog-monitor.conf"
-SYSTEMD_OVERRIDE_phosphor-fan-monitor_rainier += "fan-watchdog-monitor.conf:phosphor-fan-monitor-init@0.service.d/fan-watchdog-monitor.conf"
-SYSTEMD_OVERRIDE_phosphor-fan-monitor_rainier += "fan-watchdog-monitor.conf:phosphor-fan-monitor@0.service.d/fan-watchdog-monitor.conf"
+SYSTEMD_OVERRIDE_phosphor-fan-control_p10bmc += "fan-watchdog-monitor.conf:phosphor-fan-control-init@0.service.d/fan-watchdog-monitor.conf"
+SYSTEMD_OVERRIDE_phosphor-fan-control_p10bmc += "fan-watchdog-monitor.conf:phosphor-fan-control@0.service.d/fan-watchdog-monitor.conf"
+SYSTEMD_OVERRIDE_phosphor-fan-monitor_p10bmc += "fan-watchdog-monitor.conf:phosphor-fan-monitor-init@0.service.d/fan-watchdog-monitor.conf"
+SYSTEMD_OVERRIDE_phosphor-fan-monitor_p10bmc += "fan-watchdog-monitor.conf:phosphor-fan-monitor@0.service.d/fan-watchdog-monitor.conf"
#These services need to be stopped when watchdog expires
SYSTEMD_OVERRIDE_phosphor-fan-control_witherspoon += "fan-watchdog-conflicts.conf:phosphor-fan-control@0.service.d/fan-watchdog-conflicts.conf"
SYSTEMD_OVERRIDE_phosphor-fan-monitor_witherspoon += "fan-watchdog-conflicts.conf:phosphor-fan-monitor@0.service.d/fan-watchdog-conflicts.conf"
-SYSTEMD_OVERRIDE_phosphor-fan-control_rainier += "fan-watchdog-conflicts.conf:phosphor-fan-control@0.service.d/fan-watchdog-conflicts.conf"
-SYSTEMD_OVERRIDE_phosphor-fan-monitor_rainier += "fan-watchdog-conflicts.conf:phosphor-fan-monitor@0.service.d/fan-watchdog-conflicts.conf"
+SYSTEMD_OVERRIDE_phosphor-fan-control_p10bmc += "fan-watchdog-conflicts.conf:phosphor-fan-control@0.service.d/fan-watchdog-conflicts.conf"
+SYSTEMD_OVERRIDE_phosphor-fan-monitor_p10bmc += "fan-watchdog-conflicts.conf:phosphor-fan-monitor@0.service.d/fan-watchdog-conflicts.conf"
# Witherspoon fan control service linking
# Link fan control init service
@@ -61,13 +61,13 @@
RDEPENDS_${PN}-presence-tach_append_witherspoon = " phosphor-fan-presence-config"
RDEPENDS_${PN}-monitor_append_witherspoon = " phosphor-fan-monitor-config"
-PACKAGECONFIG_append_rainier = " json sensor-monitor"
-FAN_PACKAGES_append_rainier = " sensor-monitor"
-RDEPENDS_${PN}-presence-tach_append_rainier = " phosphor-fan-presence-config"
-RDEPENDS_${PN}-monitor_append_rainier = " phosphor-fan-monitor-config"
+PACKAGECONFIG_append_p10bmc = " json sensor-monitor"
+FAN_PACKAGES_append_p10bmc = " sensor-monitor"
+RDEPENDS_${PN}-presence-tach_append_p10bmc = " phosphor-fan-presence-config"
+RDEPENDS_${PN}-monitor_append_p10bmc = " phosphor-fan-monitor-config"
# Install fan control JSON config files
-SRC_URI_append_rainier = " \
+SRC_URI_append_p10bmc = " \
file://manager.json \
file://rainier/fans.json \
file://rainier-1s4u/fans.json \
@@ -76,7 +76,7 @@
file://rainier-1s4u/zones.json \
file://everest/fans.json \
file://everest/zones.json"
-do_install_append_rainier() {
+do_install_append_p10bmc() {
# Install fan control manager config file
install -d ${D}/${datadir}/phosphor-fan-presence/control/
install -m 0644 ${WORKDIR}/manager.json ${D}/${datadir}/phosphor-fan-presence/control/
@@ -99,7 +99,7 @@
install -m 0644 ${WORKDIR}/everest/fans.json ${D}/${datadir}/phosphor-fan-presence/control/ibm,everest/
install -m 0644 ${WORKDIR}/everest/zones.json ${D}/${datadir}/phosphor-fan-presence/control/ibm,everest/
}
-FILES_${PN}-control_append_rainier = " \
+FILES_${PN}-control_append_p10bmc = " \
${datadir}/phosphor-fan-presence/control/manager.json \
${datadir}/phosphor-fan-presence/control/ibm,rainier/fans.json \
${datadir}/phosphor-fan-presence/control/ibm,rainier-1s4u/fans.json \