| commit | c13be613dcd8a293051df37cbbc51f0c357b7444 | [log] [tgz] |
|---|---|---|
| author | Adriana Kobylak <anoo@us.ibm.com> | Fri Jun 24 16:14:08 2016 -0500 |
| committer | Adriana Kobylak <anoo@us.ibm.com> | Fri Jun 24 16:14:08 2016 -0500 |
| tree | 5f1771f8eee5b3128ccfaab825ade134e578b9d5 | |
| parent | f81616d2dd9f38743a7b93bbf6276be83d2eaddc [diff] |
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>
diff --git a/meta-phosphor/common/recipes-phosphor/dbus/obmc-mapper.bb b/meta-phosphor/common/recipes-phosphor/dbus/obmc-mapper.bb index c53e687..3c3208d 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 @@ " 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 f57da02..05d1e80 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 @@ Type=dbus ExecStart=/usr/sbin/phosphor-mapper BusName=org.openbmc.ObjectMapper +TimeoutStartSec=300 [Install] WantedBy=multi-user.target