5 files changed, 66 insertions, 2 deletions
diff --git a/packages/bluez-utils/bluez-utils-common_2.10.inc b/packages/bluez-utils/bluez-utils-common_2.10.inc
index e69de29bb2..70de8def74 100644
--- a/packages/bluez-utils/bluez-utils-common_2.10.inc
+++ b/packages/bluez-utils/bluez-utils-common_2.10.inc
@@ -0,0 +1,29 @@
+DESCRIPTION = "Linux Bluetooth Stack Userland Utilities."
+SECTION = "console"
+PRIORITY = "optional"
+DEPENDS = "bluez-libs pcmcia-cs"
+RPROVIDES = "bluez-pan bluez-sdp"
+LICENSE = "GPL"
+PR = "r1"
+
+SRC_URI = "http://bluez.sourceforge.net/download/bluez-utils-${PV}.tar.gz \
+	file://hcid.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}/sbin ${D}/bin/
+	mv ${D}${sbindir}/* ${D}/sbin/
+	mv ${D}${bindir}/* ${D}/bin/
+	rmdir ${D}${bindir} ${D}${sbindir}
+	chmod u+s ${D}/sbin/hciattach ${D}/sbin/hciconfig
+	chmod 755 ${D}/etc/pcmcia/bluetooth
+	install -m 0644 ${WORKDIR}/hcid.conf ${D}/etc/bluetooth/
+}
+
+inherit autotools update-rc.d
+
+INITSCRIPT_NAME = "bluetooth"
+INITSCRIPT_PARAMS = "defaults"
+
diff --git a/packages/bluez-utils/bluez-utils-common_2.11.inc b/packages/bluez-utils/bluez-utils-common_2.11.inc
index c980bb7725..4f4b8bf911 100644
--- a/packages/bluez-utils/bluez-utils-common_2.11.inc
+++ b/packages/bluez-utils/bluez-utils-common_2.11.inc
@@ -1,9 +1,10 @@
 DESCRIPTION = "Linux Bluetooth Stack Userland Utilities."
-SECTION = "libs"
+SECTION = "console"
 PRIORITY = "optional"
 DEPENDS = "bluez-libs-2.11 pcmcia-cs"
 RPROVIDES = "bluez-pan bluez-sdp bluez-utils"
 LICENSE = "GPL"
+PR = "r1"
 
 SRC_URI = "http://bluez.sourceforge.net/download/bluez-utils-${PV}.tar.gz \
 	file://hcid.conf"
diff --git a/packages/bluez-utils/bluez-utils-common_2.13.inc b/packages/bluez-utils/bluez-utils-common_2.13.inc
index 04f127b7f5..9b4f80902d 100644
--- a/packages/bluez-utils/bluez-utils-common_2.13.inc
+++ b/packages/bluez-utils/bluez-utils-common_2.13.inc
@@ -1,10 +1,11 @@
 DESCRIPTION = "Linux Bluetooth Stack Userland Utilities."
-SECTION = "libs"
+SECTION = "console"
 PRIORITY = "optional"
 DEPENDS = "bluez-libs-2.13 pcmcia-cs"
 RPROVIDES_${PN} = "bluez-pan bluez-sdp bluez-utils"
 LICENSE = "GPL"
 PACKAGES =+ "${PN}-ciptool ${PN}-bluepin"
+PR = "r1"
 
 FILES_${PN}-ciptool = "/bin/ciptool"
 FILES_${PN}-bluepin = "/bin/bluepin"
diff --git a/packages/bluez-utils/bluez-utils-common_2.14.inc b/packages/bluez-utils/bluez-utils-common_2.14.inc
index e69de29bb2..ed4f61e9c4 100644
--- a/packages/bluez-utils/bluez-utils-common_2.14.inc
+++ b/packages/bluez-utils/bluez-utils-common_2.14.inc
@@ -0,0 +1,33 @@
+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 = "r1"
+
+FILES_${PN}-ciptool = "/bin/ciptool"
+FILES_${PN}-bluepin = "/bin/bluepin"
+
+SRC_URI = "http://bluez.sourceforge.net/download/bluez-utils-${PV}.tar.gz \
+	file://hcid.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}/sbin ${D}/bin/
+	mv ${D}${sbindir}/* ${D}/sbin/
+	mv ${D}${bindir}/* ${D}/bin/
+	rmdir ${D}${bindir} ${D}${sbindir}
+	chmod u+s ${D}/sbin/hciattach ${D}/sbin/hciconfig
+	chmod 755 ${D}/etc/pcmcia/bluetooth
+	install -m 0644 ${WORKDIR}/hcid.conf ${D}/etc/bluetooth/
+}
+
+inherit autotools update-rc.d
+
+INITSCRIPT_NAME = "bluetooth"
+INITSCRIPT_PARAMS = "defaults 23 19"
+
diff --git a/packages/bluez-utils/bluez-utils-no-dbus_2.11.bb b/packages/bluez-utils/bluez-utils-no-dbus_2.11.bb
deleted file mode 100644
index e69de29bb2..0000000000
--- a/packages/bluez-utils/bluez-utils-no-dbus_2.11.bb
+++ /dev/null