Remove legacy hwmon application
phosphor-hwmon and the /xyz/openbmc_project/sensors namespace are
fully functional.
Change-Id: I42756f4246280cbfeeedebf6073ea301ce7b78be
Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
diff --git a/meta-openbmc-machines/meta-openpower/common/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bbappend b/meta-openbmc-machines/meta-openpower/common/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bbappend
index ab37270..f794e6a 100644
--- a/meta-openbmc-machines/meta-openpower/common/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bbappend
+++ b/meta-openbmc-machines/meta-openpower/common/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bbappend
@@ -14,11 +14,11 @@
RDEPENDS_${PN}-inventory += "obmc-mgr-inventory"
# Add the deprecated /org/openbmc sensor namespace providing
-# obmc-hwmon and obmc-mgr-sensor applications to the sensor
+# the obmc-mgr-sensor application to the sensor
# packagegroup until all applications have been updated to use
# the new, officially spec'ed xyz.openbmc_project.SensorValue
# providers (VIRTUAL-RUNTIME_obmc-sensor-hwmon).
-RDEPENDS_${PN}-sensors += "obmc-hwmon obmc-mgr-sensor"
+RDEPENDS_${PN}-sensors += "obmc-mgr-sensor"
# Add checkstop monitor as part of host state management package
# This will kick start a gpio monitor that will catch the
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 858313d..9b48cf1 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
@@ -39,7 +39,6 @@
SUMMARY_${PN}-fans = "OpenPOWER Fans"
RDEPENDS_${PN}-fans = " \
- obmc-hwmon \
obmc-control-fan \
"
diff --git a/meta-phosphor/classes/skeleton-rev.bbclass b/meta-phosphor/classes/skeleton-rev.bbclass
index f7c8422..4c47380 100644
--- a/meta-phosphor/classes/skeleton-rev.bbclass
+++ b/meta-phosphor/classes/skeleton-rev.bbclass
@@ -1,2 +1,2 @@
-SRCREV ?= "666be2aee1f4c2e123a6823e59c7d883709db89c"
+SRCREV ?= "efe5d2de3696f1fb462fac3a31e890a68b5995a0"
SKELETON_URI ?= "git://github.com/openbmc/skeleton"
diff --git a/meta-phosphor/common/recipes-phosphor/sensors/obmc-hwmon.bb b/meta-phosphor/common/recipes-phosphor/sensors/obmc-hwmon.bb
deleted file mode 100644
index 6a1c373..0000000
--- a/meta-phosphor/common/recipes-phosphor/sensors/obmc-hwmon.bb
+++ /dev/null
@@ -1,25 +0,0 @@
-SUMMARY = "OpenBMC hwmon poller"
-DESCRIPTION = "OpenBMC hwmon poller."
-PR = "r1"
-
-inherit skeleton-python
-inherit obmc-phosphor-systemd
-
-VIRTUAL-RUNTIME_skeleton_workbook ?= ""
-
-RDEPENDS_${PN} += "\
- python-dbus \
- python-json \
- python-shell \
- python-pygobject \
- pyphosphor \
- pyphosphor-dbus \
- ${VIRTUAL-RUNTIME_skeleton_workbook} \
- "
-
-SKELETON_DIR = "pyhwmon"
-TMPL = "mapper-wait@.service"
-TGT = "obmc-fans-ready.target"
-INSTFMT = "mapper-wait@-org-openbmc-sensors-speed-fan{0}.service"
-FMT = "../${TMPL}:${TGT}.wants/${INSTFMT}"
-SYSTEMD_LINK_${PN} += "${@compose_list(d, 'FMT', 'OBMC_FAN_INSTANCES')}"
diff --git a/meta-phosphor/common/recipes-phosphor/sensors/obmc-hwmon/obmc-hwmon.service b/meta-phosphor/common/recipes-phosphor/sensors/obmc-hwmon/obmc-hwmon.service
deleted file mode 100644
index 806ce13..0000000
--- a/meta-phosphor/common/recipes-phosphor/sensors/obmc-hwmon/obmc-hwmon.service
+++ /dev/null
@@ -1,13 +0,0 @@
-[Unit]
-Description=Phosphor Hwmon Poller
-Wants=mapper-wait@-org-openbmc-sensors.service
-After=mapper-wait@-org-openbmc-sensors.service
-Before=obmc-fans-ready.target
-
-[Service]
-Restart=always
-ExecStart={sbindir}/hwmon.py
-Environment="PYTHONUNBUFFERED=1"
-
-[Install]
-WantedBy={SYSTEMD_DEFAULT_TARGET}