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

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

2005/05/02 13:47:01+02:00 uni-frankfurt.de!mickeyl
Merge bk://oe-devel@oe-devel.bkbits.net/openembedded
into gandalf.tm.informatik.uni-frankfurt.de:/local/pkg/oe/packages

2005/05/01 15:08:34+02:00 uni-frankfurt.de!mickeyl
bluez-utils: patch hciattach to default to 'bcps' instead of 'any' which seems to be what most cards w/ manfid 0x000,0x000 are using. apply for familiar and openzaurus until we have more experience

BKrev: 42761fa6sgHdew_MwOnSOClO0oWdbQ

7 files changed, 6 insertions, 52 deletions

diff --git a/packages/bluez-utils/bluez-utils-common_2.14.inc b/packages/bluez-utils/bluez-utils-common_2.14.inc
deleted file mode 100644
index 4ac1657c84..0000000000
--- a/packages/bluez-utils/bluez-utils-common_2.14.inc
+++ /dev/null
@@ -1,42 +0,0 @@
-DESCRIPTION = "Linux Bluetooth Stack Userland Utilities."
-SECTION = "console"
-PRIORITY = "optional"
-DEPENDS = "bluez-libs-2.14 pcmcia-cs"
-RPROVIDES_${PN} = "bluez-pan bluez-sdp bluez-utils"
-LICENSE = "GPL"
-PACKAGES =+ "${PN}-ciptool ${PN}-bluepin"
-PR = "r5"
-
-FILES_${PN}-ciptool = "/bin/ciptool"
-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 \
-	file://bluetooth.conf "
-
-S = "${WORKDIR}/bluez-utils-${PV}"
-
-EXTRA_OECONF = "--with-bluez-libs=${STAGING_LIBDIR} --with-bluez-includes=${STAGING_INCDIR} --enable-pcmcia --enable-initscripts"
-
-do_install_append() {
-	install -d ${D}${base_sbindir} ${D}${base_bindir}/
-	mv ${D}${sbindir}/* ${D}${base_sbindir}/
-	mv ${D}${bindir}/* ${D}${base_bindir}/
-	rmdir ${D}${bindir} ${D}${sbindir}
-	chmod u+s ${D}${base_sbindir}/hciattach ${D}${base_sbindir}/hciconfig
-	chmod 755 ${D}${sysconfdir}/pcmcia/bluetooth
-	install -m 0644 ${WORKDIR}/hcid.conf ${D}${sysconfdir}/bluetooth/
-	install -m 0644 ${WORKDIR}/bluetooth.default ${D}${sysconfdir}/default/bluetooth
-	cat ${WORKDIR}/bluetooth.conf >> ${D}${sysconfdir}/pcmcia/bluetooth.conf
-}
-
-inherit autotools update-rc.d
-
-INITSCRIPT_NAME = "bluetooth"
-INITSCRIPT_PARAMS = "defaults 23 19"
-
-CONFFILES_${PN} = "${sysconfdir}/bluetooth/hcid.conf ${sysconfdir}/bluetooth/rfcomm.conf \
-	${sysconfdir}/bluetooth/pin ${sysconfdir}/default/bluetooth"
diff --git a/packages/bluez-utils/bluez-utils-common_2.16.inc b/packages/bluez-utils/bluez-utils-common_2.16.inc
index 12af639e2b..69f9514695 100644
--- a/packages/bluez-utils/bluez-utils-common_2.16.inc
+++ b/packages/bluez-utils/bluez-utils-common_2.16.inc
@@ -4,7 +4,7 @@ PRIORITY = "optional"
 DEPENDS = "bluez-libs-${PV} pcmcia-cs"
 RPROVIDES_${PN} = "bluez-pan bluez-sdp bluez-utils"
 LICENSE = "GPL"
-PR = "r1"
+PR = "r2"
 
 SRC_URI = "http://bluez.sourceforge.net/download/bluez-utils-${PV}.tar.gz \
 	file://base.patch;patch=1 \
@@ -13,6 +13,11 @@ SRC_URI = "http://bluez.sourceforge.net/download/bluez-utils-${PV}.tar.gz \
 	file://bluetooth.default \
 	file://bluetooth.conf "
 
+# Almost all serial CF cards w/ manfid 0x0000,0x0000 seem to use the bcs protocol
+# Let's default to that instead of 'any' and see if we break something with that
+SRC_URI_append_familiar   = " file://default-manfid-0x0-to-bcps.patch"
+SRC_URI_append_openzaurus = " file://default-manfid-0x0-to-bcps.patch"
+
 S = "${WORKDIR}/bluez-utils-${PV}"
 
 EXTRA_OECONF = "--with-bluez-libs=${STAGING_LIBDIR} --with-bluez-includes=${STAGING_INCDIR} \
diff --git a/packages/bluez-utils/bluez-utils-dbus_2.14.bb b/packages/bluez-utils/bluez-utils-dbus_2.14.bb
deleted file mode 100644
index f405cd5133..0000000000
--- a/packages/bluez-utils/bluez-utils-dbus_2.14.bb
+++ /dev/null
@@ -1,5 +0,0 @@
-include bluez-utils-common_${PV}.inc
-DEPENDS += "dbus"
-SRC_URI += "file://dbus.patch;patch=1 file://smash.patch;patch=1"
-EXTRA_OECONF += "--with-dbus"
-
diff --git a/packages/bluez-utils/bluez-utils-dbus_2.15.bb b/packages/bluez-utils/bluez-utils-dbus_2.15.bb
deleted file mode 100644
index e69de29bb2..0000000000
--- a/packages/bluez-utils/bluez-utils-dbus_2.15.bb
+++ /dev/null
diff --git a/packages/bluez-utils/bluez-utils-nodbus_2.14.bb b/packages/bluez-utils/bluez-utils-nodbus_2.14.bb
deleted file mode 100644
index 6334a4a499..0000000000
--- a/packages/bluez-utils/bluez-utils-nodbus_2.14.bb
+++ /dev/null
@@ -1,4 +0,0 @@
-include bluez-utils-common_${PV}.inc
-
-EXTRA_OECONF += "--without-dbus"
-
diff --git a/packages/bluez-utils/bluez-utils-nodbus_2.15.bb b/packages/bluez-utils/bluez-utils-nodbus_2.15.bb
deleted file mode 100644
index e69de29bb2..0000000000
--- a/packages/bluez-utils/bluez-utils-nodbus_2.15.bb
+++ /dev/null
diff --git a/packages/bluez-utils/bluez-utils-common_2.15.inc b/packages/bluez-utils/files/default-manfid-0x0-to-bcps.patch
index e69de29bb2..e69de29bb2 100644
--- a/packages/bluez-utils/bluez-utils-common_2.15.inc
+++ b/packages/bluez-utils/files/default-manfid-0x0-to-bcps.patch