diff options
| author | Adrian Davey <ade@beth2.org> | 2005-12-20 12:17:52 +0000 |
|---|---|---|
| committer | OpenEmbedded Project <openembedded-devel@lists.openembedded.org> | 2005-12-20 12:17:52 +0000 |
| commit | cb2d3b7f87c78ddcb9cd639516d177bdfd017c9b (patch) | |
| tree | 10bdc34bfe267bd0457199ff9af9d3ff25d3275b /packages | |
| parent | 42242f841559c4d9edd452d3ad16ff2f88acf57d (diff) | |
| parent | c01a09f6a7c80d4794f9ad75b92032c4fda9fcc5 (diff) | |
merge of 56f0ea6b2b447969899f4758a5a538eba3f2b44c
and 70d8a72ef31e0d28a2da35ba944c64a5e5d9d7fb
Diffstat (limited to 'packages')
| -rw-r--r-- | packages/bluez/bluez-utils-dbus_2.20.bb | 2 | ||||
| -rw-r--r-- | packages/bluez/bluez-utils-dbus_2.21.bb | 2 | ||||
| -rw-r--r-- | packages/bluez/bluez-utils-nodbus_2.20.bb | 2 | ||||
| -rw-r--r-- | packages/bluez/bluez-utils-nodbus_2.21.bb | 2 | ||||
| -rw-r--r-- | packages/bluez/bluez-utils.inc | 1 | ||||
| -rw-r--r-- | packages/bluez/files/bluetooth.conf | 4 |
6 files changed, 8 insertions, 5 deletions
diff --git a/packages/bluez/bluez-utils-dbus_2.20.bb b/packages/bluez/bluez-utils-dbus_2.20.bb index f6923f2f2e..3a9baf4ebc 100644 --- a/packages/bluez/bluez-utils-dbus_2.20.bb +++ b/packages/bluez/bluez-utils-dbus_2.20.bb @@ -1,6 +1,6 @@ include bluez-utils.inc -PR = "r8" +PR = "r9" DEPENDS += "dbus" SRC_URI += "file://dbus.patch;patch=1 \ diff --git a/packages/bluez/bluez-utils-dbus_2.21.bb b/packages/bluez/bluez-utils-dbus_2.21.bb index 58b2725143..7eeb0a269a 100644 --- a/packages/bluez/bluez-utils-dbus_2.21.bb +++ b/packages/bluez/bluez-utils-dbus_2.21.bb @@ -1,6 +1,6 @@ include bluez-utils.inc -PR = "r2" +PR = "r3" DEPENDS += "dbus" SRC_URI += "file://dbus.patch;patch=1 \ diff --git a/packages/bluez/bluez-utils-nodbus_2.20.bb b/packages/bluez/bluez-utils-nodbus_2.20.bb index 487ace6e15..2abe49aab3 100644 --- a/packages/bluez/bluez-utils-nodbus_2.20.bb +++ b/packages/bluez/bluez-utils-nodbus_2.20.bb @@ -1,4 +1,6 @@ include bluez-utils.inc +PR = "r1" + EXTRA_OECONF += "--without-dbus" diff --git a/packages/bluez/bluez-utils-nodbus_2.21.bb b/packages/bluez/bluez-utils-nodbus_2.21.bb index 05850a872e..774549be3d 100644 --- a/packages/bluez/bluez-utils-nodbus_2.21.bb +++ b/packages/bluez/bluez-utils-nodbus_2.21.bb @@ -1,5 +1,5 @@ include bluez-utils.inc -PR = "r0" +PR = "r1" EXTRA_OECONF += "--without-dbus" diff --git a/packages/bluez/bluez-utils.inc b/packages/bluez/bluez-utils.inc index 4fb7efd198..9fddc5f759 100644 --- a/packages/bluez/bluez-utils.inc +++ b/packages/bluez/bluez-utils.inc @@ -4,7 +4,6 @@ PRIORITY = "optional" DEPENDS = "bluez-libs-${PV} pcmcia-cs" RPROVIDES_${PN} = "bluez-pan bluez-sdp bluez-utils" LICENSE = "GPL" -PR = "r7" SRC_URI = "http://bluez.sourceforge.net/download/bluez-utils-${PV}.tar.gz \ file://base.patch;patch=1 \ diff --git a/packages/bluez/files/bluetooth.conf b/packages/bluez/files/bluetooth.conf index bae8fae08e..872084702a 100644 --- a/packages/bluez/files/bluetooth.conf +++ b/packages/bluez/files/bluetooth.conf @@ -8,4 +8,6 @@ card "CSR BT01x0M Bluetooth CF Card" version "Bluetooth BT0100M", "", "" bind "serial_cs" class "bluetooth" - +card "Socket Bluetooth CF Card Rev. G" + manfid 0x0104, 0x0096 + bind "serial_cs" class "bluetooth" |