From a981b106d6317580587597710aee220ce38cca54 Mon Sep 17 00:00:00 2001 From: Patrick Williams Date: Wed, 1 Mar 2017 21:25:36 -0600 Subject: phosphor-rest: consolidate SRCREV Change-Id: Ibc52e625764ba9f03c13267792b9c551f0bf3d8f Signed-off-by: Patrick Williams --- .../common/recipes-phosphor/interfaces/phosphor-gevent.bb | 8 ++------ meta-phosphor/common/recipes-phosphor/interfaces/phosphor-rest.bb | 8 ++------ .../common/recipes-phosphor/interfaces/phosphor-rest.inc | 7 +++++++ .../common/recipes-phosphor/interfaces/phosphor-rocket.bb | 8 ++------ 4 files changed, 13 insertions(+), 18 deletions(-) create mode 100644 meta-phosphor/common/recipes-phosphor/interfaces/phosphor-rest.inc (limited to 'meta-phosphor') diff --git a/meta-phosphor/common/recipes-phosphor/interfaces/phosphor-gevent.bb b/meta-phosphor/common/recipes-phosphor/interfaces/phosphor-gevent.bb index 5454b3019..ee24a1339 100644 --- a/meta-phosphor/common/recipes-phosphor/interfaces/phosphor-gevent.bb +++ b/meta-phosphor/common/recipes-phosphor/interfaces/phosphor-gevent.bb @@ -1,23 +1,19 @@ SUMMARY = "Phosphor Rocket startup script" DESCRIPTION = "Phosphor Rocket startup script." -HOMEPAGE = "http://github.com/openbmc/phosphor-rest-server" PR = "r1" -LICENSE = "Apache-2.0" -LIC_FILES_CHKSUM = "file://${WORKDIR}/git/LICENSE;md5=fa818a259cbed7ce8bc2a22d35a464fc" inherit allarch inherit setuptools inherit obmc-phosphor-systemd +require phosphor-rest.inc + PROVIDES += "virtual/obmc-wsgihost" RPROVIDES_${PN} += "virtual-obmc-wsgihost" RDEPENDS_${PN} += " \ python-gevent \ " -SRC_URI += "git://github.com/openbmc/phosphor-rest-server" - -SRCREV = "56ad87f338efcabdfd2c99a1a6fa99bd94412b3e" S = "${WORKDIR}/git/servers/gevent" diff --git a/meta-phosphor/common/recipes-phosphor/interfaces/phosphor-rest.bb b/meta-phosphor/common/recipes-phosphor/interfaces/phosphor-rest.bb index 90e51b374..6361f2598 100644 --- a/meta-phosphor/common/recipes-phosphor/interfaces/phosphor-rest.bb +++ b/meta-phosphor/common/recipes-phosphor/interfaces/phosphor-rest.bb @@ -1,15 +1,14 @@ 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://${WORKDIR}/git/LICENSE;md5=fa818a259cbed7ce8bc2a22d35a464fc" inherit allarch inherit obmc-phosphor-systemd inherit setuptools inherit obmc-phosphor-discovery-service +require phosphor-rest.inc + RRECOMMENDS_${PN} += "virtual-obmc-wsgihost" RDEPENDS_${PN} += " \ @@ -22,9 +21,6 @@ RDEPENDS_${PN} += " \ pyphosphor-dbus \ pyphosphor-wsgi-apps-ns \ " -SRC_URI += "git://github.com/openbmc/phosphor-rest-server" - -SRCREV = "56ad87f338efcabdfd2c99a1a6fa99bd94412b3e" S = "${WORKDIR}/git/module" SYSTEMD_SERVICE_${PN} = "" diff --git a/meta-phosphor/common/recipes-phosphor/interfaces/phosphor-rest.inc b/meta-phosphor/common/recipes-phosphor/interfaces/phosphor-rest.inc new file mode 100644 index 000000000..60c05479c --- /dev/null +++ b/meta-phosphor/common/recipes-phosphor/interfaces/phosphor-rest.inc @@ -0,0 +1,7 @@ +HOMEPAGE = "http://github.com/openbmc/phosphor-rest-server" +LICENSE = "Apache-2.0" +LIC_FILES_CHKSUM = "file://${WORKDIR}/git/LICENSE;md5=fa818a259cbed7ce8bc2a22d35a464fc" + +SRC_URI += "git://github.com/openbmc/phosphor-rest-server" +SRCREV = "56ad87f338efcabdfd2c99a1a6fa99bd94412b3e" + diff --git a/meta-phosphor/common/recipes-phosphor/interfaces/phosphor-rocket.bb b/meta-phosphor/common/recipes-phosphor/interfaces/phosphor-rocket.bb index 962245135..daa6a5cd7 100644 --- a/meta-phosphor/common/recipes-phosphor/interfaces/phosphor-rocket.bb +++ b/meta-phosphor/common/recipes-phosphor/interfaces/phosphor-rocket.bb @@ -1,22 +1,18 @@ SUMMARY = "Phosphor Rocket startup script" DESCRIPTION = "Phosphor Rocket startup script." -HOMEPAGE = "http://github.com/openbmc/phosphor-rest-server" PR = "r1" -LICENSE = "Apache-2.0" -LIC_FILES_CHKSUM = "file://${WORKDIR}/git/LICENSE;md5=fa818a259cbed7ce8bc2a22d35a464fc" inherit allarch inherit setuptools inherit obmc-phosphor-systemd +require phosphor-rest.inc + PROVIDES += "virtual/obmc-wsgihost" RPROVIDES_${PN} += "virtual-obmc-wsgihost" RDEPENDS_${PN} += " \ python-rocket \ " -SRC_URI += "git://github.com/openbmc/phosphor-rest-server" - -SRCREV = "56ad87f338efcabdfd2c99a1a6fa99bd94412b3e" S = "${WORKDIR}/git/servers/rocket" -- cgit v1.2.1