summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornkskjames <nkskjames@gmail.com>2015-11-01 16:21:43 +0300
committernkskjames <nkskjames@gmail.com>2015-11-01 16:21:43 +0300
commitacb2c9b0b32b5fc4cdc6500fdd91155c3db204b7 (patch)
treed242f5e2bc2c13b11a6d19a0efff77015e9cd1db
parentf1c761294530dc7ed6d4b89ac9c76f8db23f981d (diff)
parent7ad9f5f5bff5895cc62d8c065fc6a11cade32061 (diff)
downloadopenbmc-acb2c9b0b32b5fc4cdc6500fdd91155c3db204b7.tar.xz
Merge pull request #55 from bradbishop/btbridge
Patch btbridge makefile.
-rw-r--r--meta-phosphor/common/recipes-phosphor/host-ipmid/btbridged.bb2
-rw-r--r--meta-phosphor/common/recipes-phosphor/host-ipmid/btbridged/makefile.patch18
2 files changed, 19 insertions, 1 deletions
diff --git a/meta-phosphor/common/recipes-phosphor/host-ipmid/btbridged.bb b/meta-phosphor/common/recipes-phosphor/host-ipmid/btbridged.bb
index 5c0ec5c5c..27efa3fd1 100644
--- a/meta-phosphor/common/recipes-phosphor/host-ipmid/btbridged.bb
+++ b/meta-phosphor/common/recipes-phosphor/host-ipmid/btbridged.bb
@@ -10,7 +10,7 @@ SYSTEMD_SERVICE_${PN} = "btbridged.service"
inherit obmc-phosphor-host-ipmi-hw
S = "${WORKDIR}/git"
-SRC_URI += "git://github.com/openbmc/btbridge"
+SRC_URI += "git://github.com/openbmc/btbridge file://makefile.patch"
SRCREV="c0ee3595f9a4784c7cf7ee60fd247d9712ec7e6b"
# This is how linux-libc-headers says to include custom uapi headers
diff --git a/meta-phosphor/common/recipes-phosphor/host-ipmid/btbridged/makefile.patch b/meta-phosphor/common/recipes-phosphor/host-ipmid/btbridged/makefile.patch
new file mode 100644
index 000000000..7cb1abea7
--- /dev/null
+++ b/meta-phosphor/common/recipes-phosphor/host-ipmid/btbridged/makefile.patch
@@ -0,0 +1,18 @@
+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