[PATCH openbmc] moved to btbridge version that supports the correct seq/net/lun/cmd order fixed makefile.patch because it couldn't auto patch with version of btbridge

OpenBMC Patches patches at stwcx.xyz
Sat Oct 31 12:36:16 AEDT 2015


From: Chris Austen <austenc at us.ibm.com>

---
 .../common/recipes-phosphor/host-ipmid/btbridged.bb        |  2 +-
 .../recipes-phosphor/host-ipmid/btbridged/makefile.patch   | 14 ++++++++------
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/meta-phosphor/common/recipes-phosphor/host-ipmid/btbridged.bb b/meta-phosphor/common/recipes-phosphor/host-ipmid/btbridged.bb
index 8572add..27efa3f 100644
--- a/meta-phosphor/common/recipes-phosphor/host-ipmid/btbridged.bb
+++ b/meta-phosphor/common/recipes-phosphor/host-ipmid/btbridged.bb
@@ -11,7 +11,7 @@ inherit obmc-phosphor-host-ipmi-hw
 
 S = "${WORKDIR}/git"
 SRC_URI += "git://github.com/openbmc/btbridge file://makefile.patch"
-SRCREV="5cb9032815aa9d2866229caac4943520d5f40dd8"
+SRCREV="c0ee3595f9a4784c7cf7ee60fd247d9712ec7e6b"
 
 # 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
index a2cd522..61123f3 100644
--- a/meta-phosphor/common/recipes-phosphor/host-ipmid/btbridged/makefile.patch
+++ b/meta-phosphor/common/recipes-phosphor/host-ipmid/btbridged/makefile.patch
@@ -1,11 +1,13 @@
 diff --git a/Makefile b/Makefile
-index 7f62be2..52e1063 100644
+index a55897f..73206b4 100644
 --- a/Makefile
 +++ b/Makefile
-@@ -2,3 +2,6 @@ all: btbridged
+@@ -5,5 +5,8 @@ EXE = btbridged
  
- btbridged: btbridged.c
- 	$(CC) $(CFLAGS) `pkg-config --cflags --libs libsystemd` $^ -o $@
+ all: $(EXE)
+ 
++btbridged: btbridged.c
++	$(CC) $(CFLAGS) `pkg-config --cflags --libs libsystemd` $^ -o $@
 +
-+clean:
-+	rm -f *.o btbridge
+ clean:
+ 	rm -rf *.o $(EXE)
-- 
2.6.0




More information about the openbmc mailing list