Clean up op packagegroups

Now that the legacy applications are picked up in the OpenPOWER layer
via obmc-apps packagegroups, those dependencies can be removed
from the op-apps packagegroup.

Remove the sensord application as it has been replaced with
phosphor-hwmon.

Demote sensor mgmt feature to an image feature since anything
running OpenBMC can have a sensor.

Change-Id: I0b27cacbcbd73d53ab8db40790ea967ad478d111
Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>

2 files changed, 0 insertions, 13 deletions

diff --git a/meta-openbmc-machines/meta-openpower/common/recipes-phosphor/packagegroups/packagegroup-op-apps.bb b/meta-openbmc-machines/meta-openpower/common/recipes-phosphor/packagegroups/packagegroup-op-apps.bb
index 0b5f6d896..ba8a95023 100644
--- a/meta-openbmc-machines/meta-openpower/common/recipes-phosphor/packagegroups/packagegroup-op-apps.bb
+++ b/meta-openbmc-machines/meta-openpower/common/recipes-phosphor/packagegroups/packagegroup-op-apps.bb
@@ -6,42 +6,31 @@ inherit obmc-phosphor-license
 
 PROVIDES = "${PACKAGES}"
 PACKAGES = " \
-        ${PN}-sensors \
         ${PN}-chassis \
         ${PN}-fans \
         ${PN}-flash \
         ${PN}-system \
         "
 
-PROVIDES += "virtual/obmc-sensor-mgmt"
 PROVIDES += "virtual/obmc-chassis-mgmt"
 PROVIDES += "virtual/obmc-fan-mgmt"
 PROVIDES += "virtual/obmc-flash-mgmt"
 PROVIDES += "virtual/obmc-system-mgmt"
 
-RPROVIDES_${PN}-sensors += "virtual-obmc-sensor-mgmt"
 RPROVIDES_${PN}-chassis += "virtual-obmc-chassis-mgmt"
 RPROVIDES_${PN}-fans += "virtual-obmc-fan-mgmt"
 RPROVIDES_${PN}-flash += "virtual-obmc-flash-mgmt"
 RPROVIDES_${PN}-system += "virtual-obmc-system-mgmt"
 
-SUMMARY_${PN}-sensors = "OpenPOWER Sensors"
-RDEPENDS_${PN}-sensors = " \
-        obmc-hwmon \
-        obmc-mgr-sensor \
-        "
-
 SUMMARY_${PN}-chassis = "OpenPOWER Chassis"
 RDEPENDS_${PN}-chassis = " \
         obmc-button-power \
         obmc-button-reset \
         obmc-control-chassis \
         obmc-hostcheckstop \
-        obmc-mgr-inventory \
         obmc-op-control-power \
         obmc-pcie-detect \
         obmc-watchdog \
-        obmc-control-led \
         "
 
 SUMMARY_${PN}-fans = "OpenPOWER Fans"
diff --git a/meta-openbmc-machines/meta-openpower/conf/machine/include/openpower.inc b/meta-openbmc-machines/meta-openpower/conf/machine/include/openpower.inc
index dd90dcc91..e29a91fa6 100644
--- a/meta-openbmc-machines/meta-openpower/conf/machine/include/openpower.inc
+++ b/meta-openbmc-machines/meta-openpower/conf/machine/include/openpower.inc
@@ -1,7 +1,6 @@
 OBMC_MACHINE_FEATURES += "\
         obmc-phosphor-fan-mgmt \
         obmc-phosphor-chassis-mgmt \
-        obmc-phosphor-sensor-mgmt \
         obmc-phosphor-flash-mgmt \
         obmc-host-ipmi \
         obmc-host-ctl \
@@ -17,7 +16,6 @@ PREFERRED_PROVIDER_virtual/obmc-host-ipmi-hw = "phosphor-ipmi-bt"
 PREFERRED_PROVIDER_virtual/obmc-chassis-mgmt = "packagegroup-op-apps"
 PREFERRED_PROVIDER_virtual/obmc-fan-mgmt = "packagegroup-op-apps"
 PREFERRED_PROVIDER_virtual/obmc-flash-mgmt = "packagegroup-op-apps"
-PREFERRED_PROVIDER_virtual/obmc-sensor-mgmt = "packagegroup-op-apps"
 PREFERRED_PROVIDER_virtual/obmc-system-mgmt = "packagegroup-op-apps"
 PREFERRED_PROVIDER_virtual/obmc-host-ctl ?= "obmc-op-control-host"
 PREFERRED_PROVIDER_virtual/obmc-inventory-data ?= "${VIRTUAL-RUNTIME_skeleton_workbook}"