summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrad Bishop <bradleyb@fuzziesquirrel.com>2016-08-29 22:44:58 -0400
committerBrad Bishop <bradleyb@fuzziesquirrel.com>2016-09-08 14:40:01 -0400
commitc7dfa7ad12eac03c0396d632f243b8f9fa0fb8b6 (patch)
tree923bad88083e6e493f1cd8171e0ca84539f1c730
parent8a4c3b20037bbd0001962afdf066be61ff78f335 (diff)
downloadtalos-openbmc-c7dfa7ad12eac03c0396d632f243b8f9fa0fb8b6.tar.gz
talos-openbmc-c7dfa7ad12eac03c0396d632f243b8f9fa0fb8b6.zip
Rename obmc-rest to phosphor-rest
Change-Id: Ie121944a89291eaab14093cb087fbcd0290b96b6 Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
-rw-r--r--meta-phosphor/common/recipes-phosphor/interfaces/obmc-rest/obmc-rest.service13
-rw-r--r--meta-phosphor/common/recipes-phosphor/interfaces/phosphor-rest.bb (renamed from meta-phosphor/common/recipes-phosphor/interfaces/obmc-rest.bb)2
-rw-r--r--meta-phosphor/common/recipes-phosphor/interfaces/phosphor-rest/phosphor-rest.service13
-rw-r--r--meta-phosphor/common/recipes-phosphor/packagegroups/packagegroup-obmc-phosphor-apps.bb2
4 files changed, 15 insertions, 15 deletions
diff --git a/meta-phosphor/common/recipes-phosphor/interfaces/obmc-rest/obmc-rest.service b/meta-phosphor/common/recipes-phosphor/interfaces/obmc-rest/obmc-rest.service
deleted file mode 100644
index 6647e61f6..000000000
--- a/meta-phosphor/common/recipes-phosphor/interfaces/obmc-rest/obmc-rest.service
+++ /dev/null
@@ -1,13 +0,0 @@
-[Unit]
-Description=Phosphor OpenBMC DBus REST daemon
-Requires=org.openbmc.ObjectMapper.service
-After=org.openbmc.ObjectMapper.service
-PartOf=systemd-networkd.service
-
-[Service]
-Restart=always
-ExecStart=/usr/sbin/obmc-rest
-Environment="PYTHONUNBUFFERED=1"
-
-[Install]
-WantedBy=multi-user.target
diff --git a/meta-phosphor/common/recipes-phosphor/interfaces/obmc-rest.bb b/meta-phosphor/common/recipes-phosphor/interfaces/phosphor-rest.bb
index 8a747f0ab..3fda832b2 100644
--- a/meta-phosphor/common/recipes-phosphor/interfaces/obmc-rest.bb
+++ b/meta-phosphor/common/recipes-phosphor/interfaces/phosphor-rest.bb
@@ -23,6 +23,6 @@ RDEPENDS_${PN} += " \
"
SRC_URI += "git://github.com/openbmc/phosphor-rest-server"
-SRCREV = "b41507f3b9c9a79ccd0ef6f48ac839b306a604b7"
+SRCREV = "803c6f1be7f589043c817a2b00fac5b0af93d200"
S = "${WORKDIR}/git"
diff --git a/meta-phosphor/common/recipes-phosphor/interfaces/phosphor-rest/phosphor-rest.service b/meta-phosphor/common/recipes-phosphor/interfaces/phosphor-rest/phosphor-rest.service
new file mode 100644
index 000000000..6b1c33d33
--- /dev/null
+++ b/meta-phosphor/common/recipes-phosphor/interfaces/phosphor-rest/phosphor-rest.service
@@ -0,0 +1,13 @@
+[Unit]
+Description=Phosphor DBus REST
+Requires=obmc-mapper.target
+After=obmc-mapper.target
+PartOf=systemd-networkd.service
+
+[Service]
+Restart=always
+ExecStart={sbindir}/phosphor-rest
+Environment="PYTHONUNBUFFERED=1"
+
+[Install]
+WantedBy={SYSTEMD_DEFAULT_TARGET}
diff --git a/meta-phosphor/common/recipes-phosphor/packagegroups/packagegroup-obmc-phosphor-apps.bb b/meta-phosphor/common/recipes-phosphor/packagegroups/packagegroup-obmc-phosphor-apps.bb
index 25f346877..533065212 100644
--- a/meta-phosphor/common/recipes-phosphor/packagegroups/packagegroup-obmc-phosphor-apps.bb
+++ b/meta-phosphor/common/recipes-phosphor/packagegroups/packagegroup-obmc-phosphor-apps.bb
@@ -26,7 +26,7 @@ PACKAGES = " \
SUMMARY_packagegroup-obmc-phosphor-apps-extras = "Extra features"
RDEPENDS_packagegroup-obmc-phosphor-apps-extras = " \
- obmc-rest \
+ phosphor-rest \
host-ipmid \
"
OpenPOWER on IntegriCloud