Merge bk://oe-devel.bkbits.net/openembedded

into bkbits.net:/repos/n/nslu2-linux/openembedded

2005/03/30 15:24:00+02:00 mn-solutions.de!schurig
bluez-utilities:
add PCMCIA id for BrainBoxes BCSP-able CF-Card
allow to run devfs-enabled and no-devfs-enabled systems
concentrate PR handling in one place

BKrev: 424aac8a76-XgMMYY5Hd-clib3FViA

diff --git a/packages/bluez-utils/bluez-utils-common_2.14.inc b/packages/bluez-utils/bluez-utils-common_2.14.inc
index 08489c7..c5a2dd5 100644 (file)
--- a/packages/bluez-utils/bluez-utils-common_2.14.inc
+++ b/packages/bluez-utils/bluez-utils-common_2.14.inc
@@ -12,6 +12,7 @@ FILES_${PN}-bluepin = "/bin/bluepin"
 
 SRC_URI = "http://bluez.sourceforge.net/download/bluez-utils-${PV}.tar.gz \
        file://base.patch;patch=1 \
+       file://blueboxes.patch;patch=1 \
        file://hcid.conf \
        file://bluetooth.default"
 

diff --git a/packages/bluez-utils/files/base.patch b/packages/bluez-utils/files/base.patch
index e69de29..dbbff51 100644 (file)
--- a/packages/bluez-utils/files/base.patch
+++ b/packages/bluez-utils/files/base.patch
@@ -0,0 +1,26 @@
+
+#
+# Patch managed by http://www.holgerschurig.de/patcher.html
+#
+
+--- bluez-utils-2.14/pcmcia/bluetooth~base
++++ bluez-utils-2.14/pcmcia/bluetooth
+@@ -15,6 +15,9 @@
+ 
+ if [ -r ./shared ]; then . ./shared ; else . /etc/pcmcia/shared ; fi
+ 
++test "$DEVICE" = "ttyS7" && DEVICE="/dev/tts/7"
++test -z "$MANFID" && MANFID="bcsp"
++
+ # Get device attributes
+ get_info $DEVICE
+ 
+@@ -25,7 +28,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
new file mode 100644 (file)
index 0000000..e69de29