From 570264ff0d9606a88a68486a1ce82e2d6f512828 Mon Sep 17 00:00:00 2001 From: Brad Bishop Date: Fri, 15 Apr 2016 09:23:44 -0400 Subject: New recipe for pyphosphor library We have openbmc python utilities scattered all over the place. To facilitate reuse, bring them together in a single python package. --- .../common/recipes-phosphor/skeleton/pyphosphor.bb | 15 +++++++++++++++ 1 file changed, 15 insertions(+) create mode 100644 meta-phosphor/common/recipes-phosphor/skeleton/pyphosphor.bb 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 0000000000..a44f19a6a7 --- /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" -- cgit v1.2.3 From 7fe43dbd0852876a174823359b1e1f951c91edbc Mon Sep 17 00:00:00 2001 From: Brad Bishop Date: Fri, 15 Apr 2016 09:53:23 -0400 Subject: New recipe for openpower-inventory-upload This script uploads the BMC inventory to a partition in PNOR on POWER systems for inclusion in the host device tree. --- .../images/obmc-phosphor-image.bbappend | 3 +++ .../inventory-upload/inventory-upload.bb | 20 ++++++++++++++++++++ meta-openbmc-machines/meta-openpower/conf/layer.conf | 4 +++- 3 files changed, 26 insertions(+), 1 deletion(-) create mode 100644 meta-openbmc-machines/meta-openpower/common/recipes-phosphor/images/obmc-phosphor-image.bbappend create mode 100644 meta-openbmc-machines/meta-openpower/common/recipes-phosphor/inventory-upload/inventory-upload.bb diff --git a/meta-openbmc-machines/meta-openpower/common/recipes-phosphor/images/obmc-phosphor-image.bbappend b/meta-openbmc-machines/meta-openpower/common/recipes-phosphor/images/obmc-phosphor-image.bbappend new file mode 100644 index 0000000000..7b8aa6f87d --- /dev/null +++ b/meta-openbmc-machines/meta-openpower/common/recipes-phosphor/images/obmc-phosphor-image.bbappend @@ -0,0 +1,3 @@ +IMAGE_INSTALL += " \ + inventory-upload \ +" diff --git a/meta-openbmc-machines/meta-openpower/common/recipes-phosphor/inventory-upload/inventory-upload.bb b/meta-openbmc-machines/meta-openpower/common/recipes-phosphor/inventory-upload/inventory-upload.bb new file mode 100644 index 0000000000..8c0bd34e32 --- /dev/null +++ b/meta-openbmc-machines/meta-openpower/common/recipes-phosphor/inventory-upload/inventory-upload.bb @@ -0,0 +1,20 @@ +SUMMARY = "Inventory upload" +DESCRIPTION = "Inventory upload." +HOMEPAGE = "http://github.com/openbmc/openpower-inventory-upload" +PR = "r1" +LICENSE = "Apache-2.0" +LIC_FILES_CHKSUM = "file://${S}/LICENSE;md5=e3fc50a88d0a364313df4b21ef20c29e" + +inherit allarch +inherit setuptools + +RDEPENDS_${PN} += " \ + pyphosphor \ + dtc \ + " + +SRC_URI += "git://github.com/openbmc/openpower-inventory-upload" + +SRCREV = "5909e7859a1a56bdc902cf774093d9fae29612ea" + +S = "${WORKDIR}/git" diff --git a/meta-openbmc-machines/meta-openpower/conf/layer.conf b/meta-openbmc-machines/meta-openpower/conf/layer.conf index 46c5a5dfb6..6824543db2 100644 --- a/meta-openbmc-machines/meta-openpower/conf/layer.conf +++ b/meta-openbmc-machines/meta-openpower/conf/layer.conf @@ -1,8 +1,10 @@ # We have a conf and classes directory, add to BBPATH BBPATH .= ":${LAYERDIR}" +# We have recipes-* directories, add to BBFILES BBFILES += "${LAYERDIR}/common/recipes-*/*/*.bb \ ${LAYERDIR}/common/recipes-*/*/*.bbappend" BBFILE_COLLECTIONS += "openpower" -BBFILE_PATTERN_openpower = "" +BBFILE_PATTERN_openpower = "^${LAYERDIR}/" +LAYERVERSION_openpower = "1" -- cgit v1.2.3 From 1866754819cf99a5e0c93eb62245ab6aefbd271d Mon Sep 17 00:00:00 2001 From: Brad Bishop Date: Fri, 15 Apr 2016 09:41:54 -0400 Subject: Whitespace fixes for obmc-rest.bb OE style guidelines dictate no tabs. --- meta-phosphor/common/recipes-phosphor/dbus/obmc-rest.bb | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/meta-phosphor/common/recipes-phosphor/dbus/obmc-rest.bb b/meta-phosphor/common/recipes-phosphor/dbus/obmc-rest.bb index f66dd26e68..944199f174 100644 --- a/meta-phosphor/common/recipes-phosphor/dbus/obmc-rest.bb +++ b/meta-phosphor/common/recipes-phosphor/dbus/obmc-rest.bb @@ -13,10 +13,10 @@ RDEPENDS_${PN} += " \ python-xml \ python-dbus \ python-pygobject \ - obmc-mapper \ - python-rocket \ - python-bottle \ - python-spwd \ + obmc-mapper \ + python-rocket \ + python-bottle \ + python-spwd \ " SRC_URI += "git://github.com/openbmc/phosphor-rest-server" -- cgit v1.2.3 From ce54900d0cce9ab66c614982baba40441584a6b7 Mon Sep 17 00:00:00 2001 From: Brad Bishop Date: Fri, 15 Apr 2016 09:45:48 -0400 Subject: Add pyphosphor requirement to rest-dbus Once this happens the duplicated code can be removed from rest-dbus. --- meta-phosphor/common/recipes-phosphor/rest-dbus/rest-dbus.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 fa551f5533..1dfe02708e 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 += " \ -- cgit v1.2.3 From 2a1411ffd1bce065f3fa6ba4a093af29e871ba0a Mon Sep 17 00:00:00 2001 From: Brad Bishop Date: Fri, 29 Apr 2016 16:19:14 -0400 Subject: Bump rest, mapper and rest-dbus versions Picking up support for pyphosphor and associations. --- meta-phosphor/common/recipes-phosphor/dbus/obmc-mapper.bb | 2 +- meta-phosphor/common/recipes-phosphor/dbus/obmc-rest.bb | 3 ++- meta-phosphor/common/recipes-phosphor/rest-dbus/rest-dbus.bb | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/meta-phosphor/common/recipes-phosphor/dbus/obmc-mapper.bb b/meta-phosphor/common/recipes-phosphor/dbus/obmc-mapper.bb index ab6dc98f78..5b5929000d 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 944199f174..af695785b2 100644 --- a/meta-phosphor/common/recipes-phosphor/dbus/obmc-rest.bb +++ b/meta-phosphor/common/recipes-phosphor/dbus/obmc-rest.bb @@ -17,9 +17,10 @@ RDEPENDS_${PN} += " \ 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 1dfe02708e..bf25caeb38 100644 --- a/meta-phosphor/common/recipes-phosphor/rest-dbus/rest-dbus.bb +++ b/meta-phosphor/common/recipes-phosphor/rest-dbus/rest-dbus.bb @@ -21,6 +21,6 @@ SRC_URI += " \ file://rest-dbus.service \ " -SRCREV = "b10a57e2f34e94b13697328cc22f876f738feb0e" +SRCREV = "c693ba1126dcb493058d4ebeb4604b71e3bb3f08" S = "${WORKDIR}/git" -- cgit v1.2.3