diff options
author | Patrick Williams <patrick@stwcx.xyz> | 2016-06-26 20:16:12 -0500 |
---|---|---|
committer | GitHub <noreply@github.com> | 2016-06-26 20:16:12 -0500 |
commit | f09d4b2ecf0ad6305d73a609b5c58027def1b0d7 (patch) | |
tree | a801aba6df0f3aa96a27d0750f41ff63d29a12e2 /meta-phosphor/common | |
parent | d8cd888a0e5142e1540d50f5c69805b2279a8b36 (diff) | |
parent | 60e3575170b952464763deb46ee9c060cf58c1e3 (diff) | |
download | talos-openbmc-f09d4b2ecf0ad6305d73a609b5c58027def1b0d7.tar.gz talos-openbmc-f09d4b2ecf0ad6305d73a609b5c58027def1b0d7.zip |
Merge pull request #414 from anoo1/0624v1.0.1
Bump versions for skeleton, IPMI, obmc-mapper
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 4402227a8..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 = "cbe32133dadf0945357e2bec67aa7a86ae9f0295" +SRCREV = "fa8f6166a05410472e8a3ef6a2f2e3b9b5f8d8e4" S = "${WORKDIR}" |