diff options
| -rw-r--r-- | packages/bluez/bluez-utils-2.21.inc | 48 | ||||
| -rw-r--r-- | packages/bluez/bluez-utils-dbus_2.20.bb | 6 | ||||
| -rw-r--r-- | packages/bluez/bluez-utils-dbus_2.21.bb | 5 | ||||
| -rw-r--r-- | packages/bluez/bluez-utils-nodbus_2.21.bb | 4 |
4 files changed, 12 insertions, 51 deletions
diff --git a/packages/bluez/bluez-utils-2.21.inc b/packages/bluez/bluez-utils-2.21.inc deleted file mode 100644 index d4d1bdc387..0000000000 --- a/packages/bluez/bluez-utils-2.21.inc +++ /dev/null @@ -1,48 +0,0 @@ -DESCRIPTION = "Linux Bluetooth Stack Userland Utilities." -SECTION = "console" -PRIORITY = "optional" -DEPENDS = "bluez-libs-${PV} pcmcia-cs" -RPROVIDES_${PN} = "bluez-pan bluez-sdp bluez-utils" -LICENSE = "GPL" -PR = "r0" - -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 " - -# 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;patch=1" -SRC_URI_append_openzaurus = " file://default-manfid-0x0-to-bcps.patch;patch=1" - -S = "${WORKDIR}/bluez-utils-${PV}" - -EXTRA_OECONF = "--with-bluez-libs=${STAGING_LIBDIR} --with-bluez-includes=${STAGING_INCDIR} \ - --enable-pcmcia --enable-initscripts --enable-bcm203x" - -inherit autotools update-rc.d - -INITSCRIPT_NAME = "bluetooth" -INITSCRIPT_PARAMS = "defaults 23 19" - -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 -} - -CONFFILES_${PN} = "${sysconfdir}/bluetooth/hcid.conf ${sysconfdir}/bluetooth/rfcomm.conf \ - ${sysconfdir}/bluetooth/pin ${sysconfdir}/default/bluetooth" - -PACKAGES =+ "${PN}-ciptool ${PN}-bluepin" -FILES_${PN}-ciptool = "/bin/ciptool" -FILES_${PN}-bluepin = "/bin/bluepin" diff --git a/packages/bluez/bluez-utils-dbus_2.20.bb b/packages/bluez/bluez-utils-dbus_2.20.bb index 3248b652f0..f6923f2f2e 100644 --- a/packages/bluez/bluez-utils-dbus_2.20.bb +++ b/packages/bluez/bluez-utils-dbus_2.20.bb @@ -1,6 +1,10 @@ include bluez-utils.inc + +PR = "r8" + DEPENDS += "dbus" -SRC_URI += "file://smash.patch;patch=1 \ +SRC_URI += "file://dbus.patch;patch=1 \ + file://smash.patch;patch=1 \ file://hcid-alignment-fix.patch;patch=1" EXTRA_OECONF += "--with-dbus" diff --git a/packages/bluez/bluez-utils-dbus_2.21.bb b/packages/bluez/bluez-utils-dbus_2.21.bb index 3e89e8408d..5d9cb8db9d 100644 --- a/packages/bluez/bluez-utils-dbus_2.21.bb +++ b/packages/bluez/bluez-utils-dbus_2.21.bb @@ -1,4 +1,7 @@ -include bluez-utils-${PV}.inc +include bluez-utils.inc + +PR = "r1" + DEPENDS += "dbus" SRC_URI += "file://smash.patch;patch=1 \ file://hcid-alignment-fix.patch;patch=1" diff --git a/packages/bluez/bluez-utils-nodbus_2.21.bb b/packages/bluez/bluez-utils-nodbus_2.21.bb index 43230271d9..05850a872e 100644 --- a/packages/bluez/bluez-utils-nodbus_2.21.bb +++ b/packages/bluez/bluez-utils-nodbus_2.21.bb @@ -1,3 +1,5 @@ -include bluez-utils-${PV}.inc +include bluez-utils.inc + +PR = "r0" EXTRA_OECONF += "--without-dbus" |