diff options
| author | Jason M. Bills <jason.m.bills@linux.intel.com> | 2021-01-27 22:27:17 +0300 |
|---|---|---|
| committer | Jason M. Bills <jason.m.bills@linux.intel.com> | 2021-01-27 22:27:17 +0300 |
| commit | 98cc5cd6483975b64d80e8323f7f659dd1337d75 (patch) | |
| tree | 5fa64e93d57396bc4c76aa3537156205b4b424ac /meta-phosphor/recipes-phosphor/sensors | |
| parent | 82dbc15a05125a812c140a3c8cff81c366482229 (diff) | |
| parent | 8fc454f9beebdd347403145c991697019a593cff (diff) | |
| download | openbmc-98cc5cd6483975b64d80e8323f7f659dd1337d75.tar.xz | |
Merge tag '0.29' of ssh://git-amr-1.devtools.intel.com:29418/openbmc-openbmc into update
Diffstat (limited to 'meta-phosphor/recipes-phosphor/sensors')
3 files changed, 10 insertions, 4 deletions
diff --git a/meta-phosphor/recipes-phosphor/sensors/dbus-sensors_git.bb b/meta-phosphor/recipes-phosphor/sensors/dbus-sensors_git.bb index 238f43310..64e5b25a8 100644 --- a/meta-phosphor/recipes-phosphor/sensors/dbus-sensors_git.bb +++ b/meta-phosphor/recipes-phosphor/sensors/dbus-sensors_git.bb @@ -2,7 +2,7 @@ SUMMARY = "dbus-sensors" DESCRIPTION = "Dbus Sensor Services Configured from D-Bus" SRC_URI = "git://github.com/openbmc/dbus-sensors.git" -SRCREV = "3bcd823e3783bc49c1e75dec2d43a3ef54333c88" +SRCREV = "832a2c604956a2e37da9acedb32ebc8f6d9abae1" PV = "0.1+git${SRCPV}" diff --git a/meta-phosphor/recipes-phosphor/sensors/phosphor-hwmon_git.bb b/meta-phosphor/recipes-phosphor/sensors/phosphor-hwmon_git.bb index e04cf51c9..de7c02506 100644 --- a/meta-phosphor/recipes-phosphor/sensors/phosphor-hwmon_git.bb +++ b/meta-phosphor/recipes-phosphor/sensors/phosphor-hwmon_git.bb @@ -8,11 +8,17 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=fa818a259cbed7ce8bc2a22d35a464fc" inherit autotools pkgconfig inherit obmc-phosphor-systemd +PACKAGECONFIG ??= "" +# Autotools configure option to enable/disable max31785-msl +PACKAGECONFIG[max31785-msl] = "--enable-max31785-msl, --disable-max31785-msl" +# Meson configure option to enable/disable max31785-msl +# PACKAGECONFIG[max31785-msl] = "-Denable-max31785-msl=true, -Denable-max31785-msl=false" + PACKAGE_BEFORE_PN = "max31785-msl" SYSTEMD_PACKAGES = "${PN} max31785-msl" SYSTEMD_SERVICE_${PN} = "xyz.openbmc_project.Hwmon@.service" -SYSTEMD_SERVICE_max31785-msl = "phosphor-max31785-msl@.service" +SYSTEMD_SERVICE_max31785-msl = "${@bb.utils.contains('PACKAGECONFIG', 'max31785-msl', 'phosphor-max31785-msl@.service', '', d)}" DEPENDS += "autoconf-archive-native" DEPENDS += " \ @@ -40,7 +46,7 @@ SRC_URI += "file://70-hwmon.rules" SRC_URI += "file://70-iio.rules" SRC_URI += "file://start_hwmon.sh" -SRCREV = "7ab1b25b50bd4f68062c6a07200f8f69f09d3387" +SRCREV = "94555352240ba7ac577a7017c0719cd9bbeb7a23" S = "${WORKDIR}/git" diff --git a/meta-phosphor/recipes-phosphor/sensors/phosphor-virtual-sensor_git.bb b/meta-phosphor/recipes-phosphor/sensors/phosphor-virtual-sensor_git.bb index 3a25890b9..93c001453 100644 --- a/meta-phosphor/recipes-phosphor/sensors/phosphor-virtual-sensor_git.bb +++ b/meta-phosphor/recipes-phosphor/sensors/phosphor-virtual-sensor_git.bb @@ -16,7 +16,7 @@ DEPENDS += "nlohmann-json" DEPENDS += "exprtk" SRC_URI = "git://github.com/openbmc/phosphor-virtual-sensor.git;protocol=git" -SRCREV = "f8db722567d16b93bde7d37d3d7a6e83d08373aa" +SRCREV = "26edaad467a44ff9b69968ac0912aa3e9e3d0a62" S = "${WORKDIR}/git" SYSTEMD_SERVICE_${PN} = "phosphor-virtual-sensor.service" |