summaryrefslogtreecommitdiffstats
path: root/meta-phosphor/common
diff options
context:
space:
mode:
authorPatrick Williams <patrick@stwcx.xyz>2016-06-13 12:56:15 -0500
committerGitHub <noreply@github.com>2016-06-13 12:56:15 -0500
commit9f1d336d6708a63c7c59f8938bc0d4f365d4671a (patch)
treeeb1d42e158106f729df29c7bed51c4697ebdd112 /meta-phosphor/common
parent73a644099913b30391f7757edc3b7c4aaf6a32f0 (diff)
parent10c2f855e927bcfdaedbf93681f2734792f0675e (diff)
downloadtalos-openbmc-9f1d336d6708a63c7c59f8938bc0d4f365d4671a.tar.gz
talos-openbmc-9f1d336d6708a63c7c59f8938bc0d4f365d4671a.zip
Merge pull request #323 from bradbishop/rest-dbus-socket
Turn on socket activation for rest-dbus
Diffstat (limited to 'meta-phosphor/common')
-rw-r--r--meta-phosphor/common/recipes-phosphor/host-ipmid/host-ipmi-hw-example/host-ipmi-hw.service (renamed from meta-phosphor/common/recipes-phosphor/host-ipmid/host-ipmi-hw-example/host-ipmi-hw-example.service)0
-rw-r--r--meta-phosphor/common/recipes-phosphor/rest-dbus/files/rest-dbus.service3
-rw-r--r--meta-phosphor/common/recipes-phosphor/rest-dbus/files/rest-dbus.socket8
-rw-r--r--meta-phosphor/common/recipes-phosphor/rest-dbus/rest-dbus.bb5
4 files changed, 11 insertions, 5 deletions
diff --git a/meta-phosphor/common/recipes-phosphor/host-ipmid/host-ipmi-hw-example/host-ipmi-hw-example.service b/meta-phosphor/common/recipes-phosphor/host-ipmid/host-ipmi-hw-example/host-ipmi-hw.service
index e15d8d71b..e15d8d71b 100644
--- a/meta-phosphor/common/recipes-phosphor/host-ipmid/host-ipmi-hw-example/host-ipmi-hw-example.service
+++ b/meta-phosphor/common/recipes-phosphor/host-ipmid/host-ipmi-hw-example/host-ipmi-hw.service
diff --git a/meta-phosphor/common/recipes-phosphor/rest-dbus/files/rest-dbus.service b/meta-phosphor/common/recipes-phosphor/rest-dbus/files/rest-dbus.service
index 79a848a43..5ad582f4b 100644
--- a/meta-phosphor/common/recipes-phosphor/rest-dbus/files/rest-dbus.service
+++ b/meta-phosphor/common/recipes-phosphor/rest-dbus/files/rest-dbus.service
@@ -4,6 +4,3 @@ Description=DBUS introspecting REST server.
[Service]
Restart=always
ExecStart=/usr/sbin/rest-dbus
-
-[Install]
-WantedBy=multi-user.target
diff --git a/meta-phosphor/common/recipes-phosphor/rest-dbus/files/rest-dbus.socket b/meta-phosphor/common/recipes-phosphor/rest-dbus/files/rest-dbus.socket
new file mode 100644
index 000000000..89f99b8c3
--- /dev/null
+++ b/meta-phosphor/common/recipes-phosphor/rest-dbus/files/rest-dbus.socket
@@ -0,0 +1,8 @@
+[Unit]
+Description=DBUS introspecting REST server socket.
+
+[Socket]
+ListenStream=3000
+
+[Install]
+WantedBy=sockets.target
diff --git a/meta-phosphor/common/recipes-phosphor/rest-dbus/rest-dbus.bb b/meta-phosphor/common/recipes-phosphor/rest-dbus/rest-dbus.bb
index 7f990aaa3..afee21c5e 100644
--- a/meta-phosphor/common/recipes-phosphor/rest-dbus/rest-dbus.bb
+++ b/meta-phosphor/common/recipes-phosphor/rest-dbus/rest-dbus.bb
@@ -16,11 +16,12 @@ RDEPENDS_${PN} += " \
pyphosphor \
"
+SYSTEMD_SERVICE_${PN} += "rest-dbus.service rest-dbus.socket"
+
SRC_URI += " \
git://github.com/openbmc/rest-dbus.git \
- file://rest-dbus.service \
"
-SRCREV = "64077101d9f2b6e51c897db82ffc0a399a34d15b"
+SRCREV = "5a65d2f605494d5c308171ba4fd1ab08d7b3a91d"
S = "${WORKDIR}/git"
OpenPOWER on IntegriCloud