summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 580c06f)
raw | patch | inline | side by side (parent: 580c06f)
author | Vita Preskovsky <vitap@ti.com> | |
Thu, 1 Nov 2012 07:25:20 +0000 (09:25 +0200) | ||
committer | Vita Preskovsky <vitap@ti.com> | |
Thu, 1 Nov 2012 07:25:20 +0000 (09:25 +0200) |
Signed-off-by: Vita Preskovsky <vitap@ti.com>
functions/common-functions | patch | blob | history | |
patches/0001-compat-wireless-usb-missing-macro.patch | [new file with mode: 0644] | patch | blob |
patches/0002-bluez-define-macro-lacking-in-compiler.patch | [moved from patches/0001-bluez-define-macro-lacking-in-compiler.patch with 100% similarity] | patch | blob | history |
patches/0003-socket-enable-for-bluez-4_98.patch | [moved from patches/0001-socket-enable-for-bluez-4_98.patch with 100% similarity] | patch | blob | history |
patches/0004-bluez-enable-source-interface.patch | [moved from patches/0002-bluez-enable-source-interface.patch with 100% similarity] | patch | blob | history |
patches/0005-bluez-enable-gatt.patch | [new file with mode: 0755] | patch | blob |
patches/0006-bluez-fix-missing-include-directive.patch | [new file with mode: 0755] | patch | blob |
wl18xx_build_bt.sh | patch | blob | history | |
wl18xx_build_nfc.sh | patch | blob | history |
index 82ce82cc1c37fb040dccd5cb34b2b1332f341c47..9383a937a22525914774e17884c84fcbb535cee4 100644 (file)
fi
echo "libIConv built successfully"
}
+
function zlib()
{
cd ${WORK_SPACE} || exit 1
diff --git a/patches/0001-compat-wireless-usb-missing-macro.patch b/patches/0001-compat-wireless-usb-missing-macro.patch
--- /dev/null
@@ -0,0 +1,30 @@
+--- a/drivers/bluetooth/btusb.c 2012-10-29 17:00:17.000000000 +0200
++++ b/drivers/bluetooth/btusb.c 2012-10-31 15:32:19.000000000 +0200
+@@ -29,6 +29,27 @@
+
+ #define VERSION "0.6"
+
++/**
++ * USB_VENDOR_AND_INTERFACE_INFO - describe a specific usb vendor with a class of usb interfaces
++ * @vend: the 16 bit USB Vendor ID
++ * @cl: bInterfaceClass value
++ * @sc: bInterfaceSubClass value
++ * @pr: bInterfaceProtocol value
++ *
++ * This macro is used to create a struct usb_device_id that matches a
++ * specific vendor with a specific class of interfaces.
++ *
++ * This is especially useful when explicitly matching devices that have
++ * vendor specific bDeviceClass values, but standards-compliant interfaces.
++ */
++#define USB_VENDOR_AND_INTERFACE_INFO(vend, cl, sc, pr) \
++ .match_flags = USB_DEVICE_ID_MATCH_INT_INFO \
++ | USB_DEVICE_ID_MATCH_VENDOR, \
++ .idVendor = (vend), \
++ .bInterfaceClass = (cl), \
++ .bInterfaceSubClass = (sc), \
++ .bInterfaceProtocol = (pr)
++
+ static bool ignore_dga;
+ static bool ignore_csr;
+ static bool ignore_sniffer;
diff --git a/patches/0001-bluez-define-macro-lacking-in-compiler.patch b/patches/0002-bluez-define-macro-lacking-in-compiler.patch
similarity index 100%
rename from patches/0001-bluez-define-macro-lacking-in-compiler.patch
rename to patches/0002-bluez-define-macro-lacking-in-compiler.patch
rename from patches/0001-bluez-define-macro-lacking-in-compiler.patch
rename to patches/0002-bluez-define-macro-lacking-in-compiler.patch
diff --git a/patches/0001-socket-enable-for-bluez-4_98.patch b/patches/0003-socket-enable-for-bluez-4_98.patch
similarity index 100%
rename from patches/0001-socket-enable-for-bluez-4_98.patch
rename to patches/0003-socket-enable-for-bluez-4_98.patch
rename from patches/0001-socket-enable-for-bluez-4_98.patch
rename to patches/0003-socket-enable-for-bluez-4_98.patch
diff --git a/patches/0002-bluez-enable-source-interface.patch b/patches/0004-bluez-enable-source-interface.patch
similarity index 100%
rename from patches/0002-bluez-enable-source-interface.patch
rename to patches/0004-bluez-enable-source-interface.patch
rename from patches/0002-bluez-enable-source-interface.patch
rename to patches/0004-bluez-enable-source-interface.patch
diff --git a/patches/0005-bluez-enable-gatt.patch b/patches/0005-bluez-enable-gatt.patch
--- /dev/null
@@ -0,0 +1,22 @@
+From 49ffdb67be763d92e4c103ebece9dd38605f50cf Mon Sep 17 00:00:00 2001\r
+From: Chen Ganir <chen.ganir@ti.com>\r
+Date: Tue, 30 Oct 2012 10:04:45 +0200\r
+Subject: [PATCH 2/3] enable gatt\r
+\r
+---\r
+ src/main.conf | 2 +-\r
+ 1 file changed, 1 insertion(+), 1 deletion(-)\r
+\r
+diff --git a/src/main.conf b/src/main.conf\r
+index 787ef4f..dfe4471 100644\r
+--- a/src/main.conf\r
++++ b/src/main.conf\r
+@@ -61,4 +61,4 @@ NameResolving = true\r
+ DebugKeys = false\r
+ \r
+ # Enable the GATT functionality. Default is false\r
+-EnableGatt = false\r
++EnableGatt = true\r
+-- \r
+1.7.9.5\r
+\r
diff --git a/patches/0006-bluez-fix-missing-include-directive.patch b/patches/0006-bluez-fix-missing-include-directive.patch
--- /dev/null
@@ -0,0 +1,32 @@
+From c95a7cfb60e8601a238d4568dc9f20699aa64a70 Mon Sep 17 00:00:00 2001\r
+From: Chen Ganir <chen.ganir@ti.com>\r
+Date: Tue, 30 Oct 2012 10:05:08 +0200\r
+Subject: [PATCH 3/3] fix missing include directive\r
+\r
+---\r
+ test/rctest.c | 2 +-\r
+ 1 file changed, 1 insertion(+), 1 deletion(-)\r
+\r
+diff --git a/test/rctest.c b/test/rctest.c\r
+index ac341b0..4a306b5 100644\r
+--- a/test/rctest.c\r
++++ b/test/rctest.c\r
+@@ -38,6 +38,7 @@\r
+ #include <sys/time.h>\r
+ #include <sys/ioctl.h>\r
+ #include <sys/socket.h>\r
++#include <sys/stat.h>\r
+ \r
+ #include <bluetooth/bluetooth.h>\r
+ #include <bluetooth/hci.h>\r
+@@ -45,7 +46,6 @@\r
+ #include <bluetooth/rfcomm.h>\r
+ #include <bluetooth/sdp.h>\r
+ #include <bluetooth/sdp_lib.h>\r
+-\r
+ /* Test modes */\r
+ enum {\r
+ SEND,\r
+-- \r
+1.7.9.5\r
+\r
diff --git a/wl18xx_build_bt.sh b/wl18xx_build_bt.sh
index fd5cf91f0a29b3ec5143de81a80625b6239f5769..832632acb97c8389893320110d8bb9915178bd76 100755 (executable)
--- a/wl18xx_build_bt.sh
+++ b/wl18xx_build_bt.sh
# be built and installed on the target filesystem
#
-source ./functions/python-functions
+BUILD_VERSION="r8"
+declare -A compat_bluetooth["r8"]="https://gforge.ti.com/gf/download/frsrelease/977/6265/ti-compat-nfc-2012-10-29.tar.gz"
+
+source ./functions/common-functions
function usage()
{
echo
fi
cd ${WORK_SPACE} || exit 1
- COMPONENT_NAME="ti-compat-bluetooth-2012-02-20.tar.gz"
+ COMPONENT_NAME=`basename ${compat_nfc[$BUILD_VERSION]}`
COMPONENT_DIR="compat-bluetooth"
- download_component "https://gforge.ti.com/gf/download/frsrelease/802/5435/ti-compat-bluetooth-2012-02-20.tar.gz"
+ download_component "${compat_bluetooth[$BUILD_VERSION]}"
if [ ${CURRENT_OPTION} = "2" ]; then
add_fingerprint 0
[ ! -e Compat-patch-zip-v1.zip ] && { wget http://processors.wiki.ti.com/images/9/99/Compat-patch-zip-v1.zip || exit 1; }
unzip -o Compat-patch-zip-v1.zip || exit 1
- apply_patches
+ #apply_patches
+ patch -p1 -i ${old_dir}/patches/0001-compat-wireless-usb-missing-macro.patch
./scripts/driver-select bt || exit 1
make KLIB=${ROOTFS} "install-modules" || exit 1
cd ${WORK_SPACE} || exit 1
COMPONENT_NAME="bluez"
- COMPONENT_REV="70a609bb3a7401b56377de77586e09a56d631468"
+ COMPONENT_REV="18a5dc6cdcf0828443c415eaea82b6834a8f9825"
COMPONENT_DIR="bluez"
download_component "git://git.kernel.org/pub/scm/bluetooth/bluez.git"
if [ ${CURRENT_OPTION} = "2" ]; then
add_fingerprint 0
- #[ ! -e BlueZ_patches-v2.zip ] && { wget http://processors.wiki.ti.com/images/7/7e/BlueZ_patches-v2.zip || exit 1; }
- #unzip -o BlueZ_patches-v2.zip || exit 1
- #apply_patches
- patch -p1 -i ${old_dir}/patches/0001-bluez-define-_GNU_SOURCE-macro.patch
- patch -p1 -i ${old_dir}/patches/0001-socket-enable-for-bluez-4_98.patch
- patch -p1 -i ${old_dir}/patches/0002-bluez-enable-source-interface.patch
- patch -p1 -i ${old_dir}/patches/0001-bluez-define-macro-lacking-in-compiler.patch
+ patch -p1 -i ${old_dir}patches/0001-bluez-define-_GNU_SOURCE-macro.patch
+ patch -p1 -i ${old_dir}patches/0002-bluez-define-macro-lacking-in-compiler.patch
+ patch -p1 -i ${old_dir}patches/0003-socket-enable-for-bluez-4_98.patch
+ patch -p1 -i ${old_dir}patches/0004-bluez-enable-source-interface.patch
+ patch -p1 -i ${old_dir}patches/0005-bluez-enable-gatt.patch
+ patch -p1 -i ${old_dir}patches/0006-bluez-fix-missing-include-directive.patch
/usr/bin/libtoolize || exit 1
/usr/bin/aclocal || exit 1
/usr/bin/automake --add-missing || exit 1
/usr/bin/autoconf || exit 1
- ./configure --host=${BUILD_HOST} --prefix=${MY_PREFIX} --sysconfdir=${MY_SYSCONFDIR} --localstatedir=${MY_LOCALSTATEDIR} --enable-tools --enable-dund --enable-alsa --enable-test --enable-audio --enable-serial --enable-service --enable-hidd --enable-gstreamer --enable-usb --enable-tools --enable-bccmd --enable-hid2hci --enable-dfutool --enable-pand --disable-cups
- make || exit 1
+ ./configure --host=${BUILD_HOST} --prefix=${MY_PREFIX} --sysconfdir=${MY_SYSCONFDIR} --localstatedir=${MY_LOCALSTATEDIR} --enable-tools --enable-dund --enable-alsa --enable-test --enable-audio --enable-serial --enable-service --enable-hidd --enable-gstreamer --enable-usb --enable-tools --enable-bccmd --enable-hid2hci --enable-dfutool --enable-pand --disable-cups --enable-debug --enable-gatt --enable-hid2hci --enable-health
+ make LIBS='-lffi' || exit 1
make install DESTDIR=${ROOTFS} || exit 1
rm `find ${ROOTFS}${MY_PREFIX}/lib/ -name '*.la'` >& /dev/null
cp audio/audio.conf profiles/input/input.conf ${ROOTFS}${MY_SYSCONFDIR}/bluetooth/ || exit 1
diff --git a/wl18xx_build_nfc.sh b/wl18xx_build_nfc.sh
index 29f8e6719716507ff612c23db3dd473de0a9a2b2..04951e953dc132d8944dbce72eb706cdd7fab312 100755 (executable)
--- a/wl18xx_build_nfc.sh
+++ b/wl18xx_build_nfc.sh
# be built and installed on the target filesystem
#
BUILD_VERSION="r8"
-declare -A compat_nfc["r8"]="https://gforge.ti.com/gf/download/frsrelease/977/6263/ti-compat-nfc-2012-10-29.tar.gz"
+declare -A compat_nfc["r8"]="https://gforge.ti.com/gf/download/frsrelease/977/6265/ti-compat-nfc-2012-10-29.tar.gz"
source ./functions/common-functions
function usage()