meta-witherspoon: Use separated phosphor-power packages
phosphor-power recipe is splitted into separated packages.
In packagegroup-obmc-apps.bbappend, define
POWER_SERVICE_PACKAGES_AC_SERVER to include the packages for IBM AC
servers and POWER_SERVICE_PACKAGES_RAINIER for rainier server.
The package cold-redundancy is not included yet because the repo does
not install the files yet.
In phosphor-power bbappend, use separated packages as well.
It also add phosphor-power to install the psu.json in witherspoon's
phosphor-power bbappend, which is needed for multiple packages.
Tested: Verify all the ac-server services and utils are installed into
Witherspoon's image as before.
(From meta-ibm rev: 438174de3490d800181ecd26ac162c6ebe442194)
Signed-off-by: Lei YU <mine260309@gmail.com>
Change-Id: I76808e92de7cf144ba2a3b7a455af582eaad3d33
Signed-off-by: Andrew Geissler <geissonator@yahoo.com>
diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bbappend b/meta-ibm/meta-witherspoon/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bbappend
index 96982f9..46f8b27 100644
--- a/meta-ibm/meta-witherspoon/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bbappend
+++ b/meta-ibm/meta-witherspoon/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bbappend
@@ -1,9 +1,24 @@
+POWER_SERVICE_PACKAGES_AC_SERVER = " \
+ phosphor-power-monitor \
+ phosphor-power-systemd-links-monitor \
+ phosphor-power-sequencer \
+ phosphor-power-systemd-links-sequencer \
+ phosphor-power-utils \
+ phosphor-power \
+"
+
+POWER_SERVICE_PACKAGES_RAINIER = " \
+ ${POWER_SERVICE_PACKAGES_AC_SERVER} \
+ phosphor-power-regulators \
+ phosphor-power-psu-monitor \
+"
+
RDEPENDS_${PN}-inventory_append_ibm-ac-server = " openpower-fru-vpd openpower-occ-control phosphor-cooling-type virtual/obmc-gpio-presence"
RDEPENDS_${PN}-inventory_append_rainier = " openpower-fru-vpd openpower-occ-control virtual/obmc-gpio-presence"
RDEPENDS_${PN}-inventory_append_mihawk = " openpower-fru-vpd openpower-occ-control virtual/obmc-gpio-presence id-button phosphor-cooling-type"
RDEPENDS_${PN}-fan-control_append_ibm-ac-server = " witherspoon-fan-watchdog"
-RDEPENDS_${PN}-extras_append_ibm-ac-server = " phosphor-power phosphor-power-systemd-links witherspoon-power-supply-sync phosphor-webui"
-RDEPENDS_${PN}-extras_append_rainier = " phosphor-power phosphor-power-systemd-links phosphor-psu-monitor phosphor-webui"
+RDEPENDS_${PN}-extras_append_ibm-ac-server = " ${POWER_SERVICE_PACKAGES_AC_SERVER} witherspoon-power-supply-sync phosphor-webui"
+RDEPENDS_${PN}-extras_append_rainier = " ${POWER_SERVICE_PACKAGES_RAINIER} phosphor-webui"
RDEPENDS_${PN}-extras_append_mihawk = " phosphor-webui phosphor-image-signing"
RDEPENDS_${PN}-extras_remove_rainier = "obmc-ikvm liberation-fonts uart-render-controller"
RDEPENDS_${PN}-extras_remove_swift = "obmc-ikvm"