bluez: update and put related .bb files into one directory

- bluez-libs, bluez-utils, and bluez-hcidump are pretty tied, so I think it makes sense to put them into the same directory
- update bluez-libs to 2.20
- update bluez-hcidump to 1.25
- enable default-manfid patch

13 files changed, 0 insertions, 407 deletions

diff --git a/packages/bluez-utils/files/.mtn2git_empty b/packages/bluez-utils/files/.mtn2git_empty
deleted file mode 100644
index e69de29bb2..0000000000
--- a/packages/bluez-utils/files/.mtn2git_empty
+++ /dev/null
diff --git a/packages/bluez-utils/files/base.patch b/packages/bluez-utils/files/base.patch
deleted file mode 100644
index 337c9aa73e..0000000000
--- a/packages/bluez-utils/files/base.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-
-#
-# Patch managed by http://www.holgerschurig.de/patcher.html
-#
-
---- bluez-utils-2.17/pcmcia/bluetooth~base.patch
-+++ bluez-utils-2.17/pcmcia/bluetooth
-@@ -15,9 +15,16 @@
- 
- if [ -r ./shared ]; then . ./shared ; else . /etc/pcmcia/shared ; fi
- 
-+# Give the port some time to complete initialization
-+sleep 5
-+
- # Get device attributes
- get_info $DEVICE
- 
-+test "$DEVICE" = "ttyS7" && DEVICE="/dev/tts/7"
-+test -z "$MANFID" && MANFID="bcsp"
-+test "$MANFID" = "0000,0000" && MANFID="bcsp"
-+
- #
- # Serial devices
- #
-@@ -25,7 +32,7 @@
-     IRQ=`setserial /dev/$DEVICE | sed -e 's/.*IRQ: //'`
-     setserial /dev/$DEVICE irq 0 ; setserial /dev/$DEVICE irq $IRQ
-  
--    /usr/sbin/hciattach $DEVICE $MANFID
-+    /sbin/hciattach $DEVICE $MANFID
- }
- stop_serial() {
-     do_fuser -k -HUP /dev/$DEVICE > /dev/null
diff --git a/packages/bluez-utils/files/blueboxes.patch b/packages/bluez-utils/files/blueboxes.patch
deleted file mode 100644
index c429b06c06..0000000000
--- a/packages/bluez-utils/files/blueboxes.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-
-#
-# Patch managed by http://www.holgerschurig.de/patcher.html
-#
-
---- bluez-utils-2.14/pcmcia/bluetooth.conf~base
-+++ bluez-utils-2.14/pcmcia/bluetooth.conf
-@@ -26,6 +26,10 @@
-   version "Brain Boxes", "Bluetooth PC Card"
-   bind "serial_cs" class "bluetooth"
- 
-+card "F+ Bluetooth_Card, BCSP"
-+  manfid 0x0160, 0xaba0
-+  bind "serial_cs" class "bluetooth"
-+
- card "IBM Bluetooth PC Card II"
-   version "IBM", "Bluetooth PC Card II"
-   bind "serial_cs" class "bluetooth"
diff --git a/packages/bluez-utils/files/bluetooth.conf b/packages/bluez-utils/files/bluetooth.conf
deleted file mode 100644
index bae8fae08e..0000000000
--- a/packages/bluez-utils/files/bluetooth.conf
+++ /dev/null
@@ -1,11 +0,0 @@
-#
-# additional cards for /etc/pcmcia/bluetooth.conf
-# Note for OE: This file is _appended_ to the stock
-# bluetooth.conf in bluez-utils, so no need to duplicate
-# entries for individual cards.
-#
-card "CSR BT01x0M Bluetooth CF Card"
-  version "Bluetooth BT0100M", "", ""
-  bind "serial_cs" class "bluetooth"
-
-
diff --git a/packages/bluez-utils/files/bluetooth.default b/packages/bluez-utils/files/bluetooth.default
deleted file mode 100644
index 4817d38c60..0000000000
--- a/packages/bluez-utils/files/bluetooth.default
+++ /dev/null
@@ -1,37 +0,0 @@
-# Bluetooth configuraton file
-
-# Start of hcid (allowed values are "true" and "false")
-HCID_ENABLE=true
-
-# Config file for hcid
-HCID_CONFIG="/etc/bluetooth/hcid.conf"
-
-# Start sdpd (allowed values are "true" and "false")
-SDPD_ENABLE=true
-
-# Start hidd (allowed values are "true" and "false")
-HIDD_ENABLE=true
-
-# Arguments to hidd
-HIDD_OPTIONS=""
-
-# Run hid2hci (allowed values are "true" and "false")
-HID2HCI_ENABLE=true
-
-# Bind rfcomm devices (allowed values are "true" and "false")
-RFCOMM_ENABLE=true
-
-# Config file for rfcomm
-RFCOMM_CONFIG="/etc/bluetooth/rfcomm.conf"
-
-# Start dund (allowed values are "true" and "false")
-DUND_ENABLE=false
-
-# Arguments to dund
-DUND_OPTIONS="--listen --persist"
-
-# Start pand (allowed values are "true" and "false")
-PAND_ENABLE=false
-
-# Arguments to pand
-PAND_OPTIONS="--listen --role NAP"
diff --git a/packages/bluez-utils/files/default-manfid-0x0-to-bcps.patch b/packages/bluez-utils/files/default-manfid-0x0-to-bcps.patch
deleted file mode 100644
index 3d993543b3..0000000000
--- a/packages/bluez-utils/files/default-manfid-0x0-to-bcps.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-
-#
-# Patch managed by http://www.holgerschurig.de/patcher.html
-#
-
---- bluez-utils-2.16/tools/hciattach.c~default-manfid-0x0-to-bcps
-+++ bluez-utils-2.16/tools/hciattach.c
-@@ -796,13 +796,12 @@
- }
- 
- struct uart_t uart[] = {
-+        { "bcsp",       0x0000, 0x0000, HCI_UART_BCSP, 115200, 115200, 0,        bcsp     },
- 	{ "any",        0x0000, 0x0000, HCI_UART_H4,   115200, 115200, FLOW_CTL, NULL     },
- 	{ "ericsson",   0x0000, 0x0000, HCI_UART_H4,   57600,  115200, FLOW_CTL, ericsson },
- 	{ "digi",       0x0000, 0x0000, HCI_UART_H4,   9600,   115200, FLOW_CTL, digi     },
- 	{ "texas",      0x0000, 0x0000, HCI_UART_H4,   115200, 115200, FLOW_CTL, texas    },
- 
--	{ "bcsp",       0x0000, 0x0000, HCI_UART_BCSP, 115200, 115200, 0,        bcsp     },
--
- 	/* Xircom PCMCIA cards: Credit Card Adapter and Real Port Adapter */
- 	{ "xircom",     0x0105, 0x080a, HCI_UART_H4,   115200, 115200, FLOW_CTL, NULL     },
- 
diff --git a/packages/bluez-utils/files/hcid.conf b/packages/bluez-utils/files/hcid.conf
deleted file mode 100644
index 44e9c46fb0..0000000000
--- a/packages/bluez-utils/files/hcid.conf
+++ /dev/null
@@ -1,72 +0,0 @@
-#
-# HCI daemon configuration file.
-#
-# $Id: hcid.conf,v 1.4 2004/04/29 20:14:21 holtmann Exp $
-#
-
-# HCId options
-options {
-	# Automatically initialize new devices
-	autoinit yes;
-
-	# Security Manager mode
-	#   none - Security manager disabled
-	#   auto - Use local PIN for incoming connections
-	#   user - Always ask user for a PIN
-	#
-	security auto;
-
-	# Pairing mode
-	#   none  - Pairing disabled
-	#   multi - Allow pairing with already paired devices
-	#   once  - Pair once and deny successive attempts
-	pairing multi;
-
-	# PIN helper
-	pin_helper /bin/bluepin;
-
-	# D-Bus PIN helper
-	# dbus_pin_helper;
-}
-
-# Default settings for HCI devices
-device {
-	# Local device name
-	#   %d - device id
-	#   %h - host name
-	name "%h";
-
-	# Local device class
-	class 0x120112;
-
-	# Default packet type
-	#pkt_type DH1,DM1,HV1;
-
-	# Inquiry and Page scan
-	iscan enable; pscan enable;
-
-	# Default link mode
-	#   none   - no specific policy 
-	#   accept - always accept incoming connections
-	#   master - become master on incoming connections,
-	#            deny role switch on outgoing connections
-	#
-	#lm accept,master;
-	#
-	lm accept;
-
-	# Default link policy
-	#   none    - no specific policy
-	#   rswitch - allow role switch
-	#   hold    - allow hold mode
-	#   sniff   - allow sniff mode
-	#   park    - allow park mode
-	#
-	#lp hold,sniff;
-	#
-	lp rswitch,hold,sniff,park;
-
-	# Authentication and Encryption
-	#auth enable;
-	encrypt enable;
-}
diff --git a/packages/bluez-utils/files/openmn/.mtn2git_empty b/packages/bluez-utils/files/openmn/.mtn2git_empty
deleted file mode 100644
index e69de29bb2..0000000000
--- a/packages/bluez-utils/files/openmn/.mtn2git_empty
+++ /dev/null
diff --git a/packages/bluez-utils/files/openmn/bluetooth.default b/packages/bluez-utils/files/openmn/bluetooth.default
deleted file mode 100644
index 06c52d7960..0000000000
--- a/packages/bluez-utils/files/openmn/bluetooth.default
+++ /dev/null
@@ -1,37 +0,0 @@
-# Bluetooth configuraton file
-
-# Start of hcid (allowed values are "true" and "false")
-HCID_ENABLE=true
-
-# Config file for hcid
-HCID_CONFIG="/etc/bluetooth/hcid.conf"
-
-# Start sdpd (allowed values are "true" and "false")
-SDPD_ENABLE=false
-
-# Start hidd (allowed values are "true" and "false")
-HIDD_ENABLE=false
-
-# Arguments to hidd
-HIDD_OPTIONS=""
-
-# Run hid2hci (allowed values are "true" and "false")
-HID2HCI_ENABLE=false
-
-# Bind rfcomm devices (allowed values are "true" and "false")
-RFCOMM_ENABLE=false
-
-# Config file for rfcomm
-RFCOMM_CONFIG="/etc/bluetooth/rfcomm.conf"
-
-# Start dund (allowed values are "true" and "false")
-DUND_ENABLE=false
-
-# Arguments to dund
-DUND_OPTIONS="--listen --persist"
-
-# Start pand (allowed values are "true" and "false")
-PAND_ENABLE=false
-
-# Arguments to pand
-PAND_OPTIONS="--listen --role NAP"
diff --git a/packages/bluez-utils/files/openmn/hcid.conf b/packages/bluez-utils/files/openmn/hcid.conf
deleted file mode 100644
index 46a5d5fd54..0000000000
--- a/packages/bluez-utils/files/openmn/hcid.conf
+++ /dev/null
@@ -1,70 +0,0 @@
-#
-# HCI daemon configuration file.
-#
-# $Id: hcid.conf,v 1.4 2004/04/29 20:14:21 holtmann Exp $
-#
-
-# HCId options
-options {
-	# Automatically initialize new devices
-	autoinit yes;
-
-	# Security Manager mode
-	#   none - Security manager disabled
-	#   auto - Use local PIN for incoming connections
-	#   user - Always ask user for a PIN
-	#
-	security auto;
-
-	# Pairing mode
-	#   none  - Pairing disabled
-	#   multi - Allow pairing with already paired devices
-	#   once  - Pair once and deny successive attempts
-	pairing multi;
-
-	# PIN helper
-	# pin_helper /bin/bluepin;
-
-	# D-Bus PIN helper
-	# dbus_pin_helper;
-}
-
-# Default settings for HCI devices
-device {
-	# Local device name
-	#   %d - device id
-	#   %h - host name
-	name "%h";
-
-	# Local device class
-	class 0x820100;
-
-	# Default packet type
-	#pkt_type DH1,DM1,HV1;
-
-	# Inquiry and Page scan
-	iscan enable; pscan enable;
-
-	# Default link mode
-	#   none   - no specific policy 
-	#   accept - always accept incoming connections
-	#   master - become master on incoming connections,
-	#            deny role switch on outgoing connections
-	#
-	lm accept,master;
-
-	# Default link policy
-	#   none    - no specific policy
-	#   rswitch - allow role switch
-	#   hold    - allow hold mode
-	#   sniff   - allow sniff mode
-	#   park    - allow park mode
-	#
-	#lp hold,sniff;
-	#
-	lp rswitch,hold,sniff,park;
-
-	# Authentication and Encryption
-	auth enable;
-	encrypt enable;
-}
diff --git a/packages/bluez-utils/files/openslug/.mtn2git_empty b/packages/bluez-utils/files/openslug/.mtn2git_empty
deleted file mode 100644
index e69de29bb2..0000000000
--- a/packages/bluez-utils/files/openslug/.mtn2git_empty
+++ /dev/null
diff --git a/packages/bluez-utils/files/openslug/bluetooth.default b/packages/bluez-utils/files/openslug/bluetooth.default
deleted file mode 100644
index 10f628e314..0000000000
--- a/packages/bluez-utils/files/openslug/bluetooth.default
+++ /dev/null
@@ -1,37 +0,0 @@
-# Bluetooth configuraton file
-
-# Start of hcid (allowed values are "true" and "false")
-HCID_ENABLE=true
-
-# Config file for hcid
-HCID_CONFIG="/etc/bluetooth/hcid.conf"
-
-# Start sdpd (allowed values are "true" and "false")
-SDPD_ENABLE=true
-
-# Start hidd (allowed values are "true" and "false")
-HIDD_ENABLE=false
-
-# Arguments to hidd
-HIDD_OPTIONS=""
-
-# Run hid2hci (allowed values are "true" and "false")
-HID2HCI_ENABLE=false
-
-# Bind rfcomm devices (allowed values are "true" and "false")
-RFCOMM_ENABLE=true
-
-# Config file for rfcomm
-RFCOMM_CONFIG="/etc/bluetooth/rfcomm.conf"
-
-# Start dund (allowed values are "true" and "false")
-DUND_ENABLE=true
-
-# Arguments to dund
-DUND_OPTIONS="--listen --persist"
-
-# Start pand (allowed values are "true" and "false")
-PAND_ENABLE=true
-
-# Arguments to pand
-PAND_OPTIONS="--listen --role NAP"
diff --git a/packages/bluez-utils/files/openslug/hcid.conf b/packages/bluez-utils/files/openslug/hcid.conf
deleted file mode 100644
index 46a5d5fd54..0000000000
--- a/packages/bluez-utils/files/openslug/hcid.conf
+++ /dev/null
@@ -1,70 +0,0 @@
-#
-# HCI daemon configuration file.
-#
-# $Id: hcid.conf,v 1.4 2004/04/29 20:14:21 holtmann Exp $
-#
-
-# HCId options
-options {
-	# Automatically initialize new devices
-	autoinit yes;
-
-	# Security Manager mode
-	#   none - Security manager disabled
-	#   auto - Use local PIN for incoming connections
-	#   user - Always ask user for a PIN
-	#
-	security auto;
-
-	# Pairing mode
-	#   none  - Pairing disabled
-	#   multi - Allow pairing with already paired devices
-	#   once  - Pair once and deny successive attempts
-	pairing multi;
-
-	# PIN helper
-	# pin_helper /bin/bluepin;
-
-	# D-Bus PIN helper
-	# dbus_pin_helper;
-}
-
-# Default settings for HCI devices
-device {
-	# Local device name
-	#   %d - device id
-	#   %h - host name
-	name "%h";
-
-	# Local device class
-	class 0x820100;
-
-	# Default packet type
-	#pkt_type DH1,DM1,HV1;
-
-	# Inquiry and Page scan
-	iscan enable; pscan enable;
-
-	# Default link mode
-	#   none   - no specific policy 
-	#   accept - always accept incoming connections
-	#   master - become master on incoming connections,
-	#            deny role switch on outgoing connections
-	#
-	lm accept,master;
-
-	# Default link policy
-	#   none    - no specific policy
-	#   rswitch - allow role switch
-	#   hold    - allow hold mode
-	#   sniff   - allow sniff mode
-	#   park    - allow park mode
-	#
-	#lp hold,sniff;
-	#
-	lp rswitch,hold,sniff,park;
-
-	# Authentication and Encryption
-	auth enable;
-	encrypt enable;
-}