meta-ibm: organize packagegroups-obmc-apps
No functional changes, just ordering things a bit more logically
Change-Id: Ib510d5a06bbf6d955c31664c23f8022d50ba1737
Signed-off-by: Andrew Geissler <geissonator@yahoo.com>
diff --git a/meta-ibm/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bbappend b/meta-ibm/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bbappend
index 455e950..481e622 100644
--- a/meta-ibm/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bbappend
+++ b/meta-ibm/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bbappend
@@ -28,23 +28,25 @@
RDEPENDS:${PN}-inventory:append:ibm-ac-server = " openpower-fru-vpd openpower-occ-control phosphor-cooling-type phosphor-gpio-monitor-presence"
RDEPENDS:${PN}-inventory:append:p10bmc = " openpower-fru-vpd openpower-occ-control phosphor-gpio-monitor-presence entity-manager"
RDEPENDS:${PN}-inventory:append:witherspoon-tacoma = " entity-manager"
+
RDEPENDS:${PN}-fan-control:append:ibm-ac-server = " fan-watchdog"
RDEPENDS:${PN}-fan-control:append:p10bmc = " fan-watchdog phosphor-fan-sensor-monitor"
+
RDEPENDS:${PN}-extras:append:ibm-ac-server = " ${POWER_SERVICE_PACKAGES_AC_SERVER} witherspoon-power-supply-sync"
RDEPENDS:${PN}-extras:append:p10bmc = " ${POWER_SERVICE_PACKAGES_P10} dbus-sensors phosphor-virtual-sensor"
RDEPENDS:${PN}-extras:append:p10bmc = " pldm openpower-hw-diags srvcfg-manager biosconfig-manager phosphor-post-code-manager phosphor-host-postd debug-trigger libmctp"
-RDEPENDS:${PN}-extras:append:witherspoon-tacoma = " pldm srvcfg-manager biosconfig-manager phosphor-post-code-manager phosphor-host-postd kexec-tools makedumpfile kdump vmcore-dmesg debug-trigger libmctp"
-RDEPENDS:${PN}-extras:append:sbp1 = " phosphor-ipmi-ipmb "
-
RDEPENDS:${PN}-extras:remove:p10bmc = "obmc-ikvm liberation-fonts uart-render-controller"
-RDEPENDS:${PN}-host-state-mgmt:remove:p10bmc = "checkstop-monitor"
-RDEPENDS:${PN}-extras:remove:swift = "obmc-ikvm"
+RDEPENDS:${PN}-extras:append:witherspoon-tacoma = " pldm srvcfg-manager biosconfig-manager phosphor-post-code-manager phosphor-host-postd kexec-tools makedumpfile kdump vmcore-dmesg debug-trigger libmctp"
RDEPENDS:${PN}-extras:remove:witherspoon-tacoma = "obmc-ikvm liberation-fonts uart-render-controller"
-RDEPENDS:${PN}-logging:append = " ${EXTRA_IBM_LOGGING_PKGS}"
-RDEPENDS:${PN}-leds:remove:witherspoon-tacoma = "phosphor-led-manager-faultmonitor"
-RDEPENDS:${PN}-devtools:remove:witherspoon = "rsync"
+RDEPENDS:${PN}-extras:append:sbp1 = " phosphor-ipmi-ipmb "
+RDEPENDS:${PN}-extras:remove:swift = "obmc-ikvm"
RDEPENDS:${PN}-software:append:ibm-ac-server = " phosphor-software-manager-sync"
RDEPENDS:${PN}-software:append:p10bmc = " phosphor-software-manager-usb"
RDEPENDS:${PN}-software:append:p10bmc = " phosphor-software-manager-side-switch"
RDEPENDS:${PN}-software:append:system1 = " phosphor-software-manager-side-switch"
+
+RDEPENDS:${PN}-host-state-mgmt:remove:p10bmc = "checkstop-monitor"
+RDEPENDS:${PN}-logging:append = " ${EXTRA_IBM_LOGGING_PKGS}"
+RDEPENDS:${PN}-leds:remove:witherspoon-tacoma = "phosphor-led-manager-faultmonitor"
+RDEPENDS:${PN}-devtools:remove:witherspoon = "rsync"