Merge pull request #80 from bradbishop/rocket
prepare for rocket wsgi server
diff --git a/common/recipes-core/os-release/os-release.bbappend b/common/recipes-core/os-release/os-release.bbappend
new file mode 100644
index 0000000..1692af1
--- /dev/null
+++ b/common/recipes-core/os-release/os-release.bbappend
@@ -0,0 +1,8 @@
+def git_describe(d):
+ return bb.process.run("git describe --dirty")[0]
+def git_tag(d):
+ return bb.process.run("git tag")[0]
+
+VERSION_ID = "${@git_tag(d)}"
+BUILD_ID = "${@git_describe(d)}"
+OS_RELEASE_FIELDS_append = " BUILD_ID"
diff --git a/common/recipes-phosphor/host-ipmid/host-ipmid-oem.bb b/common/recipes-phosphor/host-ipmid/host-ipmid-oem.bb
index d4bd534..fa3e1bf 100644
--- a/common/recipes-phosphor/host-ipmid/host-ipmid-oem.bb
+++ b/common/recipes-phosphor/host-ipmid/host-ipmid-oem.bb
@@ -18,7 +18,7 @@
SRC_URI += "git://github.com/openbmc/openpower-host-ipmi-oem"
-SRCREV = "29a8e0fd82d70af5626df5346f4c3d2568752af9"
+SRCREV = "b7df30ea8ad991c2d811e77ed4dee1beaa766883"
FILES_${PN} += "${libdir}/host-ipmid/*.so"
FILES_${PN}-dbg += "${libdir}/host-ipmid/.debug"
diff --git a/common/recipes-phosphor/host-ipmid/host-ipmid.bb b/common/recipes-phosphor/host-ipmid/host-ipmid.bb
index 2a2959a..4926393 100644
--- a/common/recipes-phosphor/host-ipmid/host-ipmid.bb
+++ b/common/recipes-phosphor/host-ipmid/host-ipmid.bb
@@ -14,7 +14,7 @@
SRC_URI += "git://github.com/openbmc/phosphor-host-ipmid"
-SRCREV = "8f71a6190d17d59f8de49182b0a8f3f063be3146"
+SRCREV = "1da5c8668368417802f2c0007f61dbe35c3c3052"
S = "${WORKDIR}/git"