summaryrefslogtreecommitdiff
path: root/meta-phosphor
diff options
context:
space:
mode:
authorBrad Bishop <bradleyb@fuzziesquirrel.com>2017-07-08 20:49:45 +0300
committerPatrick Williams <patrick@stwcx.xyz>2017-07-19 05:57:05 +0300
commit0061b89c49ecf1f5d7728cd997427ab43df6f9b5 (patch)
tree8a6b7dc4e4299ef45cbb79454fdaf4e551f42044 /meta-phosphor
parent0a0e397fa8da3ba47ce0607a095da7c48f862880 (diff)
downloadopenbmc-0061b89c49ecf1f5d7728cd997427ab43df6f9b5.tar.xz
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>
Diffstat (limited to 'meta-phosphor')
-rw-r--r--meta-phosphor/classes/skeleton-rev.bbclass2
-rw-r--r--meta-phosphor/common/recipes-phosphor/sensors/obmc-hwmon.bb25
-rw-r--r--meta-phosphor/common/recipes-phosphor/sensors/obmc-hwmon/obmc-hwmon.service13
3 files changed, 1 insertions, 39 deletions
diff --git a/meta-phosphor/classes/skeleton-rev.bbclass b/meta-phosphor/classes/skeleton-rev.bbclass
index f7c84228b..4c473801d 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 6a1c373af..000000000
--- 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 806ce1310..000000000
--- 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}