From 82dbc15a05125a812c140a3c8cff81c366482229 Mon Sep 17 00:00:00 2001
From: "Jason M. Bills" <jason.m.bills@linux.intel.com>
Date: Mon, 7 Dec 2020 13:45:20 -0800
Subject: Update to internal 0.26

Signed-off-by: Jason M. Bills <jason.m.bills@linux.intel.com>
---
 .../intrusionsensor-depend-on-networkd.conf        |  3 ++
 .../sensors/dbus-sensors_%.bbappend                | 38 +++++++++++++++++++---
 2 files changed, 36 insertions(+), 5 deletions(-)
 create mode 100644 meta-openbmc-mods/meta-common/recipes-phosphor/sensors/dbus-sensors/intrusionsensor-depend-on-networkd.conf

(limited to 'meta-openbmc-mods/meta-common/recipes-phosphor/sensors')

diff --git a/meta-openbmc-mods/meta-common/recipes-phosphor/sensors/dbus-sensors/intrusionsensor-depend-on-networkd.conf b/meta-openbmc-mods/meta-common/recipes-phosphor/sensors/dbus-sensors/intrusionsensor-depend-on-networkd.conf
new file mode 100644
index 000000000..6f0fd3ffc
--- /dev/null
+++ b/meta-openbmc-mods/meta-common/recipes-phosphor/sensors/dbus-sensors/intrusionsensor-depend-on-networkd.conf
@@ -0,0 +1,3 @@
+[Unit]
+After=systemd-networkd.service
+Requires=systemd-networkd.service
diff --git a/meta-openbmc-mods/meta-common/recipes-phosphor/sensors/dbus-sensors_%.bbappend b/meta-openbmc-mods/meta-common/recipes-phosphor/sensors/dbus-sensors_%.bbappend
index ac45a8114..16c88f7fc 100644
--- a/meta-openbmc-mods/meta-common/recipes-phosphor/sensors/dbus-sensors_%.bbappend
+++ b/meta-openbmc-mods/meta-common/recipes-phosphor/sensors/dbus-sensors_%.bbappend
@@ -1,11 +1,39 @@
-SRCREV = "623723b9e827f52a05cfe2dac8b4ef5d285fb6af"
+FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
+PROJECT_SRC_DIR := "${THISDIR}/${PN}"
+
+SRCREV = "3bcd823e3783bc49c1e75dec2d43a3ef54333c88"
 #SRC_URI = "git://github.com/openbmc/dbus-sensors.git"
 
+SRC_URI += "\
+    file://intrusionsensor-depend-on-networkd.conf \
+    "
+
 DEPENDS_append = " libgpiod libmctp"
 
-FILESEXTRAPATHS_append := ":${THISDIR}/${PN}"
+PACKAGECONFIG += " \
+    adcsensor \
+    cpusensor \
+    exitairtempsensor \
+    fansensor \
+    hwmontempsensor \
+    intrusionsensor \
+    ipmbsensor \
+    mcutempsensor \
+    psusensor \
+"
+
+PACKAGECONFIG[nvmesensor] = "-DDISABLE_NVME=OFF, -DDISABLE_NVME=ON"
+
+SYSTEMD_SERVICE_${PN} += "${@bb.utils.contains('PACKAGECONFIG', 'nvmesensor', \
+                                               'xyz.openbmc_project.nvmesensor.service', \
+                                               '', d)}"
 
-PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'disable-nvme-sensors', d)}"
-PACKAGECONFIG[disable-nvme-sensors] = "-DDISABLE_NVME=ON, -DDISABLE_NVME=OFF"
+PACKAGECONFIG_remove = "nvmesensor"
 
-SYSTEMD_SERVICE_${PN} += "${@bb.utils.contains('DISTRO_FEATURES', 'disable-nvme-sensors', '', 'xyz.openbmc_project.nvmesensor.service', d)}"
+do_install_append() {
+    svc="xyz.openbmc_project.intrusionsensor.service"
+    srcf="${WORKDIR}/intrusionsensor-depend-on-networkd.conf"
+    dstf="${D}/etc/systemd/system/${svc}.d/10-depend-on-networkd.conf"
+    mkdir -p "${D}/etc/systemd/system/${svc}.d"
+    install "${srcf}" "${dstf}"
+}
-- 
cgit v1.2.3