Menu
▾
▴
[Astlinux-commits] SF.net SVN: astlinux:[6071] branches/1.0
|
From: <abe...@us...> - 2013-05-02 00:13:46
|
Revision: 6071
http://sourceforge.net/p/astlinux/code/6071
Author: abelbeck
Date: 2013-05-02 00:13:42 +0000 (Thu, 02 May 2013)
Log Message:
-----------
bluez_utils, add package from upstream Buildroot, also tweak dbus and libglib2
Modified Paths:
--------------
branches/1.0/astlinux-ast11.config
branches/1.0/astlinux.config
branches/1.0/astlinux18.config
branches/1.0/initrd.config
branches/1.0/package/Config.in
branches/1.0/package/dbus/Config.in
branches/1.0/package/dbus/dbus.mk
branches/1.0/package/libglib2/libglib2.mk
branches/1.0/runnix-uclibc.config
branches/1.0/runnix.config
Added Paths:
-----------
branches/1.0/package/bluez_utils/
branches/1.0/package/bluez_utils/Config.in
branches/1.0/package/bluez_utils/bluez_utils-4.101-enable_cg2900_on_upstream_4.91.patch
branches/1.0/package/bluez_utils/bluez_utils.mk
Modified: branches/1.0/astlinux-ast11.config
===================================================================
--- branches/1.0/astlinux-ast11.config 2013-05-01 18:57:50 UTC (rev 6070)
+++ branches/1.0/astlinux-ast11.config 2013-05-02 00:13:42 UTC (rev 6071)
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
-# Buildroot 2011.08-svn6045-dirty Configuration
-# Tue Apr 16 10:39:53 2013
+# Buildroot 2011.08-svn6070-dirty Configuration
+# Wed May 1 18:58:21 2013
#
BR2_HAVE_DOT_CONFIG=y
# BR2_arm is not set
@@ -659,6 +659,7 @@
BR2_PACKAGE_ARNOFW=y
# BR2_PACKAGE_AVAHI is not set
# BR2_PACKAGE_AXEL is not set
+# BR2_PACKAGE_BLUEZ_UTILS is not set
# BR2_PACKAGE_BIND is not set
# BR2_PACKAGE_BMON is not set
BR2_PACKAGE_BRIDGE=y
Modified: branches/1.0/astlinux.config
===================================================================
--- branches/1.0/astlinux.config 2013-05-01 18:57:50 UTC (rev 6070)
+++ branches/1.0/astlinux.config 2013-05-02 00:13:42 UTC (rev 6071)
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
-# Buildroot 2011.08-svn6045-dirty Configuration
-# Tue Apr 16 10:39:52 2013
+# Buildroot 2011.08-svn6070-dirty Configuration
+# Wed May 1 18:58:17 2013
#
BR2_HAVE_DOT_CONFIG=y
# BR2_arm is not set
@@ -661,6 +661,7 @@
BR2_PACKAGE_ARNOFW=y
# BR2_PACKAGE_AVAHI is not set
# BR2_PACKAGE_AXEL is not set
+# BR2_PACKAGE_BLUEZ_UTILS is not set
# BR2_PACKAGE_BIND is not set
# BR2_PACKAGE_BMON is not set
BR2_PACKAGE_BRIDGE=y
Modified: branches/1.0/astlinux18.config
===================================================================
--- branches/1.0/astlinux18.config 2013-05-01 18:57:50 UTC (rev 6070)
+++ branches/1.0/astlinux18.config 2013-05-02 00:13:42 UTC (rev 6071)
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
-# Buildroot 2011.08-svn6045-dirty Configuration
-# Tue Apr 16 10:39:52 2013
+# Buildroot 2011.08-svn6070-dirty Configuration
+# Wed May 1 18:58:19 2013
#
BR2_HAVE_DOT_CONFIG=y
# BR2_arm is not set
@@ -659,6 +659,7 @@
BR2_PACKAGE_ARNOFW=y
# BR2_PACKAGE_AVAHI is not set
# BR2_PACKAGE_AXEL is not set
+# BR2_PACKAGE_BLUEZ_UTILS is not set
# BR2_PACKAGE_BIND is not set
# BR2_PACKAGE_BMON is not set
BR2_PACKAGE_BRIDGE=y
Modified: branches/1.0/initrd.config
===================================================================
--- branches/1.0/initrd.config 2013-05-01 18:57:50 UTC (rev 6070)
+++ branches/1.0/initrd.config 2013-05-02 00:13:42 UTC (rev 6071)
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
-# Buildroot 2011.08-svn6045-dirty Configuration
-# Tue Apr 16 10:39:54 2013
+# Buildroot 2011.08-svn6070-dirty Configuration
+# Wed May 1 18:58:47 2013
#
BR2_HAVE_DOT_CONFIG=y
# BR2_arm is not set
@@ -304,10 +304,7 @@
# BR2_PACKAGE_BFDETECT is not set
# BR2_PACKAGE_CDRKIT is not set
# BR2_PACKAGE_CRAMFS is not set
-
-#
-# dbus not available (need expat or libxml2)
-#
+# BR2_PACKAGE_DBUS is not set
# BR2_PACKAGE_DMRAID is not set
# BR2_PACKAGE_DOSFSTOOLS is not set
BR2_PACKAGE_E2FSPROGS=y
@@ -544,6 +541,7 @@
# BR2_PACKAGE_ARNOFW is not set
# BR2_PACKAGE_AVAHI is not set
# BR2_PACKAGE_AXEL is not set
+# BR2_PACKAGE_BLUEZ_UTILS is not set
# BR2_PACKAGE_BIND is not set
# BR2_PACKAGE_BMON is not set
# BR2_PACKAGE_BRIDGE is not set
Modified: branches/1.0/package/Config.in
===================================================================
--- branches/1.0/package/Config.in 2013-05-01 18:57:50 UTC (rev 6070)
+++ branches/1.0/package/Config.in 2013-05-02 00:13:42 UTC (rev 6071)
@@ -431,6 +431,7 @@
source "package/arnofw/Config.in"
source "package/avahi/Config.in"
source "package/axel/Config.in"
+source "package/bluez_utils/Config.in"
if BR2_PACKAGE_BUSYBOX_SHOW_OTHERS
source "package/boa/Config.in"
endif
Added: branches/1.0/package/bluez_utils/Config.in
===================================================================
--- branches/1.0/package/bluez_utils/Config.in (rev 0)
+++ branches/1.0/package/bluez_utils/Config.in 2013-05-02 00:13:42 UTC (rev 6071)
@@ -0,0 +1,34 @@
+config BR2_PACKAGE_BLUEZ_UTILS
+ bool "bluez-utils"
+ depends on BR2_USE_WCHAR # libglib2
+ select BR2_PACKAGE_DBUS
+ select BR2_PACKAGE_LIBGLIB2
+ help
+ bluez utils
+
+ http://www.kernel.org/pub/linux/bluetooth
+
+if BR2_PACKAGE_BLUEZ_UTILS
+
+config BR2_PACKAGE_BLUEZ_UTILS_COMPAT
+ bool "BlueZ 3.x compatibility binaries"
+ help
+ BlueZ 3.x compatibility binaries like pand, hidd, sdp
+
+config BR2_PACKAGE_BLUEZ_UTILS_AUDIO
+ bool "audio support"
+ select BR2_PACKAGE_ALSA_LIB
+ select BR2_PACKAGE_LIBSNDFILE
+ help
+ Audio support
+
+config BR2_PACKAGE_BLUEZ_UTILS_USB
+ bool "USB support"
+ select BR2_PACKAGE_LIBUSB
+ help
+ USB support
+
+endif
+
+comment "bluez-utils require a toolchain with WCHAR support"
+ depends on !(BR2_USE_WCHAR)
Added: branches/1.0/package/bluez_utils/bluez_utils-4.101-enable_cg2900_on_upstream_4.91.patch
===================================================================
--- branches/1.0/package/bluez_utils/bluez_utils-4.101-enable_cg2900_on_upstream_4.91.patch (rev 0)
+++ branches/1.0/package/bluez_utils/bluez_utils-4.101-enable_cg2900_on_upstream_4.91.patch 2013-05-02 00:13:42 UTC (rev 6071)
@@ -0,0 +1,105 @@
+From ac7992081abba87627c9e91735b3309584b48585 Mon Sep 17 00:00:00 2001
+From: Gregory Hermant <gre...@ca...>
+Date: Wed, 14 Nov 2012 14:27:02 +0100
+Subject: [PATCH] add support for the ST-Ericsson CG2900 GPS FM Bluetooth
+ combo controller
+
+
+Signed-off-by: Gregory Hermant <gre...@ca...>
+---
+ tools/hciattach.c | 22 +++++++++++++++-------
+ tools/hciattach.h | 1 +
+ 2 files changed, 16 insertions(+), 7 deletions(-)
+
+diff --git a/tools/hciattach.c b/tools/hciattach.c
+index e4d5aa1..7f08243 100644
+--- a/tools/hciattach.c
++++ b/tools/hciattach.c
+@@ -1066,6 +1066,11 @@ struct uart_t uart[] = {
+ { "texasalt", 0x0000, 0x0000, HCI_UART_LL, 115200, 115200,
+ FLOW_CTL, DISABLE_PM, NULL, texasalt, NULL },
+
++ /* ST-Ericsson CG2900 GPS FM Bluetooth combo controller */
++ { "cg2900", 0x0000, 0x0000, HCI_UART_STE, 115200, 115200,
++ FLOW_CTL, DISABLE_PM, NULL, NULL },
++
++
+ /* ST Microelectronics minikits based on STLC2410/STLC2415 */
+ { "st", 0x0000, 0x0000, HCI_UART_H4, 57600, 115200,
+ FLOW_CTL, DISABLE_PM, NULL, st },
+@@ -1157,10 +1162,10 @@ static struct uart_t * get_by_type(char *type)
+ }
+
+ /* Initialize UART driver */
+-static int init_uart(char *dev, struct uart_t *u, int send_break, int raw)
++static int init_uart(char *dev, struct uart_t *u, int send_break, int raw, int line_disc)
+ {
+ struct termios ti;
+- int fd, i;
++ int fd;
+ unsigned long flags = 0;
+
+ if (raw)
+@@ -1217,8 +1222,7 @@ static int init_uart(char *dev, struct uart_t *u, int send_break, int raw)
+ }
+
+ /* Set TTY to N_HCI line discipline */
+- i = N_HCI;
+- if (ioctl(fd, TIOCSETD, &i) < 0) {
++ if (ioctl(fd, TIOCSETD, &line_disc) < 0) {
+ perror("Can't set line discipline");
+ return -1;
+ }
+@@ -1243,7 +1247,7 @@ static void usage(void)
+ {
+ printf("hciattach - HCI UART driver initialization utility\n");
+ printf("Usage:\n");
+- printf("\thciattach [-n] [-p] [-b] [-r] [-t timeout] [-s initial_speed] <tty> <type | id> [speed] [flow|noflow] [bdaddr]\n");
++ printf("\thciattach [-n] [-p] [-a line_disc_nr] [-b] [-r] [-t timeout] [-s initial_speed] <tty> <type | id> [speed] [flow|noflow] [bdaddr]\n");
+ printf("\thciattach -l\n");
+ }
+
+@@ -1252,6 +1256,7 @@ int main(int argc, char *argv[])
+ struct uart_t *u = NULL;
+ int detach, printpid, raw, opt, i, n, ld, err;
+ int to = 10;
++ int line_disc = N_HCI;
+ int init_speed = 0;
+ int send_break = 0;
+ pid_t pid;
+@@ -1264,8 +1269,11 @@ int main(int argc, char *argv[])
+ printpid = 0;
+ raw = 0;
+
+- while ((opt=getopt(argc, argv, "bnpt:s:lr")) != EOF) {
++ while ((opt=getopt(argc, argv, "bnpt:s:lra:")) != EOF) {
+ switch(opt) {
++ case 'a':
++ line_disc = atoi(optarg);
++ break;
+ case 'b':
+ send_break = 1;
+ break;
+@@ -1381,7 +1389,7 @@ int main(int argc, char *argv[])
+ alarm(to);
+ bcsp_max_retries = to;
+
+- n = init_uart(dev, u, send_break, raw);
++ n = init_uart(dev, u, send_break, raw, line_disc);
+ if (n < 0) {
+ perror("Can't initialize device");
+ exit(1);
+diff --git a/tools/hciattach.h b/tools/hciattach.h
+index fed0d11..09b534d 100644
+--- a/tools/hciattach.h
++++ b/tools/hciattach.h
+@@ -39,6 +39,7 @@
+ #define HCI_UART_H4DS 3
+ #define HCI_UART_LL 4
+ #define HCI_UART_ATH3K 5
++#define HCI_UART_STE 6
+
+ #define HCI_UART_RAW_DEVICE 0
+
+--
+1.7.9.5
Added: branches/1.0/package/bluez_utils/bluez_utils.mk
===================================================================
--- branches/1.0/package/bluez_utils/bluez_utils.mk (rev 0)
+++ branches/1.0/package/bluez_utils/bluez_utils.mk 2013-05-02 00:13:42 UTC (rev 6071)
@@ -0,0 +1,47 @@
+#############################################################
+#
+# bluez_utils
+#
+#############################################################
+BLUEZ_UTILS_VERSION = 4.101
+BLUEZ_UTILS_SOURCE = bluez-$(BLUEZ_UTILS_VERSION).tar.gz
+BLUEZ_UTILS_SITE = http://www.kernel.org/pub/linux/bluetooth
+BLUEZ_UTILS_INSTALL_STAGING = YES
+BLUEZ_UTILS_DEPENDENCIES = dbus libglib2
+BLUEZ_UTILS_CONF_OPT = --enable-test --enable-tools
+BLUEZ_UTILS_AUTORECONF = YES
+
+# BlueZ 3.x compatibility
+ifeq ($(BR2_PACKAGE_BLUEZ_UTILS_COMPAT),y)
+BLUEZ_UTILS_CONF_OPT += \
+ --enable-hidd \
+ --enable-pand \
+ --enable-sdp \
+ --enable-dund
+endif
+
+# audio support
+ifeq ($(BR2_PACKAGE_BLUEZ_UTILS_AUDIO),y)
+BLUEZ_UTILS_DEPENDENCIES += \
+ alsa-lib \
+ libsndfile
+BLUEZ_UTILS_CONF_OPT += \
+ --enable-alsa \
+ --enable-audio
+else
+BLUEZ_UTILS_CONF_OPT += \
+ --disable-alsa \
+ --disable-audio
+endif
+
+# USB support
+ifeq ($(BR2_PACKAGE_BLUEZ_UTILS_USB),y)
+BLUEZ_UTILS_DEPENDENCIES += libusb
+BLUEZ_UTILS_CONF_OPT += \
+ --enable-usb
+else
+BLUEZ_UTILS_CONF_OPT += \
+ --disable-usb
+endif
+
+$(eval $(call AUTOTARGETS,package,bluez_utils))
Modified: branches/1.0/package/dbus/Config.in
===================================================================
--- branches/1.0/package/dbus/Config.in 2013-05-01 18:57:50 UTC (rev 6070)
+++ branches/1.0/package/dbus/Config.in 2013-05-02 00:13:42 UTC (rev 6071)
@@ -1,18 +1,13 @@
config BR2_PACKAGE_DBUS
bool "dbus"
- depends on BR2_PACKAGE_EXPAT || BR2_PACKAGE_LIBXML2
help
The D-Bus message bus system.
http://www.freedesktop.org/wiki/Software/dbus
-comment "dbus not available (need expat or libxml2)"
- depends on !BR2_PACKAGE_EXPAT && !BR2_PACKAGE_LIBXML2
-
choice
prompt "XML library to use"
depends on BR2_PACKAGE_DBUS
- default BR2_DBUS_LIBXML2 if (BR2_PACKAGE_LIBXML2 && !BR2_PACKAGE_EXPAT)
default BR2_DBUS_EXPAT
help
Select the XML library to use with D-Bus. Select Expat
@@ -21,10 +16,10 @@
config BR2_DBUS_EXPAT
bool "Expat"
- depends on BR2_PACKAGE_EXPAT
+ select BR2_PACKAGE_EXPAT
config BR2_DBUS_LIBXML2
bool "libxml2"
- depends on BR2_PACKAGE_LIBXML2
+ select BR2_PACKAGE_LIBXML2
endchoice
Modified: branches/1.0/package/dbus/dbus.mk
===================================================================
--- branches/1.0/package/dbus/dbus.mk 2013-05-01 18:57:50 UTC (rev 6070)
+++ branches/1.0/package/dbus/dbus.mk 2013-05-02 00:13:42 UTC (rev 6071)
@@ -3,11 +3,10 @@
# dbus
#
#############################################################
-DBUS_VERSION = 1.4.10
+DBUS_VERSION = 1.4.24
DBUS_SOURCE = dbus-$(DBUS_VERSION).tar.gz
-DBUS_SITE = http://dbus.freedesktop.org/releases/dbus/
+DBUS_SITE = http://dbus.freedesktop.org/releases/dbus
DBUS_INSTALL_STAGING = YES
-DBUS_INSTALL_TARGET = YES
DBUS_DEPENDENCIES = host-pkg-config
@@ -58,7 +57,7 @@
define DBUS_INSTALL_TARGET_FIXUP
rm -rf $(TARGET_DIR)/var/lib/dbus
ln -sf /tmp/dbus $(TARGET_DIR)/var/lib/dbus
- $(INSTALL) -m 0755 -D package/dbus/S30dbus $(TARGET_DIR)/etc/init.d/S30dbus
+ #$(INSTALL) -m 0755 -D package/dbus/S30dbus $(TARGET_DIR)/etc/init.d/S30dbus
endef
DBUS_POST_INSTALL_TARGET_HOOKS += DBUS_INSTALL_TARGET_FIXUP
Modified: branches/1.0/package/libglib2/libglib2.mk
===================================================================
--- branches/1.0/package/libglib2/libglib2.mk 2013-05-01 18:57:50 UTC (rev 6070)
+++ branches/1.0/package/libglib2/libglib2.mk 2013-05-02 00:13:42 UTC (rev 6071)
@@ -4,7 +4,7 @@
#
#############################################################
LIBGLIB2_VERSION_MAJOR = 2.28
-LIBGLIB2_VERSION_MINOR = 6
+LIBGLIB2_VERSION_MINOR = 8
LIBGLIB2_VERSION = $(LIBGLIB2_VERSION_MAJOR).$(LIBGLIB2_VERSION_MINOR)
LIBGLIB2_SOURCE = glib-$(LIBGLIB2_VERSION).tar.bz2
LIBGLIB2_SITE = http://ftp.gnome.org/pub/gnome/sources/glib/$(LIBGLIB2_VERSION_MAJOR)
Modified: branches/1.0/runnix-uclibc.config
===================================================================
--- branches/1.0/runnix-uclibc.config 2013-05-01 18:57:50 UTC (rev 6070)
+++ branches/1.0/runnix-uclibc.config 2013-05-02 00:13:42 UTC (rev 6071)
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
-# Buildroot 2011.08-svn6010-dirty Configuration
-# Sun Mar 24 18:00:17 2013
+# Buildroot 2011.08-svn6070-dirty Configuration
+# Wed May 1 18:58:37 2013
#
BR2_HAVE_DOT_CONFIG=y
# BR2_arm is not set
@@ -474,17 +474,14 @@
# cdrkit requires a toolchain with LARGEFILE support
#
# BR2_PACKAGE_CRAMFS is not set
+# BR2_PACKAGE_DBUS is not set
#
-# dbus not available (need expat or libxml2)
-#
-
-#
# dmraid requires a toolchain with LARGEFILE support
#
#
-# dosfstools requires a toolchain with LARGEFILE support
+# dosfstools requires a toolchain with LARGEFILE and WCHAR support
#
# BR2_PACKAGE_E1000 is not set
# BR2_PACKAGE_E1000E is not set
@@ -820,6 +817,10 @@
# BR2_PACKAGE_ARNOFW is not set
# BR2_PACKAGE_AVAHI is not set
# BR2_PACKAGE_AXEL is not set
+
+#
+# bluez-utils require a toolchain with WCHAR support
+#
# BR2_PACKAGE_BOA is not set
#
Modified: branches/1.0/runnix.config
===================================================================
--- branches/1.0/runnix.config 2013-05-01 18:57:50 UTC (rev 6070)
+++ branches/1.0/runnix.config 2013-05-02 00:13:42 UTC (rev 6071)
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
-# Buildroot 2011.08-svn6045-dirty Configuration
-# Tue Apr 16 10:39:53 2013
+# Buildroot 2011.08-svn6070-dirty Configuration
+# Wed May 1 18:58:33 2013
#
BR2_HAVE_DOT_CONFIG=y
# BR2_arm is not set
@@ -320,10 +320,7 @@
# BR2_PACKAGE_BFDETECT is not set
# BR2_PACKAGE_CDRKIT is not set
# BR2_PACKAGE_CRAMFS is not set
-
-#
-# dbus not available (need expat or libxml2)
-#
+# BR2_PACKAGE_DBUS is not set
# BR2_PACKAGE_DMRAID is not set
BR2_PACKAGE_DOSFSTOOLS=y
BR2_PACKAGE_DOSFSTOOLS_MKDOSFS=y
@@ -571,6 +568,7 @@
# BR2_PACKAGE_ARNOFW is not set
# BR2_PACKAGE_AVAHI is not set
# BR2_PACKAGE_AXEL is not set
+# BR2_PACKAGE_BLUEZ_UTILS is not set
# BR2_PACKAGE_BOA is not set
# BR2_PACKAGE_BIND is not set
# BR2_PACKAGE_BMON is not set
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
