summaryrefslogtreecommitdiffstats
path: root/meta/recipes-connectivity/bluez
diff options
context:
space:
mode:
authorKhem Raj <raj.khem@gmail.com>2015-04-06 17:36:45 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-04-10 18:10:27 +0100
commit83f9ab73a25c0e2418b218554626779a9af7c1b9 (patch)
tree355461bfdc2af47c8dec2446674fc655e6664e1f /meta/recipes-connectivity/bluez
parent4ace5f812c99e516d3b1f0f6bfcc67dc2fd0c5ec (diff)
downloadpoky-83f9ab73a25c0e2418b218554626779a9af7c1b9.tar.gz
bluez4: Fix encrypt symbol namespace collision
| Makefile:3352: recipe for target 'test/l2test.o' failed | make[1]: *** [test/l2test.o] Error 1 | make[1]: *** Waiting for unfinished jobs.... | test/rctest.c:82:12: error: 'encrypt' redeclared as different kind of symbol | static int encrypt = 0; | ^ | In file included from test/rctest.c:33:0: Change-Id: Iaf2f644ef3cef6f96c6e4bc421c9e78a0e23e674 (From OE-Core rev: 795a409919774f3a2a4c859799de36f1064efd83) Signed-off-by: Khem Raj <raj.khem@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-connectivity/bluez')
-rw-r--r--meta/recipes-connectivity/bluez/bluez4-4.101/fix_encrypt_collision.patch110
-rw-r--r--meta/recipes-connectivity/bluez/bluez4_4.101.bb1
2 files changed, 111 insertions, 0 deletions
diff --git a/meta/recipes-connectivity/bluez/bluez4-4.101/fix_encrypt_collision.patch b/meta/recipes-connectivity/bluez/bluez4-4.101/fix_encrypt_collision.patch
new file mode 100644
index 0000000000..1bc390f35a
--- /dev/null
+++ b/meta/recipes-connectivity/bluez/bluez4-4.101/fix_encrypt_collision.patch
@@ -0,0 +1,110 @@
1Avoid namepspace collision with encrypt function from libc
2
3Upstream-Status: Pending
4
5Signed-off-by: Khem Raj <raj.khem@gmail.com>
6Index: bluez-4.101/test/l2test.c
7===================================================================
8--- bluez-4.101.orig/test/l2test.c
9+++ bluez-4.101/test/l2test.c
10@@ -107,7 +107,7 @@ static char *filename = NULL;
11 static int rfcmode = 0;
12 static int master = 0;
13 static int auth = 0;
14-static int encrypt = 0;
15+static int encryption_request = 0;
16 static int secure = 0;
17 static int socktype = SOCK_SEQPACKET;
18 static int linger = 0;
19@@ -340,7 +340,7 @@ static int do_connect(char *svr)
20 opt |= L2CAP_LM_MASTER;
21 if (auth)
22 opt |= L2CAP_LM_AUTH;
23- if (encrypt)
24+ if (encryption_request)
25 opt |= L2CAP_LM_ENCRYPT;
26 if (secure)
27 opt |= L2CAP_LM_SECURE;
28@@ -475,7 +475,7 @@ static void do_listen(void (*handler)(in
29 opt |= L2CAP_LM_MASTER;
30 if (auth)
31 opt |= L2CAP_LM_AUTH;
32- if (encrypt)
33+ if (encryption_request)
34 opt |= L2CAP_LM_ENCRYPT;
35 if (secure)
36 opt |= L2CAP_LM_SECURE;
37@@ -1407,7 +1407,7 @@ int main(int argc, char *argv[])
38 break;
39
40 case 'E':
41- encrypt = 1;
42+ encryption_request = 1;
43 break;
44
45 case 'S':
46Index: bluez-4.101/test/rctest.c
47===================================================================
48--- bluez-4.101.orig/test/rctest.c
49+++ bluez-4.101/test/rctest.c
50@@ -79,7 +79,7 @@ static char *filename = NULL;
51
52 static int master = 0;
53 static int auth = 0;
54-static int encrypt = 0;
55+static int encryption_request = 0;
56 static int secure = 0;
57 static int socktype = SOCK_STREAM;
58 static int linger = 0;
59@@ -200,7 +200,7 @@ static int do_connect(const char *svr)
60 opt |= RFCOMM_LM_MASTER;
61 if (auth)
62 opt |= RFCOMM_LM_AUTH;
63- if (encrypt)
64+ if (encryption_request)
65 opt |= RFCOMM_LM_ENCRYPT;
66 if (secure)
67 opt |= RFCOMM_LM_SECURE;
68@@ -291,7 +291,7 @@ static void do_listen(void (*handler)(in
69 opt |= RFCOMM_LM_MASTER;
70 if (auth)
71 opt |= RFCOMM_LM_AUTH;
72- if (encrypt)
73+ if (encryption_request)
74 opt |= RFCOMM_LM_ENCRYPT;
75 if (secure)
76 opt |= RFCOMM_LM_SECURE;
77@@ -701,7 +701,7 @@ int main(int argc, char *argv[])
78 break;
79
80 case 'E':
81- encrypt = 1;
82+ encryption_request = 1;
83 break;
84
85 case 'S':
86Index: bluez-4.101/src/textfile.h
87===================================================================
88--- bluez-4.101.orig/src/textfile.h
89+++ bluez-4.101/src/textfile.h
90@@ -24,6 +24,8 @@
91 #ifndef __TEXTFILE_H
92 #define __TEXTFILE_H
93
94+#include <sys/types.h>
95+
96 int create_dirs(const char *filename, const mode_t mode);
97 int create_file(const char *filename, const mode_t mode);
98 int create_name(char *buf, size_t size, const char *path,
99Index: bluez-4.101/test/attest.c
100===================================================================
101--- bluez-4.101.orig/test/attest.c
102+++ bluez-4.101/test/attest.c
103@@ -34,6 +34,7 @@
104 #include <termios.h>
105 #include <sys/ioctl.h>
106 #include <sys/socket.h>
107+#include <sys/select.h>
108
109 #include <bluetooth/bluetooth.h>
110 #include <bluetooth/rfcomm.h>
diff --git a/meta/recipes-connectivity/bluez/bluez4_4.101.bb b/meta/recipes-connectivity/bluez/bluez4_4.101.bb
index 28a94ed127..f900c7c7b0 100644
--- a/meta/recipes-connectivity/bluez/bluez4_4.101.bb
+++ b/meta/recipes-connectivity/bluez/bluez4_4.101.bb
@@ -9,6 +9,7 @@ SRC_URI += "file://bluetooth.conf \
9 file://network-fix-network-Connect-method-parameters.patch \ 9 file://network-fix-network-Connect-method-parameters.patch \
10 file://install-test-script.patch \ 10 file://install-test-script.patch \
11 file://use-legacy-pygobject-instead-ofgobject-introspection.patch \ 11 file://use-legacy-pygobject-instead-ofgobject-introspection.patch \
12 file://fix_encrypt_collision.patch \
12" 13"
13 14
14SRC_URI[md5sum] = "fb42cb7038c380eb0e2fa208987c96ad" 15SRC_URI[md5sum] = "fb42cb7038c380eb0e2fa208987c96ad"