summaryrefslogtreecommitdiffstats
path: root/meta-phosphor
diff options
context:
space:
mode:
authorPatrick Venture <venture@google.com>2019-04-15 15:11:29 -0700
committerBrad Bishop <bradleyb@fuzziesquirrel.com>2019-04-16 12:58:05 -0400
commitc03a3d5e207d52ad35b852a19d66cafd0945b2f7 (patch)
tree25f6ee60969cf56576cb96733a01a672c1b7ae04 /meta-phosphor
parent49803ef58eca2b4bbfbd36806c55724c190437b7 (diff)
downloadtalos-openbmc-c03a3d5e207d52ad35b852a19d66cafd0945b2f7.tar.gz
talos-openbmc-c03a3d5e207d52ad35b852a19d66cafd0945b2f7.zip
Revert "Revert "meta-phosphor: ipmi-kcs: point service to bindir""
This patchset re-enables pointing ipmi-kcs to bindir. This reverts commit df6ddae3d2bf7090ffcd9131d46327ae26b80f9b. kcsbridge: srcrev bump 17a2ab7f39..ab794149e7 Patrick Venture (1): build: install into bin instead of sbin (From meta-phosphor rev: 0d25ef3d3041eb2cbc0545b674e810f0a3f561a2) Change-Id: I11dea12692e5977fdf58b9ead892b0ca563388c9 Signed-off-by: Patrick Venture <venture@google.com> Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
Diffstat (limited to 'meta-phosphor')
-rw-r--r--meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-kcs/org.openbmc.HostIpmi.service2
-rw-r--r--meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-kcs_git.bb2
2 files changed, 2 insertions, 2 deletions
diff --git a/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-kcs/org.openbmc.HostIpmi.service b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-kcs/org.openbmc.HostIpmi.service
index 6b75a7d03..328491f33 100644
--- a/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-kcs/org.openbmc.HostIpmi.service
+++ b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-kcs/org.openbmc.HostIpmi.service
@@ -3,7 +3,7 @@ Description=Phosphor IPMI KCS DBus Bridge
[Service]
Restart=always
-ExecStart={sbindir}/kcsbridged --d="/dev/{KCS_DEVICE}"
+ExecStart={bindir}/kcsbridged --d="/dev/{KCS_DEVICE}"
Type=dbus
BusName={BUSNAME}
diff --git a/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-kcs_git.bb b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-kcs_git.bb
index 7b33f9fc6..3e313335a 100644
--- a/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-kcs_git.bb
+++ b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-kcs_git.bb
@@ -30,7 +30,7 @@ DEPENDS += " \
S = "${WORKDIR}/git"
SRC_URI = "git://github.com/openbmc/kcsbridge.git"
-SRCREV = "17a2ab7f39a78ff0603aa68cf35108ea94eb442f"
+SRCREV = "ab794149e763f9562dfe1278ee0b3143f2af4226"
# This is how linux-libc-headers says to include custom uapi headers
CFLAGS_append = " -I ${STAGING_KERNEL_DIR}/include/uapi"
OpenPOWER on IntegriCloud