diff options
-rw-r--r-- | meta-phosphor/common/recipes-phosphor/interfaces/obmc-rest/obmc-rest.service | 13 | ||||
-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.service | 13 | ||||
-rw-r--r-- | meta-phosphor/common/recipes-phosphor/packagegroups/packagegroup-obmc-phosphor-apps.bb | 2 |
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 \ " |