rename obmc-op-control-power to phosphor-skeleton
This power control implementation is not specific to openpower systems
(as seen by the variety of systems including it) so rename it to
something more appropriate.
This is using code from skeleton which is not ideal but that's a change
for another day.
Signed-off-by: Andrew Geissler <geissonator@yahoo.com>
Change-Id: Iffe6427b5494558b53cd6f5716a08cce82cb90d8
diff --git a/meta-ampere/meta-jade/recipes-ampere/packagegroups/packagegroup-ampere-apps.bb b/meta-ampere/meta-jade/recipes-ampere/packagegroups/packagegroup-ampere-apps.bb
index 7086190..ce873d9 100644
--- a/meta-ampere/meta-jade/recipes-ampere/packagegroups/packagegroup-ampere-apps.bb
+++ b/meta-ampere/meta-jade/recipes-ampere/packagegroups/packagegroup-ampere-apps.bb
@@ -23,7 +23,7 @@
RDEPENDS:${PN}-chassis = " \
obmc-phosphor-buttons-signals \
obmc-phosphor-buttons-handler \
- obmc-op-control-power \
+ phosphor-skelton-control-power \
ampere-hostctrl \
phosphor-hostlogger \
phosphor-sel-logger \
diff --git a/meta-ampere/meta-mitchell/recipes-ampere/packagegroups/packagegroup-obmc-ampere-apps.bb b/meta-ampere/meta-mitchell/recipes-ampere/packagegroups/packagegroup-obmc-ampere-apps.bb
index 08c59ea..2960d8a 100644
--- a/meta-ampere/meta-mitchell/recipes-ampere/packagegroups/packagegroup-obmc-ampere-apps.bb
+++ b/meta-ampere/meta-mitchell/recipes-ampere/packagegroups/packagegroup-obmc-ampere-apps.bb
@@ -22,7 +22,7 @@
RDEPENDS:${PN}-chassis = " \
obmc-phosphor-buttons-signals \
obmc-phosphor-buttons-handler \
- obmc-op-control-power \
+ phosphor-skeleton-control-power \
ampere-hostctrl \
phosphor-hostlogger \
phosphor-sel-logger \
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 60729e6..93678ef 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
@@ -22,7 +22,7 @@
SUMMARY:${PN}-kudo-chassis = "kudo chassis"
RDEPENDS:${PN}-kudo-chassis = " \
- obmc-op-control-power \
+ phosphor-skeleton-control-power \
obmc-phosphor-buttons-signals \
obmc-phosphor-buttons-handler \
"
diff --git a/meta-fii/meta-mori/recipes-phosphor/image/obmc-phosphor-image.bbappend b/meta-fii/meta-mori/recipes-phosphor/image/obmc-phosphor-image.bbappend
index 0553468..b3500b0 100644
--- a/meta-fii/meta-mori/recipes-phosphor/image/obmc-phosphor-image.bbappend
+++ b/meta-fii/meta-mori/recipes-phosphor/image/obmc-phosphor-image.bbappend
@@ -31,7 +31,7 @@
# Required from packagegroup-mori-apps
OBMC_IMAGE_EXTRA_INSTALL:append:mori = " obmc-phosphor-buttons-signals"
OBMC_IMAGE_EXTRA_INSTALL:append:mori = " obmc-phosphor-buttons-handler"
-OBMC_IMAGE_EXTRA_INSTALL:append:mori = " obmc-op-control-power"
+OBMC_IMAGE_EXTRA_INSTALL:append:mori = " phosphor-skeleton-control-power"
OBMC_IMAGE_EXTRA_INSTALL:append:mori = " ncsid"
OBMC_IMAGE_EXTRA_INSTALL:append:mori = " gbmc-mac-config"
OBMC_IMAGE_EXTRA_INSTALL:append:mori = " entity-manager"
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 9ffab18..db77bbb 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
@@ -25,7 +25,7 @@
RDEPENDS:${PN}-chassis = " \
obmc-phosphor-buttons-signals \
obmc-phosphor-buttons-handler \
- obmc-op-control-power \
+ phosphor-skeleton-control-power \
obmc-host-failure-reboots \
"
diff --git a/meta-ibm/recipes-phosphor/chassis/obmc-op-control-power_%.bbappend b/meta-ibm/recipes-phosphor/chassis/phosphor-skeleton-control-power_%.bbappend
similarity index 100%
rename from meta-ibm/recipes-phosphor/chassis/obmc-op-control-power_%.bbappend
rename to meta-ibm/recipes-phosphor/chassis/phosphor-skeleton-control-power_%.bbappend
diff --git a/meta-ibm/recipes-phosphor/chassis/obmc-op-control-power_%/ibm-ac-server/obmc/power_control b/meta-ibm/recipes-phosphor/chassis/phosphor-skeleton-control-power_%/ibm-ac-server/obmc/power_control
similarity index 100%
rename from meta-ibm/recipes-phosphor/chassis/obmc-op-control-power_%/ibm-ac-server/obmc/power_control
rename to meta-ibm/recipes-phosphor/chassis/phosphor-skeleton-control-power_%/ibm-ac-server/obmc/power_control
diff --git a/meta-openpower/recipes-phosphor/packagegroups/packagegroup-op-apps.bb b/meta-openpower/recipes-phosphor/packagegroups/packagegroup-op-apps.bb
index 890967f..2c0c623 100644
--- a/meta-openpower/recipes-phosphor/packagegroups/packagegroup-op-apps.bb
+++ b/meta-openpower/recipes-phosphor/packagegroups/packagegroup-op-apps.bb
@@ -25,7 +25,7 @@
RDEPENDS:${PN}-chassis = " \
obmc-phosphor-buttons-signals \
obmc-phosphor-buttons-handler \
- obmc-op-control-power \
+ phosphor-skeleton-control-power \
obmc-host-failure-reboots \
"
#Pull in obmc-fsi on all P9 OpenPOWER systems
diff --git a/meta-phosphor/recipes-phosphor/chassis/obmc-op-control-power/obmc/power_control b/meta-phosphor/recipes-phosphor/chassis/phosphor-skeleton-control-power/obmc/power_control
similarity index 100%
rename from meta-phosphor/recipes-phosphor/chassis/obmc-op-control-power/obmc/power_control
rename to meta-phosphor/recipes-phosphor/chassis/phosphor-skeleton-control-power/obmc/power_control
diff --git a/meta-phosphor/recipes-phosphor/chassis/obmc-op-control-power/org.openbmc.control.Power@.service b/meta-phosphor/recipes-phosphor/chassis/phosphor-skeleton-control-power/org.openbmc.control.Power@.service
similarity index 100%
rename from meta-phosphor/recipes-phosphor/chassis/obmc-op-control-power/org.openbmc.control.Power@.service
rename to meta-phosphor/recipes-phosphor/chassis/phosphor-skeleton-control-power/org.openbmc.control.Power@.service
diff --git a/meta-phosphor/recipes-phosphor/chassis/obmc-op-control-power/op-wait-power-off@.service b/meta-phosphor/recipes-phosphor/chassis/phosphor-skeleton-control-power/phosphor-wait-power-off@.service
similarity index 100%
rename from meta-phosphor/recipes-phosphor/chassis/obmc-op-control-power/op-wait-power-off@.service
rename to meta-phosphor/recipes-phosphor/chassis/phosphor-skeleton-control-power/phosphor-wait-power-off@.service
diff --git a/meta-phosphor/recipes-phosphor/chassis/obmc-op-control-power/op-wait-power-on@.service b/meta-phosphor/recipes-phosphor/chassis/phosphor-skeleton-control-power/phosphor-wait-power-on@.service
similarity index 100%
rename from meta-phosphor/recipes-phosphor/chassis/obmc-op-control-power/op-wait-power-on@.service
rename to meta-phosphor/recipes-phosphor/chassis/phosphor-skeleton-control-power/phosphor-wait-power-on@.service
diff --git a/meta-phosphor/recipes-phosphor/chassis/obmc-op-control-power_git.bb b/meta-phosphor/recipes-phosphor/chassis/phosphor-skeleton-control-power_git.bb
similarity index 85%
rename from meta-phosphor/recipes-phosphor/chassis/obmc-op-control-power_git.bb
rename to meta-phosphor/recipes-phosphor/chassis/phosphor-skeleton-control-power_git.bb
index 4ccff7b..920866c 100644
--- a/meta-phosphor/recipes-phosphor/chassis/obmc-op-control-power_git.bb
+++ b/meta-phosphor/recipes-phosphor/chassis/phosphor-skeleton-control-power_git.bb
@@ -1,5 +1,5 @@
-SUMMARY = "org.openbmc.control.Power implementation for OpenPOWER"
-DESCRIPTION = "A power control implementation suitable for OpenPOWER systems."
+SUMMARY = "org.openbmc.control.Power implementation for OpenBMC"
+DESCRIPTION = "A power control implementation suitable for OpenBMC systems."
PR = "r1"
PV = "1.0+git${SRCPV}"
@@ -15,20 +15,20 @@
DBUS_SERVICE:${PN} += "${@compose_list(d, 'OBMC_CONTROL_POWER_FMT', 'OBMC_POWER_INSTANCES')}"
SYSTEMD_SERVICE:${PN} += " \
- op-wait-power-on@.service \
- op-wait-power-off@.service \
+ phosphor-wait-power-on@.service \
+ phosphor-wait-power-off@.service \
"
SYSTEMD_ENVIRONMENT_FILE:${PN} += "obmc/power_control"
START_TGTFMT = "obmc-chassis-poweron@{1}.target"
-ON_TMPL = "op-wait-power-on@.service"
-ON_INSTFMT = "op-wait-power-on@{0}.service"
+ON_TMPL = "phosphor-wait-power-on@.service"
+ON_INSTFMT = "phosphor-wait-power-on@{0}.service"
ON_FMT = "../${ON_TMPL}:${START_TGTFMT}.requires/${ON_INSTFMT}"
STOP_TGTFMT = "obmc-chassis-poweroff@{1}.target"
-OFF_TMPL = "op-wait-power-off@.service"
-OFF_INSTFMT = "op-wait-power-off@{0}.service"
+OFF_TMPL = "phosphor-wait-power-off@.service"
+OFF_INSTFMT = "phosphor-wait-power-off@{0}.service"
OFF_FMT = "../${OFF_TMPL}:${STOP_TGTFMT}.requires/${OFF_INSTFMT}"
# Build up requires relationship for START_TGTFMT and STOP_TGTFMT