diff options
Diffstat (limited to 'meta-phosphor/recipes-phosphor/sensors')
4 files changed, 75 insertions, 13 deletions
diff --git a/meta-phosphor/recipes-phosphor/sensors/dbus-sensors_git.bb b/meta-phosphor/recipes-phosphor/sensors/dbus-sensors_git.bb index dc78f4f68..238f43310 100644 --- a/meta-phosphor/recipes-phosphor/sensors/dbus-sensors_git.bb +++ b/meta-phosphor/recipes-phosphor/sensors/dbus-sensors_git.bb @@ -2,26 +2,66 @@ SUMMARY = "dbus-sensors" DESCRIPTION = "Dbus Sensor Services Configured from D-Bus" SRC_URI = "git://github.com/openbmc/dbus-sensors.git" -SRCREV = "38fb598381a9fc7c4e2bbd7b585f788d0c7353e5" +SRCREV = "3bcd823e3783bc49c1e75dec2d43a3ef54333c88" PV = "0.1+git${SRCPV}" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;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" -SYSTEMD_SERVICE_${PN} += " xyz.openbmc_project.exitairsensor.service" -SYSTEMD_SERVICE_${PN} += " xyz.openbmc_project.ipmbsensor.service" -SYSTEMD_SERVICE_${PN} += " xyz.openbmc_project.intrusionsensor.service" -SYSTEMD_SERVICE_${PN} += " xyz.openbmc_project.psusensor.service" -SYSTEMD_SERVICE_${PN} += " xyz.openbmc_project.mcutempsensor.service" +PACKAGECONFIG ??= " \ + adcsensor \ + cpusensor \ + exitairtempsensor \ + fansensor \ + hwmontempsensor \ + intrusionsensor \ + ipmbsensor \ + mcutempsensor \ + psusensor \ + " + +PACKAGECONFIG[adcsensor] = "-DDISABLE_ADC=OFF, -DDISABLE_ADC=ON" +PACKAGECONFIG[cpusensor] = "-DDISABLE_CPU=OFF, -DDISABLE_CPU=ON" +PACKAGECONFIG[exitairtempsensor] = "-DDISABLE_EXIT_AIR=OFF, -DDISABLE_EXIT_AIR=ON" +PACKAGECONFIG[fansensor] = "-DDISABLE_FAN=OFF, -DDISABLE_FAN=ON" +PACKAGECONFIG[hwmontempsensor] = "-DDISABLE_HWMON_TEMP=OFF, -DDISABLE_HWMON_TEMP=ON" +PACKAGECONFIG[intrusionsensor] = "-DDISABLE_INTRUSION=OFF, -DDISABLE_INTRUSION=ON" +PACKAGECONFIG[ipmbsensor] = "-DDISABLE_IPMB=OFF, -DDISABLE_IPMB=ON" +PACKAGECONFIG[mcutempsensor] = "-DDISABLE_MCUTEMP=OFF, -DDISABLE_MCUTEMP=ON" +PACKAGECONFIG[psusensor] = "-DDISABLE_PSU=OFF, -DDISABLE_PSU=ON" + +SYSTEMD_SERVICE_${PN} += "${@bb.utils.contains('PACKAGECONFIG', 'adcsensor', \ + 'xyz.openbmc_project.adcsensor.service', \ + '', d)}" +SYSTEMD_SERVICE_${PN} += "${@bb.utils.contains('PACKAGECONFIG', 'cpusensor', \ + 'xyz.openbmc_project.cpusensor.service', \ + '', d)}" +SYSTEMD_SERVICE_${PN} += "${@bb.utils.contains('PACKAGECONFIG', 'exitairtempsensor', \ + 'xyz.openbmc_project.exitairsensor.service', \ + '', d)}" +SYSTEMD_SERVICE_${PN} += "${@bb.utils.contains('PACKAGECONFIG', 'fansensor', \ + 'xyz.openbmc_project.fansensor.service', \ + '', d)}" +SYSTEMD_SERVICE_${PN} += "${@bb.utils.contains('PACKAGECONFIG', 'hwmontempsensor', \ + 'xyz.openbmc_project.hwmontempsensor.service', \ + '', d)}" +SYSTEMD_SERVICE_${PN} += "${@bb.utils.contains('PACKAGECONFIG', 'intrusionsensor', \ + 'xyz.openbmc_project.intrusionsensor.service', \ + '', d)}" +SYSTEMD_SERVICE_${PN} += "${@bb.utils.contains('PACKAGECONFIG', 'ipmbsensor', \ + 'xyz.openbmc_project.ipmbsensor.service', \ + '', d)}" +SYSTEMD_SERVICE_${PN} += "${@bb.utils.contains('PACKAGECONFIG', 'mcutempsensor', \ + 'xyz.openbmc_project.mcutempsensor.service', \ + '', d)}" +SYSTEMD_SERVICE_${PN} += "${@bb.utils.contains('PACKAGECONFIG', 'psusensor', \ + 'xyz.openbmc_project.psusensor.service', \ + '', d)}" DEPENDS = "boost nlohmann-json sdbusplus i2c-tools libgpiod" inherit cmake systemd -S = "${WORKDIR}/git/" +S = "${WORKDIR}/git" EXTRA_OECMAKE = "-DYOCTO=1" diff --git a/meta-phosphor/recipes-phosphor/sensors/phosphor-hwmon_git.bb b/meta-phosphor/recipes-phosphor/sensors/phosphor-hwmon_git.bb index 5ccf99cac..e04cf51c9 100644 --- a/meta-phosphor/recipes-phosphor/sensors/phosphor-hwmon_git.bb +++ b/meta-phosphor/recipes-phosphor/sensors/phosphor-hwmon_git.bb @@ -40,7 +40,7 @@ SRC_URI += "file://70-hwmon.rules" SRC_URI += "file://70-iio.rules" SRC_URI += "file://start_hwmon.sh" -SRCREV = "5906173aec2a48f37d1356f1ade788c8d25530b2" +SRCREV = "7ab1b25b50bd4f68062c6a07200f8f69f09d3387" S = "${WORKDIR}/git" diff --git a/meta-phosphor/recipes-phosphor/sensors/phosphor-nvme_git.bb b/meta-phosphor/recipes-phosphor/sensors/phosphor-nvme_git.bb index 9edd32223..ed32f379c 100644 --- a/meta-phosphor/recipes-phosphor/sensors/phosphor-nvme_git.bb +++ b/meta-phosphor/recipes-phosphor/sensors/phosphor-nvme_git.bb @@ -15,7 +15,7 @@ DEPENDS += "phosphor-logging" DEPENDS += "nlohmann-json" SRC_URI = "git://github.com/openbmc/phosphor-nvme.git;protocol=git" -SRCREV = "05eedaa80eef276b6ecee9d4fb721a523d2d999c" +SRCREV = "9b771e221e3854bbbf45a56bbcab97c62b0a05ec" S = "${WORKDIR}/git" SYSTEMD_SERVICE_${PN} = "xyz.openbmc_project.nvme.manager.service" diff --git a/meta-phosphor/recipes-phosphor/sensors/phosphor-virtual-sensor_git.bb b/meta-phosphor/recipes-phosphor/sensors/phosphor-virtual-sensor_git.bb new file mode 100644 index 000000000..3a25890b9 --- /dev/null +++ b/meta-phosphor/recipes-phosphor/sensors/phosphor-virtual-sensor_git.bb @@ -0,0 +1,22 @@ +SUMMARY = "Virtual Sensors" +DESCRIPTION = "virtual sensors created from existing sensors and config data" +HOMEPAGE = "https://github.com/openbmc/phosphor-virtual-sensor" +PR = "r1" +LICENSE = "Apache-2.0" +LIC_FILES_CHKSUM = "file://LICENSE;md5=9e69ba356fa59848ffd865152a3ccc13" + +inherit meson pkgconfig +inherit systemd + +DEPENDS += "sdbusplus" +DEPENDS += "phosphor-dbus-interfaces" +DEPENDS += "sdeventplus" +DEPENDS += "phosphor-logging" +DEPENDS += "nlohmann-json" +DEPENDS += "exprtk" + +SRC_URI = "git://github.com/openbmc/phosphor-virtual-sensor.git;protocol=git" +SRCREV = "f8db722567d16b93bde7d37d3d7a6e83d08373aa" +S = "${WORKDIR}/git" + +SYSTEMD_SERVICE_${PN} = "phosphor-virtual-sensor.service" |