diff options
Diffstat (limited to 'meta-phosphor/recipes-phosphor/sensors')
| -rw-r--r-- | meta-phosphor/recipes-phosphor/sensors/dbus-sensors_git.bb | 6 | ||||
| -rwxr-xr-x | meta-phosphor/recipes-phosphor/sensors/phosphor-hwmon/start_hwmon.sh | 7 |
2 files changed, 5 insertions, 8 deletions
diff --git a/meta-phosphor/recipes-phosphor/sensors/dbus-sensors_git.bb b/meta-phosphor/recipes-phosphor/sensors/dbus-sensors_git.bb index 8c884ab85..637327ab3 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 = "73c363ff2d131b59149baaa0bc9bff41a3cfb125" +SRCREV = "9f9b38d89a751e70cdf61bfb3f78c05800201f95" PV = "0.1+git${SRCPV}" @@ -24,8 +24,4 @@ inherit cmake systemd S = "${WORKDIR}/git/" -# 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" EXTRA_OECMAKE = "-DYOCTO=1" diff --git a/meta-phosphor/recipes-phosphor/sensors/phosphor-hwmon/start_hwmon.sh b/meta-phosphor/recipes-phosphor/sensors/phosphor-hwmon/start_hwmon.sh index 2f35865b3..2e346d0fb 100755 --- a/meta-phosphor/recipes-phosphor/sensors/phosphor-hwmon/start_hwmon.sh +++ b/meta-phosphor/recipes-phosphor/sensors/phosphor-hwmon/start_hwmon.sh @@ -17,7 +17,8 @@ then fi fi +# Needed to re-do escaping used to avoid bitbake separator conflicts path="${path//:/--}" -path="${path//-/\\x2d}" - -systemctl --no-block $action 'xyz.openbmc_project.Hwmon@'$path'.service' +# Needed to escape prior to being used as a unit argument +path="$(systemd-escape "$path")" +systemctl --no-block "$action" "xyz.openbmc_project.Hwmon@$path.service" |