Merge pull request #113 from bradbishop/spwd
Add python-spwd depenency to rest server
diff --git a/common/recipes-core/os-release/os-release.bbappend b/common/recipes-core/os-release/os-release.bbappend
index ba6a772..b112c50 100644
--- a/common/recipes-core/os-release/os-release.bbappend
+++ b/common/recipes-core/os-release/os-release.bbappend
@@ -6,7 +6,7 @@
pass
python() {
- version_id = run_git(d, 'tag')
+ version_id = run_git(d, 'describe --abbrev=0')
if version_id:
d.setVar('VERSION_ID', version_id)
@@ -16,3 +16,4 @@
}
OS_RELEASE_FIELDS_append = " BUILD_ID"
+do_compile[nostamp] = "1"
diff --git a/common/recipes-kernel/linux/linux-obmc_4.3.bb b/common/recipes-kernel/linux/linux-obmc_4.3.bb
index e57165b..8958215 100644
--- a/common/recipes-kernel/linux/linux-obmc_4.3.bb
+++ b/common/recipes-kernel/linux/linux-obmc_4.3.bb
@@ -10,7 +10,7 @@
LINUX_VERSION ?= "4.3"
LINUX_VERSION_EXTENSION ?= "-${SRCREV}"
-SRCREV="openbmc-20151202-1"
+SRCREV="openbmc-20151210-1"
PV = "${LINUX_VERSION}+git${SRCPV}"
diff --git a/common/recipes-phosphor/dbus/obmc-mapper.bb b/common/recipes-phosphor/dbus/obmc-mapper.bb
index 323a179..b9df28a 100644
--- a/common/recipes-phosphor/dbus/obmc-mapper.bb
+++ b/common/recipes-phosphor/dbus/obmc-mapper.bb
@@ -16,9 +16,7 @@
python-dbus \
python-pygobject \
"
-SRC_URI += " \
- git://github.com/openbmc/phosphor-objmgr \
- "
+SRC_URI += "git://github.com/openbmc/phosphor-objmgr"
SRCREV = "3f7aa329568d8f191baeeefa4a63dbb19cf26338"
diff --git a/common/recipes-phosphor/dbus/obmc-rest.bb b/common/recipes-phosphor/dbus/obmc-rest.bb
index cb68953..3033a8d 100644
--- a/common/recipes-phosphor/dbus/obmc-rest.bb
+++ b/common/recipes-phosphor/dbus/obmc-rest.bb
@@ -18,9 +18,7 @@
python-bottle \
python-spwd \
"
-SRC_URI += " \
- git://github.com/openbmc/phosphor-rest-server \
- "
+SRC_URI += "git://github.com/openbmc/phosphor-rest-server"
SRCREV = "34cae732597fb3d4b18a23b6494efdbfeca2033b"
diff --git a/common/recipes-phosphor/host-ipmid/btbridged.bb b/common/recipes-phosphor/host-ipmid/btbridged.bb
index 1de0cc4..14a9611 100644
--- a/common/recipes-phosphor/host-ipmid/btbridged.bb
+++ b/common/recipes-phosphor/host-ipmid/btbridged.bb
@@ -11,7 +11,7 @@
S = "${WORKDIR}/git"
SRC_URI += "git://github.com/openbmc/btbridge"
-SRCREV="eee5a2c00faf794a40bf11650e7c0585adc88932"
+SRCREV="d2f64ecf533ed6940d1de003cf979eb62d05e3e6"
# This is how linux-libc-headers says to include custom uapi headers
EXTRA_OEMAKE_append = "CFLAGS=-I${STAGING_KERNEL_DIR}/include/uapi"
diff --git a/common/recipes-phosphor/host-ipmid/host-ipmid.bb b/common/recipes-phosphor/host-ipmid/host-ipmid.bb
index c20bd9a..c03405c 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 = "7e478ce6b065a8bbd2de0ac00934e43cc1639501"
+SRCREV = "903327c4e9f901a692939338b0b4651aa815cedd"
S = "${WORKDIR}/git"
diff --git a/common/recipes-phosphor/obmc-phosphor-event/obmc-phosphor-event.bb b/common/recipes-phosphor/obmc-phosphor-event/obmc-phosphor-event.bb
index 78856dd..6cdf398 100644
--- a/common/recipes-phosphor/obmc-phosphor-event/obmc-phosphor-event.bb
+++ b/common/recipes-phosphor/obmc-phosphor-event/obmc-phosphor-event.bb
@@ -12,7 +12,7 @@
SRC_URI += "git://github.com/openbmc/phosphor-event"
-SRCREV = "bebdb23ea092df6cde23e6da2a8940bd84de4810"
+SRCREV = "aa9ec3aa2cc59fc7e2437041d89b19f4a8f1d7f0"
RDEPENDS_${PN} += "libsystemd"
DEPENDS += "systemd"
diff --git a/common/recipes-phosphor/skeleton/skeleton.bb b/common/recipes-phosphor/skeleton/skeleton.bb
index 73da06c..28ed2d2 100644
--- a/common/recipes-phosphor/skeleton/skeleton.bb
+++ b/common/recipes-phosphor/skeleton/skeleton.bb
@@ -16,7 +16,7 @@
RDEPENDS_${PN} += "python-subprocess python-tftpy"
SRC_URI += "git://github.com/openbmc/skeleton"
-SRCREV = "c941575c933a2564ee5c4bec4855f379ea9279b5"
+SRCREV = "14caa527e0b10e0aece119693bf003ec95929370"
S = "${WORKDIR}"