summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: daa8912)
raw | patch | inline | side by side (parent: daa8912)
author | Vita Preskovsky <vitap@ti.com> | |
Mon, 12 Nov 2012 13:20:43 +0000 (15:20 +0200) | ||
committer | Vita Preskovsky <vitap@ti.com> | |
Mon, 12 Nov 2012 13:20:43 +0000 (15:20 +0200) |
* applying patch to make obexd accept files without security
ftp-client and opp-client are installed in /usr/share/bluetooth
new compat-bluetooth
new commit id for wl1271-demo
Signed-off-by: Vita Preskovsky <vitap@ti.com>
ftp-client and opp-client are installed in /usr/share/bluetooth
new compat-bluetooth
new commit id for wl1271-demo
Signed-off-by: Vita Preskovsky <vitap@ti.com>
patches/0001-obexd-ftp-and-opp-cancel-security.patch | [new file with mode: 0644] | patch | blob |
wl18xx_build_bt.sh | patch | blob | history |
diff --git a/patches/0001-obexd-ftp-and-opp-cancel-security.patch b/patches/0001-obexd-ftp-and-opp-cancel-security.patch
--- /dev/null
@@ -0,0 +1,40 @@
+From c3ed238ea7767dd7b8c1e17ce8b3db987f282d7a Mon Sep 17 00:00:00 2001
+From: Vita Preskovsky <vitap@ti.com>
+Date: Sun, 11 Nov 2012 17:31:42 +0200
+Subject: [PATCH] obexd: ftp and opp cancel security
+
+---
+ plugins/ftp.c | 2 +-
+ plugins/opp.c | 3 ++-
+ 2 files changed, 3 insertions(+), 2 deletions(-)
+
+diff --git a/plugins/ftp.c b/plugins/ftp.c
+index ff4b761..1358b9f 100644
+--- a/plugins/ftp.c
++++ b/plugins/ftp.c
+@@ -521,7 +521,7 @@ static struct obex_service_driver ftp = {
+ .service = OBEX_FTP,
+ .channel = FTP_CHANNEL,
+ .port = OBEX_PORT_RANDOM,
+- .secure = TRUE,
++ .secure = FALSE,
+ .record = FTP_RECORD,
+ .target = FTP_TARGET,
+ .target_size = TARGET_SIZE,
+diff --git a/plugins/opp.c b/plugins/opp.c
+index c7ddc63..4b5b8ab 100644
+--- a/plugins/opp.c
++++ b/plugins/opp.c
+@@ -228,7 +228,8 @@ static struct obex_service_driver driver = {
+ .get = opp_get,
+ .put = opp_put,
+ .chkput = opp_chkput,
+- .reset = opp_reset
++ .reset = opp_reset,
++ .secure = FALSE
+ };
+
+ static int opp_init(void)
+--
+1.7.9.5
+
diff --git a/wl18xx_build_bt.sh b/wl18xx_build_bt.sh
index b46ba88e8b59838bd0fb07957b0c64575a8ff463..3fc2729cafec9b327b14099551891fc50ff21a19 100755 (executable)
--- a/wl18xx_build_bt.sh
+++ b/wl18xx_build_bt.sh
#
BUILD_VERSION="r8"
-declare -A compat_bluetooth["r8"]="https://gforge.ti.com/gf/download/frsrelease/980/6282/compat-bluetooth-ol-r8.a5.01.tar.gz"
+declare -A compat_bluetooth["r8"]="https://gforge.ti.com/gf/download/frsrelease/990/6319/compat-bluetooth-ol-r8.a5.01_Nov_12_2012.tar.gz"
function usage()
{
patch -p1 -i ${old_dir}/patches/0001-compat-wireless-usb-missing-macro.patch
./scripts/driver-select bt || exit 1
+ make KLIB=${ROOTFS} bt || exit 1
+
make KLIB=${ROOTFS} "install-modules" || exit 1
add_fingerprint 1
fi
cd ${WORK_SPACE} || exit 1
COMPONENT_NAME="bluez-hcidump-2.4.tar.gz"
COMPONENT_DIR="bluez-hcidump-2.4"
- #download_component "http://pkgs.fedoraproject.org/repo/pkgs/bluez-hcidump/bluez-hcidump-2.2.tar.gz/3c298a8be67099fe227f3e4d9de539d5/bluez-hcidump-2.2.tar.gz"
download_component "http://www.kernel.org/pub/linux/bluetooth/bluez-hcidump-2.4.tar.gz"
if [ ${CURRENT_OPTION} = "2" ]; then
add_fingerprint 0
function obexd
{
if [ $# -eq 1 ]; then
- START_MODULE="2281d4fac9fec97993b0a6dc0e2ec42911eac194"
+ START_MODULE="obexd"
fi
# dependency section, in here we build the dependencies. We do not want to rebuild them each time
bluez
/usr/bin/automake --add-missing || exit 1
/usr/bin/autoconf || exit 1
./configure --host=${BUILD_HOST} --prefix=${MY_PREFIX} --sysconfdir=${MY_SYSCONFDIR} || exit 1
+ patch -p1 -i ${old_dir}/patches/0001-obexd-ftp-and-opp-cancel-security.patch || exit 1
make || exit 1
make install DESTDIR=${ROOTFS} || exit 1
+ test -d ${ROOTFS}/usr/share/bluetooth || mkdir -p ${ROOTFS}/usr/share/bluetooth
+ list='exchange-business-cards ftp-client get-capabilities list-folders map-client opp-client pbap-client'
+ for f in ${list}; do
+ install -c test/$f ${ROOTFS}/usr/share/bluetooth || exit 1
+ done
add_fingerprint 1
fi
echo "obexd built successfully"
function bt-obex
{
if [ $# -eq 1 ]; then
- START_MODULE="171181b6ef6c94aefc828dc7fd8de136b9f97532"
+ START_MODULE="bluez-tools"
fi
# dependency section, in here we build the dependencies. We do not want to rebuild them each time
dbus-glib
unzip -o Bt-obex-patches.zip || exit 1
apply_patches
patch -p1 -i ${old_dir}/patches/0001-bt-obex-new-dbus-api-for-obexd.patch
+ #patch -p1 -i ${old_dir}/patches/0001-manager-adoptation-to-new-manager-interface-of-bluez.patch
/usr/bin/libtoolize || exit 1
/usr/bin/aclocal || exit 1
function wl1271-demo
{
+ START_MODULE="wl1271-bluetooth"
cd ${WORK_SPACE} || exit 1
COMPONENT_NAME="wl1271-bluetooth"
COMPONENT_DIR="wl1271-bluetooth"
- COMPONENT_REV="d11ff672addc4c9a9fc53194b8ed7fc240d51878"
+ COMPONENT_REV="cb05b494e7ecce4a57e037f3dc0cd7733c15b3ee"
download_component "git://github.com/TI-ECS/wl1271-bluetooth.git"
if [ ${CURRENT_OPTION} = "2" ]; then
add_fingerprint 0
cp ./script/common/* ${ROOTFS}/usr/share/wl1271-demos/bluetooth/scripts || exit 1
cp ./script/${MACHINE_TYPE}/* ${ROOTFS}/usr/share/wl1271-demos/bluetooth/scripts || exit 1
cp ./ftp_folder/* ${ROOTFS}/usr/share/wl1271-demos/bluetooth/ftp_folder || exit 1
- install -c -m 755 ./script/${MACHINE_TYPE}/BT_Init.sh ${ROOTFS}/etc/init.d/ || exit 1
- cd ${ROOTFS}/etc/init.d || exit 1
- ln -s -f ../init.d/BT_Init.sh ../rc5.d/S92btinit || exit 1
- cd -
+ #install -c -m 755 ./script/${MACHINE_TYPE}/BT_Init.sh ${ROOTFS}/etc/init.d/ || exit 1
+ #cd ${ROOTFS}/etc/init.d || exit 1
+ #ln -s -f ../init.d/BT_Init.sh ../rc5.d/S92btinit || exit 1
+ #cd -
add_fingerprint 1
fi
echo "wl1271-demo built successfully"