merge of '45fb4fa94d52a65c3a3fa636c6122139173dfa8d'

     and 'aa6010d679e0e80d63f4e63191b66e5759482858'

diff --git a/packages/bluez/bluez-libs_2.20.bb b/packages/bluez/bluez-libs_2.20.bb
deleted file mode 100644 (file)
index d740bd8..0000000
--- a/packages/bluez/bluez-libs_2.20.bb
+++ /dev/null
@@ -1,22 +0,0 @@
-DESCRIPTION = "Linux Bluetooth Stack Userland Libaries."
-SECTION = "libs"
-PRIORITY = "optional"
-HOMEPAGE = "http://www.bluez.org"
-LICENSE = "GPL"
-PR = "r0"
-
-SRC_URI = "http://bluez.sourceforge.net/download/bluez-libs-${PV}.tar.gz"
-
-inherit autotools pkgconfig
-
-HEADERS = "bluetooth.h bnep.h cmtp.h hci.h hci_lib.h hidp.h l2cap.h rfcomm.h sco.h sdp.h sdp_lib.h"
-
-do_stage() {
-        oe_libinstall -a -so -C src libbluetooth ${STAGING_LIBDIR}
-
-        install -d ${STAGING_INCDIR}/bluetooth/
-        for f in ${HEADERS}
-        do
-               install -m 0644 include/$f ${STAGING_INCDIR}/bluetooth/$f
-        done
-}

diff --git a/packages/bluez/bluez-libs_2.21.bb b/packages/bluez/bluez-libs_2.21.bb
deleted file mode 100644 (file)
index 997c2ae..0000000
--- a/packages/bluez/bluez-libs_2.21.bb
+++ /dev/null
@@ -1,22 +0,0 @@
-DESCRIPTION = "Linux Bluetooth Stack Userland Libaries."
-SECTION = "libs"
-PRIORITY = "optional"
-HOMEPAGE = "http://www.bluez.org"
-LICENSE = "GPL"
-PR = "r2"
-
-SRC_URI = "http://bluez.sourceforge.net/download/bluez-libs-${PV}.tar.gz"
-
-inherit autotools pkgconfig
-
-HEADERS = "bluetooth.h bnep.h cmtp.h hci.h hci_lib.h hidp.h l2cap.h rfcomm.h sco.h sdp.h sdp_lib.h"
-
-do_stage() {
-        oe_libinstall -a -so -C src libbluetooth ${STAGING_LIBDIR}
-
-        install -d ${STAGING_INCDIR}/bluetooth/
-        for f in ${HEADERS}
-        do
-               install -m 0644 include/$f ${STAGING_INCDIR}/bluetooth/$f
-        done
-}

diff --git a/packages/bluez/bluez-libs_2.24.bb b/packages/bluez/bluez-libs_2.24.bb
deleted file mode 100644 (file)
index d740bd8..0000000
--- a/packages/bluez/bluez-libs_2.24.bb
+++ /dev/null
@@ -1,22 +0,0 @@
-DESCRIPTION = "Linux Bluetooth Stack Userland Libaries."
-SECTION = "libs"
-PRIORITY = "optional"
-HOMEPAGE = "http://www.bluez.org"
-LICENSE = "GPL"
-PR = "r0"
-
-SRC_URI = "http://bluez.sourceforge.net/download/bluez-libs-${PV}.tar.gz"
-
-inherit autotools pkgconfig
-
-HEADERS = "bluetooth.h bnep.h cmtp.h hci.h hci_lib.h hidp.h l2cap.h rfcomm.h sco.h sdp.h sdp_lib.h"
-
-do_stage() {
-        oe_libinstall -a -so -C src libbluetooth ${STAGING_LIBDIR}
-
-        install -d ${STAGING_INCDIR}/bluetooth/
-        for f in ${HEADERS}
-        do
-               install -m 0644 include/$f ${STAGING_INCDIR}/bluetooth/$f
-        done
-}

diff --git a/packages/bluez/bluez-libs_2.25.bb b/packages/bluez/bluez-libs_2.25.bb
deleted file mode 100644 (file)
index d740bd8..0000000
--- a/packages/bluez/bluez-libs_2.25.bb
+++ /dev/null
@@ -1,22 +0,0 @@
-DESCRIPTION = "Linux Bluetooth Stack Userland Libaries."
-SECTION = "libs"
-PRIORITY = "optional"
-HOMEPAGE = "http://www.bluez.org"
-LICENSE = "GPL"
-PR = "r0"
-
-SRC_URI = "http://bluez.sourceforge.net/download/bluez-libs-${PV}.tar.gz"
-
-inherit autotools pkgconfig
-
-HEADERS = "bluetooth.h bnep.h cmtp.h hci.h hci_lib.h hidp.h l2cap.h rfcomm.h sco.h sdp.h sdp_lib.h"
-
-do_stage() {
-        oe_libinstall -a -so -C src libbluetooth ${STAGING_LIBDIR}
-
-        install -d ${STAGING_INCDIR}/bluetooth/
-        for f in ${HEADERS}
-        do
-               install -m 0644 include/$f ${STAGING_INCDIR}/bluetooth/$f
-        done
-}

