diff options
| author | nkskjames <nkskjames@gmail.com> | 2016-04-29 20:36:59 -0500 |
|---|---|---|
| committer | nkskjames <nkskjames@gmail.com> | 2016-04-29 20:36:59 -0500 |
| commit | 312f114933b357b2bb636d53b90f3c7e793c5acf (patch) | |
| tree | b3ef0e29a6f37390a3677b2bb6a6a532469e813c /meta-phosphor | |
| parent | 16642cb95bd42000de7d3243afc7815014fec2a2 (diff) | |
| parent | 2a1411ffd1bce065f3fa6ba4a093af29e871ba0a (diff) | |
| download | talos-openbmc-312f114933b357b2bb636d53b90f3c7e793c5acf.tar.gz talos-openbmc-312f114933b357b2bb636d53b90f3c7e793c5acf.zip | |
Merge pull request #252 from bradbishop/pull
new recipes, version bumps supporting associations
Diffstat (limited to 'meta-phosphor')
4 files changed, 24 insertions, 8 deletions
diff --git a/meta-phosphor/common/recipes-phosphor/dbus/obmc-mapper.bb b/meta-phosphor/common/recipes-phosphor/dbus/obmc-mapper.bb index ab6dc98f7..5b5929000 100644 --- a/meta-phosphor/common/recipes-phosphor/dbus/obmc-mapper.bb +++ b/meta-phosphor/common/recipes-phosphor/dbus/obmc-mapper.bb @@ -18,6 +18,6 @@ RDEPENDS_${PN} += " \ " SRC_URI += "git://github.com/openbmc/phosphor-objmgr" -SRCREV = "956dd44fe5c8377ec90cef393f65033d59e082b0" +SRCREV = "a2c0d00e47ec082b8bb8c96629a0a677616e49fe" S = "${WORKDIR}/git" diff --git a/meta-phosphor/common/recipes-phosphor/dbus/obmc-rest.bb b/meta-phosphor/common/recipes-phosphor/dbus/obmc-rest.bb index f66dd26e6..af695785b 100644 --- a/meta-phosphor/common/recipes-phosphor/dbus/obmc-rest.bb +++ b/meta-phosphor/common/recipes-phosphor/dbus/obmc-rest.bb @@ -13,13 +13,14 @@ RDEPENDS_${PN} += " \ python-xml \ python-dbus \ python-pygobject \ - obmc-mapper \ - python-rocket \ - python-bottle \ - python-spwd \ + obmc-mapper \ + python-rocket \ + python-bottle \ + python-spwd \ + pyphosphor \ " SRC_URI += "git://github.com/openbmc/phosphor-rest-server" -SRCREV = "fe90e0c579edbc19699e5aa7abbe4dd29b4dd112" +SRCREV = "b41507f3b9c9a79ccd0ef6f48ac839b306a604b7" S = "${WORKDIR}/git" 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 fa551f553..bf25caeb3 100644 --- a/meta-phosphor/common/recipes-phosphor/rest-dbus/rest-dbus.bb +++ b/meta-phosphor/common/recipes-phosphor/rest-dbus/rest-dbus.bb @@ -13,7 +13,7 @@ RDEPENDS_${PN} += " \ python-json \ python-dbus \ python-xml \ - obmc-mapper \ + pyphosphor \ " SRC_URI += " \ @@ -21,6 +21,6 @@ SRC_URI += " \ file://rest-dbus.service \ " -SRCREV = "b10a57e2f34e94b13697328cc22f876f738feb0e" +SRCREV = "c693ba1126dcb493058d4ebeb4604b71e3bb3f08" S = "${WORKDIR}/git" diff --git a/meta-phosphor/common/recipes-phosphor/skeleton/pyphosphor.bb b/meta-phosphor/common/recipes-phosphor/skeleton/pyphosphor.bb new file mode 100644 index 000000000..a44f19a6a --- /dev/null +++ b/meta-phosphor/common/recipes-phosphor/skeleton/pyphosphor.bb @@ -0,0 +1,15 @@ +SUMMARY = "Phosphor python library" +DESCRIPTION = "Phosphor python library." +HOMEPAGE = "http://github.com/openbmc/pyobmc" +PR = "r1" +LICENSE = "Apache-2.0" +LIC_FILES_CHKSUM = "file://${S}/LICENSE;md5=e3fc50a88d0a364313df4b21ef20c29e" + +inherit allarch +inherit setuptools + +SRC_URI += "git://github.com/openbmc/pyphosphor" + +SRCREV = "1b3c05c1f44185f8176f46829a26ad6e50d0831f" + +S = "${WORKDIR}/git" |
