commit 0a81db09cb7f9cb8c0d544ba8866a08d2475a460
author Brad Bishop <bradleyb@fuzziesquirrel.com> Tue Aug 30 00:46:40 2016 -0400
committer Brad Bishop <bradleyb@fuzziesquirrel.com> Thu Sep 08 14:43:11 2016 -0400
tree bbed9c2f9bf8855a28fbda265c1017eda346e12a
parent d969da379bd942c0f2a594ff5e746e437462c051

Split Rocket startup from REST application

Enable drop-in replacement of WSGI application hosts
with PREFERRED_PROVIDER_virtual/obmc-wsgihost.

Change-Id: Ieaa4b17cb4645bfc3224aca2edebb15d023982d5
Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>

common/recipes-phosphor/interfaces/phosphor-rest.bb

diff --git a/common/recipes-phosphor/interfaces/phosphor-rest.bb b/common/recipes-phosphor/interfaces/phosphor-rest.bb
index 3fda832..b03b245 100644
--- a/common/recipes-phosphor/interfaces/phosphor-rest.bb
+++ b/common/recipes-phosphor/interfaces/phosphor-rest.bb
@@ -1,28 +1,31 @@
-SUMMARY = "Phosphor DBUS REST Server"
-DESCRIPTION = "Phosphor DBUS REST manager."
+SUMMARY = "Phosphor DBUS to REST WSGI Application"
+DESCRIPTION = "Phosphor DBUS to REST WSGI Application."
 HOMEPAGE = "http://github.com/openbmc/phosphor-rest-server"
 PR = "r1"
 LICENSE = "Apache-2.0"
-LIC_FILES_CHKSUM = "file://${S}/LICENSE;md5=fa818a259cbed7ce8bc2a22d35a464fc"
+LIC_FILES_CHKSUM = "file://${WORKDIR}/git/LICENSE;md5=fa818a259cbed7ce8bc2a22d35a464fc"
 
 inherit allarch
 inherit obmc-phosphor-systemd
 inherit setuptools
 
+RRECOMMENDS_${PN} += "virtual-obmc-wsgihost"
+
 RDEPENDS_${PN} += " \
         python-xml \
         python-dbus \
-        python-pygobject \
         obmc-mapper \
-        python-rocket \
         python-bottle \
         python-spwd \
-        python-netserver \
         pyphosphor-utils \
         pyphosphor-dbus \
+        pyphosphor-wsgi-apps-ns \
         "
 SRC_URI += "git://github.com/openbmc/phosphor-rest-server"
 
-SRCREV = "803c6f1be7f589043c817a2b00fac5b0af93d200"
+SRCREV = "2c6fc760919cc214413874d60489e3643b639692"
 
-S = "${WORKDIR}/git"
+S = "${WORKDIR}/git/module"
+SYSTEMD_SERVICE_${PN} = ""
+SYSTEMD_OVERRIDE_${PN} += "rest-dbus.conf:obmc-mapper.target.d/rest-dbus.conf"
+SYSTEMD_ENVIRONMENT_FILE_${PN} += "obmc/wsgi_app"