summaryrefslogtreecommitdiffstats
path: root/meta-oe/recipes-connectivity/bluez/bluez4-4.101
diff options
context:
space:
mode:
Diffstat (limited to 'meta-oe/recipes-connectivity/bluez/bluez4-4.101')
-rw-r--r--meta-oe/recipes-connectivity/bluez/bluez4-4.101/bluetooth.conf16
-rw-r--r--meta-oe/recipes-connectivity/bluez/bluez4-4.101/fix-udev-paths.patch37
-rw-r--r--meta-oe/recipes-connectivity/bluez/bluez4-4.101/fix_encrypt_collision.patch110
-rw-r--r--meta-oe/recipes-connectivity/bluez/bluez4-4.101/install-test-script.patch26
-rw-r--r--meta-oe/recipes-connectivity/bluez/bluez4-4.101/network-fix-network-Connect-method-parameters.patch30
-rw-r--r--meta-oe/recipes-connectivity/bluez/bluez4-4.101/obsolete_automake_macros.patch14
-rw-r--r--meta-oe/recipes-connectivity/bluez/bluez4-4.101/sbc_mmx.patch24
7 files changed, 0 insertions, 257 deletions
diff --git a/meta-oe/recipes-connectivity/bluez/bluez4-4.101/bluetooth.conf b/meta-oe/recipes-connectivity/bluez/bluez4-4.101/bluetooth.conf
deleted file mode 100644
index ca5e9e4f2..000000000
--- a/meta-oe/recipes-connectivity/bluez/bluez4-4.101/bluetooth.conf
+++ /dev/null
@@ -1,16 +0,0 @@
1<!-- This configuration file specifies the required security policies
2 for Bluetooth core daemon to work. -->
3
4<!DOCTYPE busconfig PUBLIC "-//freedesktop//DTD D-BUS Bus Configuration 1.0//EN"
5 "http://www.freedesktop.org/standards/dbus/1.0/busconfig.dtd">
6<busconfig>
7
8 <!-- ../system.conf have denied everything, so we just punch some holes -->
9
10 <policy context="default">
11 <allow own="org.bluez"/>
12 <allow send_destination="org.bluez"/>
13 <allow send_interface="org.bluez.Agent"/>
14 </policy>
15
16</busconfig>
diff --git a/meta-oe/recipes-connectivity/bluez/bluez4-4.101/fix-udev-paths.patch b/meta-oe/recipes-connectivity/bluez/bluez4-4.101/fix-udev-paths.patch
deleted file mode 100644
index 80899148e..000000000
--- a/meta-oe/recipes-connectivity/bluez/bluez4-4.101/fix-udev-paths.patch
+++ /dev/null
@@ -1,37 +0,0 @@
1Add udevdir/udevrulesdir options
2
3Upstream-Status: Inappropriate [configuration]
4Signed-off-by: Constantin Musca <constantinx.musca@intel.com>
5
6Index: bluez-4.101/Makefile.am
7===================================================================
8--- bluez-4.101.orig/Makefile.am
9+++ bluez-4.101/Makefile.am
10@@ -395,7 +395,7 @@ EXTRA_DIST += audio/bluetooth.conf
11 include Makefile.tools
12
13 if DATAFILES
14-rulesdir = @UDEV_DIR@/rules.d
15+rulesdir = @UDEV_RULES_DIR@
16
17 udev_files =
18
19Index: bluez-4.101/configure.ac
20===================================================================
21--- bluez-4.101.orig/configure.ac
22+++ bluez-4.101/configure.ac
23@@ -61,4 +61,14 @@ if (test -n "${path_systemdunit}"); then
24 fi
25 AM_CONDITIONAL(SYSTEMD, test -n "${path_systemdunit}")
26
27+AC_ARG_WITH([udevdir],
28+ AS_HELP_STRING([--with-udevdir=DIR], [udev directory]),
29+ [], [with_udevdir=/lib/udev/])
30+AC_SUBST([UDEV_DIR], [$with_udevdir])
31+
32+AC_ARG_WITH([udevrulesdir],
33+ AS_HELP_STRING([--with-udevrulesdir=DIR], [udev rules directory]),
34+ [], [with_udevrulesdir=/lib/udev/rules.d])
35+AC_SUBST([UDEV_RULES_DIR], [$with_udevrulesdir])
36+
37 AC_OUTPUT(Makefile doc/version.xml src/bluetoothd.8 src/bluetooth.service bluez.pc)
diff --git a/meta-oe/recipes-connectivity/bluez/bluez4-4.101/fix_encrypt_collision.patch b/meta-oe/recipes-connectivity/bluez/bluez4-4.101/fix_encrypt_collision.patch
deleted file mode 100644
index 1bc390f35..000000000
--- a/meta-oe/recipes-connectivity/bluez/bluez4-4.101/fix_encrypt_collision.patch
+++ /dev/null
@@ -1,110 +0,0 @@
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-oe/recipes-connectivity/bluez/bluez4-4.101/install-test-script.patch b/meta-oe/recipes-connectivity/bluez/bluez4-4.101/install-test-script.patch
deleted file mode 100644
index 23f7d999b..000000000
--- a/meta-oe/recipes-connectivity/bluez/bluez4-4.101/install-test-script.patch
+++ /dev/null
@@ -1,26 +0,0 @@
1Upstream-Status: Inappropriate
2
3Install the bluez's test scripts
4
5Signed-off-by: Zhong Hongbo <hongbo.zhong@windriver.com>
6diff -Nurd bluez-4.101.orig/Makefile.tools bluez-4.101/Makefile.tools
7--- bluez-4.101.orig/Makefile.tools 2013-11-19 15:49:07.688838000 +0800
8+++ bluez-4.101/Makefile.tools 2013-11-19 15:50:09.256837848 +0800
9@@ -227,6 +227,17 @@
10 test/service-spp.xml test/service-opp.xml test/service-ftp.xml \
11 test/simple-player test/test-nap
12
13+bluez4_testdir = $(libdir)/bluez4/test/
14+dist_bluez4_test_SCRIPTS = test/sap-client test/hsplay test/hsmicro \
15+ test/monitor-bluetooth test/list-devices \
16+ test/test-discovery test/test-manager test/test-adapter \
17+ test/test-device test/test-service test/test-serial \
18+ test/test-telephony test/test-network test/simple-agent \
19+ test/simple-service test/simple-endpoint test/test-audio \
20+ test/test-input test/test-sap-server test/test-oob \
21+ test/test-attrib test/test-proximity test/test-thermometer \
22+ test/test-serial-proxy test/test-health test/test-health-sink \
23+ test/simple-player test/test-nap
24 if HIDD
25 bin_PROGRAMS += compat/hidd
26
diff --git a/meta-oe/recipes-connectivity/bluez/bluez4-4.101/network-fix-network-Connect-method-parameters.patch b/meta-oe/recipes-connectivity/bluez/bluez4-4.101/network-fix-network-Connect-method-parameters.patch
deleted file mode 100644
index 37f919926..000000000
--- a/meta-oe/recipes-connectivity/bluez/bluez4-4.101/network-fix-network-Connect-method-parameters.patch
+++ /dev/null
@@ -1,30 +0,0 @@
1Upstream-Status: Backport
2Signed-off-by: Peter A. Bigot <pab@pabigot.com>
3
4From 57170b311f1468330f4a9961dc0b3ac45f97bc13 Mon Sep 17 00:00:00 2001
5From: Gustavo Padovan <gustavo.padovan@collabora.co.uk>
6Date: Sat, 30 Jun 2012 00:39:05 -0300
7Subject: [PATCH] network: fix network Connect() method parameters
8
9---
10 network/connection.c | 4 +++-
11 1 file changed, 3 insertions(+), 1 deletion(-)
12
13diff --git a/network/connection.c b/network/connection.c
14index 544ec3a..59423a9 100644
15--- a/network/connection.c
16+++ b/network/connection.c
17@@ -554,7 +554,9 @@ static void path_unregister(void *data)
18
19 static const GDBusMethodTable connection_methods[] = {
20 { GDBUS_ASYNC_METHOD("Connect",
21- NULL, NULL, connection_connect) },
22+ GDBUS_ARGS({"uuid", "s"}),
23+ GDBUS_ARGS({"interface", "s"}),
24+ connection_connect) },
25 { GDBUS_METHOD("Disconnect",
26 NULL, NULL, connection_disconnect) },
27 { GDBUS_METHOD("GetProperties",
28--
291.7.9.5
30
diff --git a/meta-oe/recipes-connectivity/bluez/bluez4-4.101/obsolete_automake_macros.patch b/meta-oe/recipes-connectivity/bluez/bluez4-4.101/obsolete_automake_macros.patch
deleted file mode 100644
index 1068f2482..000000000
--- a/meta-oe/recipes-connectivity/bluez/bluez4-4.101/obsolete_automake_macros.patch
+++ /dev/null
@@ -1,14 +0,0 @@
1Upstream-Status: Backport
2
3Signed-off-by: Marko Lindqvist <cazfi74@gmail.com>
4diff -Nurd bluez-4.101/configure.ac bluez-4.101/configure.ac
5--- bluez-4.101/configure.ac 2012-06-22 19:36:49.000000000 +0300
6+++ bluez-4.101/configure.ac 2013-01-07 06:13:18.385888966 +0200
7@@ -2,7 +2,7 @@
8 AC_INIT(bluez, 4.101)
9
10 AM_INIT_AUTOMAKE([foreign subdir-objects color-tests])
11-AM_CONFIG_HEADER(config.h)
12+AC_CONFIG_HEADERS(config.h)
13
14 m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
diff --git a/meta-oe/recipes-connectivity/bluez/bluez4-4.101/sbc_mmx.patch b/meta-oe/recipes-connectivity/bluez/bluez4-4.101/sbc_mmx.patch
deleted file mode 100644
index 98fab458b..000000000
--- a/meta-oe/recipes-connectivity/bluez/bluez4-4.101/sbc_mmx.patch
+++ /dev/null
@@ -1,24 +0,0 @@
1on x86 and x86_64 gcc 4.7 complains
2
3sbc/sbc_primitives_mmx.c: In function 'sbc_calc_scalefactors_mmx':
4sbc/sbc_primitives_mmx.c:294:4: warning: asm operand 2 probably doesn't match constraints [enabled by default]
5sbc/sbc_primitives_mmx.c:294:4: error: impossible constraint in 'asm'
6
7This patch is taken from https://bugs.launchpad.net/ubuntu/+source/bluez/+bug/911871
8
9Signed-off-by: Khem Raj <raj.khem@gmail.com>
10
11Upstream-Status: Pending
12Index: bluez-4.98/sbc/sbc_primitives_mmx.c
13===================================================================
14--- bluez-4.98.orig/sbc/sbc_primitives_mmx.c 2011-12-21 14:53:54.000000000 -0800
15+++ bluez-4.98/sbc/sbc_primitives_mmx.c 2012-02-24 10:07:03.422073800 -0800
16@@ -318,7 +318,7 @@
17 "movl %k0, 4(%3)\n"
18 : "+r" (blk)
19 : "r" (&sb_sample_f[0][ch][sb]),
20- "i" ((char *) &sb_sample_f[1][0][0] -
21+ "r" ((char *) &sb_sample_f[1][0][0] -
22 (char *) &sb_sample_f[0][0][0]),
23 "r" (&scale_factor[ch][sb]),
24 "r" (&consts),
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2024-11-19 05:38:56 +0000