diff options
| author | nkskjames <nkskjames@gmail.com> | 2016-05-05 14:32:29 -0500 |
|---|---|---|
| committer | nkskjames <nkskjames@gmail.com> | 2016-05-05 14:32:29 -0500 |
| commit | 92dc859830b815f0d6e2c7e497e6c8033922ccc2 (patch) | |
| tree | 6d9b308cc08b021b3f0a85d74dccf553688cefe9 | |
| parent | 6ac9dd7162e6e5fdf8e888c36ab143ec7f266cca (diff) | |
| parent | f441ae37145555d6ace77fa1fe6cca2771600823 (diff) | |
| download | talos-openbmc-0.7.tar.gz talos-openbmc-0.7.zip | |
Merge pull request #256 from bradbishop/uploadv0.7
Bump versions for inventory upload
4 files changed, 16 insertions, 3 deletions
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 index 8c0bd34e3..c3a23610c 100644 --- 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 @@ -6,15 +6,18 @@ LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://${S}/LICENSE;md5=e3fc50a88d0a364313df4b21ef20c29e" inherit allarch +inherit obmc-phosphor-systemd inherit setuptools RDEPENDS_${PN} += " \ + python-dbus \ + python-pygobject \ pyphosphor \ dtc \ " SRC_URI += "git://github.com/openbmc/openpower-inventory-upload" -SRCREV = "5909e7859a1a56bdc902cf774093d9fae29612ea" +SRCREV = "867e058dd246739ab9c93df64e82b7526f42d67f" S = "${WORKDIR}/git" diff --git a/meta-openbmc-machines/meta-openpower/common/recipes-phosphor/inventory-upload/inventory-upload/inventory-upload.service b/meta-openbmc-machines/meta-openpower/common/recipes-phosphor/inventory-upload/inventory-upload/inventory-upload.service new file mode 100644 index 000000000..18d1f4bb8 --- /dev/null +++ b/meta-openbmc-machines/meta-openpower/common/recipes-phosphor/inventory-upload/inventory-upload/inventory-upload.service @@ -0,0 +1,10 @@ +[Unit] +Description=BMC Inventory Upload +Requires=skeleton.service +After=skeleton.service + +[Service] +ExecStart=/usr/sbin/inventory_upload.py + +[Install] +WantedBy=multi-user.target diff --git a/meta-phosphor/common/recipes-phosphor/dbus/obmc-mapper.bb b/meta-phosphor/common/recipes-phosphor/dbus/obmc-mapper.bb index 5b5929000..2472917b2 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 = "a2c0d00e47ec082b8bb8c96629a0a677616e49fe" +SRCREV = "2abc4d068cec75aa3893af8197108d29ff6f1bb4" S = "${WORKDIR}/git" diff --git a/meta-phosphor/common/recipes-phosphor/skeleton/skeleton.bb b/meta-phosphor/common/recipes-phosphor/skeleton/skeleton.bb index a258c2aa3..155331417 100644 --- a/meta-phosphor/common/recipes-phosphor/skeleton/skeleton.bb +++ b/meta-phosphor/common/recipes-phosphor/skeleton/skeleton.bb @@ -20,7 +20,7 @@ SRC_URI += "git://github.com/openbmc/skeleton" PACKAGECONFIG ??= "${@bb.utils.contains('MACHINE_FEATURES', 'openpower-pflash', 'openpower-pflash', '', d)}" PACKAGECONFIG[openpower-pflash] = ",,,pflash" -SRCREV = "d3e6edc748f026dcd68d20306a1cfe0e26df22a9" +SRCREV = "264009617c231447d6c8fc61264cf3c6ea7f49d5" S = "${WORKDIR}" |
