From 298c4328fd20fcd7645da1565c143b1b668ef541 Mon Sep 17 00:00:00 2001 From: James Feist Date: Tue, 4 Dec 2018 12:13:59 -0800 Subject: meta-intel: delete custom dbus-sensor recipe It has been merged into meta-phosphor, don't need our own copy. (From meta-intel rev: c2f1613dc31aed042662d4033482e787d0222ac6) Change-Id: I42aed979830ca8e95fef8814eacc8bda23b9e7ad Signed-off-by: James Feist Signed-off-by: Brad Bishop --- .../xyz.openbmc_project.adcsensor.service | 11 ---------- .../xyz.openbmc_project.cpusensor.service | 12 ----------- .../xyz.openbmc_project.fansensor.service | 11 ---------- .../xyz.openbmc_project.hwmontempsensor.service | 11 ---------- .../recipes-intel/dbus-sensors/dbus-sensors_git.bb | 25 ---------------------- 5 files changed, 70 deletions(-) delete mode 100644 meta-intel/meta-common/recipes-intel/dbus-sensors/dbus-sensors/xyz.openbmc_project.adcsensor.service delete mode 100644 meta-intel/meta-common/recipes-intel/dbus-sensors/dbus-sensors/xyz.openbmc_project.cpusensor.service delete mode 100644 meta-intel/meta-common/recipes-intel/dbus-sensors/dbus-sensors/xyz.openbmc_project.fansensor.service delete mode 100644 meta-intel/meta-common/recipes-intel/dbus-sensors/dbus-sensors/xyz.openbmc_project.hwmontempsensor.service delete mode 100644 meta-intel/meta-common/recipes-intel/dbus-sensors/dbus-sensors_git.bb (limited to 'meta-intel') diff --git a/meta-intel/meta-common/recipes-intel/dbus-sensors/dbus-sensors/xyz.openbmc_project.adcsensor.service b/meta-intel/meta-common/recipes-intel/dbus-sensors/dbus-sensors/xyz.openbmc_project.adcsensor.service deleted file mode 100644 index 520d71e30..000000000 --- a/meta-intel/meta-common/recipes-intel/dbus-sensors/dbus-sensors/xyz.openbmc_project.adcsensor.service +++ /dev/null @@ -1,11 +0,0 @@ -[Unit] -Description=Adc Sensor -StopWhenUnneeded=false - -[Service] -Restart=always -RestartSec=5 -ExecStart={bindir}/adcsensor - -[Install] -WantedBy=multi-user.target diff --git a/meta-intel/meta-common/recipes-intel/dbus-sensors/dbus-sensors/xyz.openbmc_project.cpusensor.service b/meta-intel/meta-common/recipes-intel/dbus-sensors/dbus-sensors/xyz.openbmc_project.cpusensor.service deleted file mode 100644 index bdbadea36..000000000 --- a/meta-intel/meta-common/recipes-intel/dbus-sensors/dbus-sensors/xyz.openbmc_project.cpusensor.service +++ /dev/null @@ -1,12 +0,0 @@ -[Unit] -Description=CPU Sensor -StopWhenUnneeded=false - -[Service] -Restart=always -RestartSec=5 -StartLimitBurst=10 -ExecStart={bindir}/cpusensor - -[Install] -WantedBy=multi-user.target diff --git a/meta-intel/meta-common/recipes-intel/dbus-sensors/dbus-sensors/xyz.openbmc_project.fansensor.service b/meta-intel/meta-common/recipes-intel/dbus-sensors/dbus-sensors/xyz.openbmc_project.fansensor.service deleted file mode 100644 index 246718a83..000000000 --- a/meta-intel/meta-common/recipes-intel/dbus-sensors/dbus-sensors/xyz.openbmc_project.fansensor.service +++ /dev/null @@ -1,11 +0,0 @@ -[Unit] -Description=Fan Sensor -StopWhenUnneeded=false - -[Service] -Restart=always -RestartSec=5 -ExecStart={bindir}/fansensor - -[Install] -WantedBy=multi-user.target diff --git a/meta-intel/meta-common/recipes-intel/dbus-sensors/dbus-sensors/xyz.openbmc_project.hwmontempsensor.service b/meta-intel/meta-common/recipes-intel/dbus-sensors/dbus-sensors/xyz.openbmc_project.hwmontempsensor.service deleted file mode 100644 index bb56228a9..000000000 --- a/meta-intel/meta-common/recipes-intel/dbus-sensors/dbus-sensors/xyz.openbmc_project.hwmontempsensor.service +++ /dev/null @@ -1,11 +0,0 @@ -[Unit] -Description=Hwmon Temp Sensor -StopWhenUnneeded=false - -[Service] -Restart=always -RestartSec=5 -ExecStart={bindir}/hwmontempsensor - -[Install] -WantedBy=multi-user.target diff --git a/meta-intel/meta-common/recipes-intel/dbus-sensors/dbus-sensors_git.bb b/meta-intel/meta-common/recipes-intel/dbus-sensors/dbus-sensors_git.bb deleted file mode 100644 index c44f57af4..000000000 --- a/meta-intel/meta-common/recipes-intel/dbus-sensors/dbus-sensors_git.bb +++ /dev/null @@ -1,25 +0,0 @@ -SUMMARY = "dbus-sensors" -DESCRIPTION = "Dbus Sensor Services Configured from D-Bus" - -SRC_URI = "git://github.com/openbmc/s2600wf-misc.git" -SRCREV = "b7bd2a88226a613091caabce5d1e236d67266ac0" - -PV = "0.1+git${SRCPV}" - -LICENSE = "Apache-2.0" -LIC_FILES_CHKSUM = "file://../LICENCE;md5=86d3f3a95c324c9479bd8986968f4327" - -SYSTEMD_SERVICE_${PN} = "xyz.openbmc_project.fansensor.service" -SYSTEMD_SERVICE_${PN} += " xyz.openbmc_project.adcsensor.service" -SYSTEMD_SERVICE_${PN} += " xyz.openbmc_project.hwmontempsensor.service" -SYSTEMD_SERVICE_${PN} += " xyz.openbmc_project.cpusensor.service" - -DEPENDS = "boost nlohmann-json sdbusplus" -inherit cmake obmc-phosphor-systemd - -S = "${WORKDIR}/git/sensors" - -# linux-libc-headers guides this way to include custom uapi headers -CXXFLAGS_append = " -I ${STAGING_KERNEL_DIR}/include/uapi" -CXXFLAGS_append = " -I ${STAGING_KERNEL_DIR}/include" -do_configure[depends] += "virtual/kernel:do_shared_workdir" -- cgit v1.2.1