summaryrefslogtreecommitdiff
path: root/packages/bluez-utils
diff options
context:
space:
mode:
authorRod Whitby <rod@whitby.id.au>2005-02-26 07:07:58 +0000
committerRod Whitby <rod@whitby.id.au>2005-02-26 07:07:58 +0000
commitf4f5d383bab5b17fe24e066bc5bedd2b32ae8233 (patch)
treefbb5dc63629854d0123ac4c24ea54f06b91a8165 /packages/bluez-utils
parentc3d67aed6cb1cc582ba028e59649ecd0d5e4bd90 (diff)
Added bluetooth.default to bluez files, so that distros can start up different daemons by default.
BKrev: 4220204e4gEy0rHXrj_ZGMn9tYp7HQ
Diffstat (limited to 'packages/bluez-utils')
-rw-r--r--packages/bluez-utils/bluez-utils-common_2.14.inc7
-rw-r--r--packages/bluez-utils/bluez-utils-dbus_2.14.bb6
-rw-r--r--packages/bluez-utils/bluez-utils-nodbus_2.14.bb5
3 files changed, 16 insertions, 2 deletions
diff --git a/packages/bluez-utils/bluez-utils-common_2.14.inc b/packages/bluez-utils/bluez-utils-common_2.14.inc
index 6ab6d0ccd9..3d8adf0e6a 100644
--- a/packages/bluez-utils/bluez-utils-common_2.14.inc
+++ b/packages/bluez-utils/bluez-utils-common_2.14.inc
@@ -5,13 +5,15 @@ DEPENDS = "bluez-libs-2.14 pcmcia-cs"
RPROVIDES_${PN} = "bluez-pan bluez-sdp bluez-utils"
LICENSE = "GPL"
PACKAGES =+ "${PN}-ciptool ${PN}-bluepin"
-PR = "r1"
+PR = "r2"
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"
+ file://hcid.conf \
+ file://bluetooth.default"
+
S = "${WORKDIR}/bluez-utils-${PV}"
EXTRA_OECONF = "--with-bluez-libs=${STAGING_LIBDIR} --with-bluez-includes=${STAGING_INCDIR} --enable-pcmcia --enable-initscripts"
@@ -24,6 +26,7 @@ do_install_append() {
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
}
inherit autotools update-rc.d
diff --git a/packages/bluez-utils/bluez-utils-dbus_2.14.bb b/packages/bluez-utils/bluez-utils-dbus_2.14.bb
index e69de29bb2..6cee31a3d3 100644
--- a/packages/bluez-utils/bluez-utils-dbus_2.14.bb
+++ b/packages/bluez-utils/bluez-utils-dbus_2.14.bb
@@ -0,0 +1,6 @@
+include bluez-utils-common_${PV}.inc
+DEPENDS += "dbus"
+SRC_URI += "file://dbus.patch;patch=1 file://smash.patch;patch=1"
+PR = "r1"
+EXTRA_OECONF += "--with-dbus"
+
diff --git a/packages/bluez-utils/bluez-utils-nodbus_2.14.bb b/packages/bluez-utils/bluez-utils-nodbus_2.14.bb
index e69de29bb2..9fa32d11ca 100644
--- a/packages/bluez-utils/bluez-utils-nodbus_2.14.bb
+++ b/packages/bluez-utils/bluez-utils-nodbus_2.14.bb
@@ -0,0 +1,5 @@
+include bluez-utils-common_${PV}.inc
+PR = "r1"
+
+EXTRA_OECONF += "--without-dbus"
+