diff --git a/packages/bluez/bluez-utils-dbus_2.20.bb b/packages/bluez/bluez-utils-dbus_2.20.bb
deleted file mode 100644 (file)
index e76868c..0000000
--- a/packages/bluez/bluez-utils-dbus_2.20.bb
+++ /dev/null
@@ -1,11 +0,0 @@
-require bluez-utils.inc
-
-PR = "r12"
-
-DEPENDS += "dbus"
-SRC_URI += "file://dbus.patch;patch=1 \
-           file://smash.patch;patch=1 \
-           file://hciattach_devlength.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
deleted file mode 100644 (file)
index cd98cfd..0000000
--- a/packages/bluez/bluez-utils-dbus_2.21.bb
+++ /dev/null
@@ -1,10 +0,0 @@
-require bluez-utils.inc
-
-PR = "r6"
-
-DEPENDS += "dbus"
-SRC_URI += "file://dbus.patch;patch=1 \
-           file://smash.patch;patch=1 \
-           file://hciattach_devlength.patch;patch=1 \
-           file://hcid-alignment-fix.patch;patch=1"
-EXTRA_OECONF += "--with-dbus"

diff --git a/packages/bluez/bluez-utils-dbus_2.24.bb b/packages/bluez/bluez-utils-dbus_2.24.bb
deleted file mode 100644 (file)
index 3e4d0d7..0000000
--- a/packages/bluez/bluez-utils-dbus_2.24.bb
+++ /dev/null
@@ -1,7 +0,0 @@
-require bluez-utils.inc
-
-PR = "r3"
-
-DEPENDS += "dbus"
-SRC_URI += "file://dbus-2.24.patch;patch=1"
-EXTRA_OECONF += "--with-dbus"

diff --git a/packages/bluez/bluez-utils-dbus_2.25.bb b/packages/bluez/bluez-utils-dbus_2.25.bb
deleted file mode 100644 (file)
index e4ec42f..0000000
--- a/packages/bluez/bluez-utils-dbus_2.25.bb
+++ /dev/null
@@ -1,8 +0,0 @@
-require bluez-utils.inc
-
-PR = "r2"
-
-DEPENDS += "dbus"
-SRC_URI += "file://dbus-2.24.patch;patch=1 \
-           file://hciattach-ti-bts.patch;patch=1"
-EXTRA_OECONF += "--with-dbus"

diff --git a/packages/bluez/bluez-utils-nodbus_2.20.bb b/packages/bluez/bluez-utils-nodbus_2.20.bb
deleted file mode 100644 (file)
index ebb5667..0000000
--- a/packages/bluez/bluez-utils-nodbus_2.20.bb
+++ /dev/null
@@ -1,7 +0,0 @@
-require bluez-utils.inc
-
-PR = "r4"
-
-SRC_URI += "file://hciattach_devlength.patch;patch=1"
-EXTRA_OECONF += "--without-dbus"
-

diff --git a/packages/bluez/bluez-utils-nodbus_2.21.bb b/packages/bluez/bluez-utils-nodbus_2.21.bb
deleted file mode 100644 (file)
index f1efd35..0000000
--- a/packages/bluez/bluez-utils-nodbus_2.21.bb
+++ /dev/null
@@ -1,6 +0,0 @@
-require bluez-utils.inc
-
-PR = "r4"
-
-SRC_URI += "file://hciattach_devlength.patch;patch=1"
-EXTRA_OECONF += "--without-dbus"

diff --git a/packages/bluez/bluez-utils-nodbus_2.24.bb b/packages/bluez/bluez-utils-nodbus_2.24.bb
deleted file mode 100644 (file)
index e2f4c67..0000000
--- a/packages/bluez/bluez-utils-nodbus_2.24.bb
+++ /dev/null
@@ -1,5 +0,0 @@
-require bluez-utils.inc
-
-PR = "r3"
-
-EXTRA_OECONF += "--without-dbus"

diff --git a/packages/bluez/bluez-utils-nodbus_2.25.bb b/packages/bluez/bluez-utils-nodbus_2.25.bb
deleted file mode 100644 (file)
index e56fab6..0000000
--- a/packages/bluez/bluez-utils-nodbus_2.25.bb
+++ /dev/null
@@ -1,6 +0,0 @@
-require bluez-utils.inc
-
-PR = "r2"
-
-SRC_URI += " file://hciattach-ti-bts.patch;patch=1"
-EXTRA_OECONF += "--without-dbus"