Updating base build with sprint 3 candidate 3
diff --git a/meta-phosphor/common/recipes-phosphor/host-ipmid/btbridged.bb b/meta-phosphor/common/recipes-phosphor/host-ipmid/btbridged.bb
index aa8cc94..1de0cc4 100644
--- a/meta-phosphor/common/recipes-phosphor/host-ipmid/btbridged.bb
+++ b/meta-phosphor/common/recipes-phosphor/host-ipmid/btbridged.bb
@@ -10,8 +10,8 @@
inherit obmc-phosphor-host-ipmi-hw
S = "${WORKDIR}/git"
-SRC_URI += "git://github.com/openbmc/btbridge file://makefile.patch"
-SRCREV="e71c7941a35949c0b93ce5e7864ab35447d30df2"
+SRC_URI += "git://github.com/openbmc/btbridge"
+SRCREV="eee5a2c00faf794a40bf11650e7c0585adc88932"
# 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/meta-phosphor/common/recipes-phosphor/host-ipmid/btbridged/makefile.patch b/meta-phosphor/common/recipes-phosphor/host-ipmid/btbridged/makefile.patch
deleted file mode 100644
index 7cb1abe..0000000
--- a/meta-phosphor/common/recipes-phosphor/host-ipmid/btbridged/makefile.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-diff --git a/Makefile b/Makefile
-index a55897f..52e1063 100644
---- a/Makefile
-+++ b/Makefile
-@@ -1,9 +1,7 @@
--CPPFLAGS=$(shell pkg-config --cflags libsystemd)
--LDFLAGS=$(shell pkg-config --libs libsystemd)
-+all: btbridged
-
--EXE = btbridged
--
--all: $(EXE)
-+btbridged: btbridged.c
-+ $(CC) $(CFLAGS) `pkg-config --cflags --libs libsystemd` $^ -o $@
-
- clean:
-- rm -rf *.o $(EXE)
-+ rm -f *.o btbridge
diff --git a/meta-phosphor/common/recipes-phosphor/host-ipmid/host-ipmid-fru.bb b/meta-phosphor/common/recipes-phosphor/host-ipmid/host-ipmid-fru.bb
index 26eea2a..d61b2e6 100644
--- a/meta-phosphor/common/recipes-phosphor/host-ipmid/host-ipmid-fru.bb
+++ b/meta-phosphor/common/recipes-phosphor/host-ipmid/host-ipmid-fru.bb
@@ -18,14 +18,17 @@
SRC_URI += "git://github.com/openbmc/ipmi-fru-parser"
-SRCREV = "1c779b8570849a52dac828538c36a59798f4583a"
+SRCREV = "20656b1e15bebd7bc2754bd680f045e253bd2809"
FILES_${PN} += "${libdir}/host-ipmid/*.so"
FILES_${PN}-dbg += "${libdir}/host-ipmid/.debug"
S = "${WORKDIR}/git"
-do_install() {
- install -m 0755 -d ${D}${libdir}/host-ipmid
- install -m 0755 ${S}/*.so ${D}${libdir}/host-ipmid/
+do_install() {
+ oe_runmake install DESTDIR=${D} LIBDIR=${libdir} BINDIR=${sbindir}
}
+
+
+# install -m 0755 -d ${D}${libdir}/host-ipmid
+# install -m 0755 ${S}/*.so ${D}${libdir}/host-ipmid/
\ No newline at end of file
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 7393889..c20bd9a 100644
--- a/meta-phosphor/common/recipes-phosphor/host-ipmid/host-ipmid.bb
+++ b/meta-phosphor/common/recipes-phosphor/host-ipmid/host-ipmid.bb
@@ -14,7 +14,7 @@
SRC_URI += "git://github.com/openbmc/phosphor-host-ipmid"
-SRCREV = "f0d4635fa2b417bd0eef3f19ae98e56ec615e703"
+SRCREV = "7e478ce6b065a8bbd2de0ac00934e43cc1639501"
S = "${WORKDIR}/git"