diff options
author | Adriana Kobylak <anoo@us.ibm.com> | 2016-06-25 00:14:08 +0300 |
---|---|---|
committer | Adriana Kobylak <anoo@us.ibm.com> | 2016-06-25 00:14:08 +0300 |
commit | c13be613dcd8a293051df37cbbc51f0c357b7444 (patch) | |
tree | 5f1771f8eee5b3128ccfaab825ade134e578b9d5 /meta-phosphor/common | |
parent | f81616d2dd9f38743a7b93bbf6276be83d2eaddc (diff) | |
download | openbmc-c13be613dcd8a293051df37cbbc51f0c357b7444.tar.xz |
Bump versions for skeleton, IPMI, obmc-mapper
Pick changes for:
Encoding firmware version in BCD format
Handle floating point sensor values
Performance improvements
Extend the mapper service startup timeout
Signed-off-by: Adriana Kobylak <anoo@us.ibm.com>
Diffstat (limited to 'meta-phosphor/common')
4 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 c53e68777..3c3208d2b 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 = "0bdc22a259720ee3a7ca78ee3aa07ab83bb39743" +SRCREV = "067db7287a647789e7d5d5dbccc514c5c835a944" S = "${WORKDIR}/git" diff --git a/meta-phosphor/common/recipes-phosphor/dbus/obmc-mapper/obmc-mapper.service b/meta-phosphor/common/recipes-phosphor/dbus/obmc-mapper/obmc-mapper.service index f57da025a..05d1e8040 100644 --- a/meta-phosphor/common/recipes-phosphor/dbus/obmc-mapper/obmc-mapper.service +++ b/meta-phosphor/common/recipes-phosphor/dbus/obmc-mapper/obmc-mapper.service @@ -6,6 +6,7 @@ Restart=always Type=dbus ExecStart=/usr/sbin/phosphor-mapper BusName=org.openbmc.ObjectMapper +TimeoutStartSec=300 [Install] WantedBy=multi-user.target diff --git a/meta-phosphor/common/recipes-phosphor/host-ipmid/host-ipmid.bb b/meta-phosphor/common/recipes-phosphor/host-ipmid/host-ipmid.bb index 23728cbbc..2a761de21 100644 --- a/meta-phosphor/common/recipes-phosphor/host-ipmid/host-ipmid.bb +++ b/meta-phosphor/common/recipes-phosphor/host-ipmid/host-ipmid.bb @@ -19,7 +19,7 @@ RDEPENDS_${PN} += "settings" RDEPENDS_${PN} += "network" SRC_URI += "git://github.com/openbmc/phosphor-host-ipmid" -SRCREV = "092360e55605c205aedd2ab40044c42e64b7d38c" +SRCREV = "b7bcda57ee39616e8937194d281e2476e6ea8df2" S = "${WORKDIR}/git" INSTALL_NAME = "ipmid" diff --git a/meta-phosphor/common/recipes-phosphor/skeleton/skeleton.bb b/meta-phosphor/common/recipes-phosphor/skeleton/skeleton.bb index feb86cbe1..77a298052 100644 --- a/meta-phosphor/common/recipes-phosphor/skeleton/skeleton.bb +++ b/meta-phosphor/common/recipes-phosphor/skeleton/skeleton.bb @@ -26,7 +26,7 @@ FILES_${PN} += "${PYTHON_SITEPACKAGES_DIR}/*" PACKAGECONFIG ??= "${@bb.utils.contains('MACHINE_FEATURES', 'openpower-pflash', 'openpower-pflash', '', d)}" PACKAGECONFIG[openpower-pflash] = ",,,pflash" -SRCREV = "57f67f07c8d5c8bc73dc0cd3440c8a44fafa6941" +SRCREV = "fa8f6166a05410472e8a3ef6a2f2e3b9b5f8d8e4" S = "${WORKDIR}" |