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>
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 0b5f6d8..ba8a950 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 @@
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 dd90dcc..e29a91f 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-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}"
diff --git a/meta-phosphor/classes/obmc-phosphor-image.bbclass b/meta-phosphor/classes/obmc-phosphor-image.bbclass
index b22d55f..2b41fd5 100644
--- a/meta-phosphor/classes/obmc-phosphor-image.bbclass
+++ b/meta-phosphor/classes/obmc-phosphor-image.bbclass
@@ -14,7 +14,6 @@
# - obmc-inventory - OpenBMC inventory support
# - obmc-leds - OpenBMC LED support
# - obmc-logging-mgmt - OpenBMC logging management
-# - obmc-sensor-mgmt - OpenBMC sensor management
# - obmc-sensors - OpenBMC sensor support
# - obmc-settings-mgmt - OpenBMC settings management
# - obmc-system-mgmt - OpenBMC system management
@@ -37,7 +36,6 @@
FEATURE_PACKAGES_obmc-leds ?= "packagegroup-obmc-apps-leds"
FEATURE_PACKAGES_obmc-logging-mgmt ?= "${@df_enabled(d, 'obmc-logging-mgmt', 'virtual-obmc-logging-mgmt')}"
FEATURE_PACKAGES_obmc-net-ipmi ?= "${@df_enabled(d, 'obmc-net-ipmi', 'virtual-obmc-net-ipmi')}"
-FEATURE_PACKAGES_obmc-sensor-mgmt ?= "${@cf_enabled(d, 'obmc-phosphor-sensor-mgmt', 'virtual-obmc-sensor-mgmt')}"
FEATURE_PACKAGES_obmc-sensors ?= "packagegroup-obmc-apps-sensors"
FEATURE_PACKAGES_obmc-settings-mgmt ?= "${@df_enabled(d, 'obmc-settings-mgmt', 'virtual-obmc-settings-mgmt')}"
FEATURE_PACKAGES_obmc-system-mgmt ?= "${@df_enabled(d, 'obmc-phosphor-system-mgmt', 'virtual-obmc-system-mgmt')}"
@@ -58,7 +56,6 @@
obmc-leds \
obmc-logging-mgmt \
obmc-net-ipmi \
- obmc-sensor-mgmt \
obmc-sensors \
obmc-settings-mgmt \
obmc-system-mgmt \
diff --git a/meta-phosphor/common/recipes-phosphor/sensors/files/obmc-phosphor-sensord.py b/meta-phosphor/common/recipes-phosphor/sensors/files/obmc-phosphor-sensord.py
deleted file mode 100644
index c9771ac..0000000
--- a/meta-phosphor/common/recipes-phosphor/sensors/files/obmc-phosphor-sensord.py
+++ /dev/null
@@ -1,29 +0,0 @@
-#!/usr/bin/env python
-
-# Contributors Listed Below - COPYRIGHT 2015
-# [+] International Business Machines Corp.
-#
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-# implied. See the License for the specific language governing
-# permissions and limitations under the License.
-
-import time
-import sys
-import dbus
-import dbus.service
-import dbus.mainloop.glib
-
-if __name__ == '__main__':
- print "obmc-phosphor-sensord starting..."
-
- while 1:
- time.sleep(5)
diff --git a/meta-phosphor/common/recipes-phosphor/sensors/files/obmc-phosphor-sensord.service b/meta-phosphor/common/recipes-phosphor/sensors/files/obmc-phosphor-sensord.service
deleted file mode 100644
index bf8f1cf..0000000
--- a/meta-phosphor/common/recipes-phosphor/sensors/files/obmc-phosphor-sensord.service
+++ /dev/null
@@ -1,9 +0,0 @@
-[Unit]
-Description=Phosphor Sensor Manager
-
-[Service]
-Restart=always
-ExecStart={sbindir}/obmc-phosphor-sensord
-
-[Install]
-WantedBy={SYSTEMD_DEFAULT_TARGET}
diff --git a/meta-phosphor/common/recipes-phosphor/sensors/obmc-phosphor-sensord.bb b/meta-phosphor/common/recipes-phosphor/sensors/obmc-phosphor-sensord.bb
deleted file mode 100644
index 513e164..0000000
--- a/meta-phosphor/common/recipes-phosphor/sensors/obmc-phosphor-sensord.bb
+++ /dev/null
@@ -1,11 +0,0 @@
-SUMMARY = "Phosphor OpenBMC Sensor Management"
-DESCRIPTION = "Phosphor OpenBMC sensor management reference implementation."
-PR = "r1"
-
-inherit obmc-phosphor-pydbus-service
-
-PROVIDES += "virtual/obmc-sensor-mgmt"
-RPROVIDES_${PN} += "virtual-obmc-sensor-mgmt"
-
-S = "${WORKDIR}"
-SRC_URI += "file://${PN}.py"
diff --git a/meta-phosphor/conf/distro/include/phosphor-defaults.inc b/meta-phosphor/conf/distro/include/phosphor-defaults.inc
index 9164a26..11f0671 100644
--- a/meta-phosphor/conf/distro/include/phosphor-defaults.inc
+++ b/meta-phosphor/conf/distro/include/phosphor-defaults.inc
@@ -36,7 +36,6 @@
PREFERRED_PROVIDER_virtual/obmc-logging-mgmt ?= "phosphor-logging"
PREFERRED_PROVIDER_virtual/obmc-net-ipmi ?= "phosphor-net-ipmid"
-PREFERRED_PROVIDER_virtual/obmc-sensor-mgmt ?= "obmc-phosphor-sensord"
# obmc-sensors-hwmon
#
diff --git a/meta-phosphor/conf/distro/openbmc-phosphor.conf b/meta-phosphor/conf/distro/openbmc-phosphor.conf
index b32bb04..5989547 100644
--- a/meta-phosphor/conf/distro/openbmc-phosphor.conf
+++ b/meta-phosphor/conf/distro/openbmc-phosphor.conf
@@ -23,7 +23,6 @@
ipv6 \
obmc-phosphor-fan-mgmt \
obmc-phosphor-chassis-mgmt \
- obmc-phosphor-sensor-mgmt \
obmc-phosphor-flash-mgmt \
obmc-phosphor-event-mgmt \
obmc-phosphor-user-mgmt \