Remove bluez5 recipe
This recipes is not needed anymore. It was created to upgrade bluez for an older yocto version but is now a downgrade
This commit is contained in:
Alexandre Bard
Gogs
parent
cdd1681cd8
commit
92e3a24caa
|
|
@ -1,104 +0,0 @@
|
||||||
SUMMARY = "Linux Bluetooth Stack Userland V5"
|
|
||||||
DESCRIPTION = "Linux Bluetooth stack V5 userland components. These include a system configurations, daemons, tools and system libraries."
|
|
||||||
HOMEPAGE = "http://www.bluez.org"
|
|
||||||
SECTION = "libs"
|
|
||||||
LICENSE = "GPLv2+ & LGPLv2.1+"
|
|
||||||
LIC_FILES_CHKSUM = "file://COPYING;md5=12f884d2ae1ff87c09e5b7ccc2c4ca7e \
|
|
||||||
file://COPYING.LIB;md5=fb504b67c50331fc78734fed90fb0e09 \
|
|
||||||
file://src/main.c;beginline=1;endline=24;md5=9bc54b93cd7e17bf03f52513f39f926e"
|
|
||||||
DEPENDS = "udev libusb dbus-glib glib-2.0 libcheck readline"
|
|
||||||
PROVIDES += "bluez-hcidump"
|
|
||||||
RPROVIDES_${PN} += "bluez-hcidump"
|
|
||||||
|
|
||||||
RCONFLICTS_${PN} = "bluez4"
|
|
||||||
|
|
||||||
PACKAGECONFIG ??= "obex-profiles"
|
|
||||||
PACKAGECONFIG[obex-profiles] = "--enable-obex,--disable-obex,libical"
|
|
||||||
PACKAGECONFIG[experimental] = "--enable-experimental,--disable-experimental,"
|
|
||||||
|
|
||||||
SRC_URI = "\
|
|
||||||
${KERNELORG_MIRROR}/linux/bluetooth/bluez-${PV}.tar.xz \
|
|
||||||
"
|
|
||||||
S = "${WORKDIR}/bluez-${PV}"
|
|
||||||
|
|
||||||
inherit autotools-brokensep pkgconfig systemd
|
|
||||||
|
|
||||||
EXTRA_OECONF = "\
|
|
||||||
--enable-tools \
|
|
||||||
--disable-cups \
|
|
||||||
--enable-test \
|
|
||||||
--enable-datafiles \
|
|
||||||
${@bb.utils.contains('DISTRO_FEATURES', 'systemd', '--enable-systemd', '--disable-systemd', d)} \
|
|
||||||
--enable-library \
|
|
||||||
"
|
|
||||||
|
|
||||||
# bluez5 builds a large number of useful utilities but does not
|
|
||||||
# install them. Specify which ones we want put into ${PN}-noinst-tools.
|
|
||||||
NOINST_TOOLS_READLINE ??= ""
|
|
||||||
NOINST_TOOLS_EXPERIMENTAL ??= ""
|
|
||||||
NOINST_TOOLS = " \
|
|
||||||
${NOINST_TOOLS_READLINE} \
|
|
||||||
${@bb.utils.contains('PACKAGECONFIG', 'experimental', '${NOINST_TOOLS_EXPERIMENTAL}', '', d)} \
|
|
||||||
"
|
|
||||||
|
|
||||||
do_install_append() {
|
|
||||||
install -d ${D}${sysconfdir}/bluetooth/
|
|
||||||
if [ -f ${S}/profiles/audio/audio.conf ]; then
|
|
||||||
install -m 0644 ${S}/profiles/audio/audio.conf ${D}/${sysconfdir}/bluetooth/
|
|
||||||
fi
|
|
||||||
if [ -f ${S}/profiles/network/network.conf ]; then
|
|
||||||
install -m 0644 ${S}/profiles/network/network.conf ${D}/${sysconfdir}/bluetooth/
|
|
||||||
fi
|
|
||||||
if [ -f ${S}/profiles/input/input.conf ]; then
|
|
||||||
install -m 0644 ${S}/profiles/input/input.conf ${D}/${sysconfdir}/bluetooth/
|
|
||||||
fi
|
|
||||||
|
|
||||||
install -m 0644 ${S}/src/bluetooth.conf ${D}/${sysconfdir}/dbus-1/system.d/
|
|
||||||
|
|
||||||
# Install desired tools that upstream leaves in build area
|
|
||||||
for f in ${NOINST_TOOLS} ; do
|
|
||||||
install -m 755 ${B}/$f ${D}/${bindir}
|
|
||||||
done
|
|
||||||
}
|
|
||||||
|
|
||||||
ALLOW_EMPTY_libasound-module-bluez = "1"
|
|
||||||
PACKAGES =+ "libasound-module-bluez ${PN}-testtools ${PN}-obex ${PN}-noinst-tools"
|
|
||||||
|
|
||||||
FILES_libasound-module-bluez = "${libdir}/alsa-lib/lib*.so ${datadir}/alsa"
|
|
||||||
FILES_${PN} += "${libdir}/bluetooth/plugins/*.so ${base_libdir}/udev/ ${nonarch_base_libdir}/udev/ ${systemd_unitdir}/ ${datadir}/dbus-1"
|
|
||||||
FILES_${PN}-dev += "\
|
|
||||||
${libdir}/bluetooth/plugins/*.la \
|
|
||||||
${libdir}/alsa-lib/*.la \
|
|
||||||
"
|
|
||||||
|
|
||||||
FILES_${PN}-obex = "${libexecdir}/bluetooth/obexd \
|
|
||||||
${exec_prefix}/lib/systemd/user/obex.service \
|
|
||||||
${datadir}/dbus-1/services/org.bluez.obex.service \
|
|
||||||
"
|
|
||||||
SYSTEMD_SERVICE_${PN}-obex = "obex.service"
|
|
||||||
|
|
||||||
FILES_${PN}-testtools = "${libdir}/bluez/test/*"
|
|
||||||
|
|
||||||
def get_noinst_tools_paths (d, bb, tools):
|
|
||||||
s = list()
|
|
||||||
bindir = d.getVar("bindir", True)
|
|
||||||
for bdp in tools.split():
|
|
||||||
f = os.path.basename(bdp)
|
|
||||||
s.append("%s/%s" % (bindir, f))
|
|
||||||
return "\n".join(s)
|
|
||||||
|
|
||||||
FILES_${PN}-noinst-tools = "${@get_noinst_tools_paths(d, bb, d.getVar('NOINST_TOOLS', True))}"
|
|
||||||
|
|
||||||
FILES_${PN}-dbg += "\
|
|
||||||
${libexecdir}/bluetooth/.debug \
|
|
||||||
${libdir}/bluetooth/plugins/.debug \
|
|
||||||
${libdir}/*/.debug \
|
|
||||||
*/udev/.debug \
|
|
||||||
*/*/udev/.debug \
|
|
||||||
"
|
|
||||||
|
|
||||||
RDEPENDS_${PN}-testtools += "python python-dbus python-pygobject"
|
|
||||||
|
|
||||||
SYSTEMD_SERVICE_${PN} = "bluetooth.service"
|
|
||||||
|
|
||||||
EXCLUDE_FROM_WORLD = "1"
|
|
||||||
|
|
@ -1,26 +0,0 @@
|
||||||
From 9e009647b14e810e06626dde7f1bb9ea3c375d09 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Luiz Augusto von Dentz <luiz.von.dentz@intel.com>
|
|
||||||
Date: Wed, 13 Sep 2017 10:01:40 +0300
|
|
||||||
Subject: sdp: Fix Out-of-bounds heap read in service_search_attr_req function
|
|
||||||
|
|
||||||
Check if there is enough data to continue otherwise return an error.
|
|
||||||
---
|
|
||||||
src/sdpd-request.c | 2 +-
|
|
||||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
||||||
|
|
||||||
diff --git a/src/sdpd-request.c b/src/sdpd-request.c
|
|
||||||
index 1eefdce..318d044 100644
|
|
||||||
--- a/src/sdpd-request.c
|
|
||||||
+++ b/src/sdpd-request.c
|
|
||||||
@@ -917,7 +917,7 @@ static int service_search_attr_req(sdp_req_t *req, sdp_buf_t *buf)
|
|
||||||
} else {
|
|
||||||
/* continuation State exists -> get from cache */
|
|
||||||
sdp_buf_t *pCache = sdp_get_cached_rsp(cstate);
|
|
||||||
- if (pCache) {
|
|
||||||
+ if (pCache && cstate->cStateValue.maxBytesSent < pCache->data_size) {
|
|
||||||
uint16_t sent = MIN(max, pCache->data_size - cstate->cStateValue.maxBytesSent);
|
|
||||||
pResponse = pCache->data;
|
|
||||||
memcpy(buf->data, pResponse + cstate->cStateValue.maxBytesSent, sent);
|
|
||||||
--
|
|
||||||
cgit v1.1
|
|
||||||
|
|
||||||
|
|
@ -1,58 +0,0 @@
|
||||||
require bluez5.inc
|
|
||||||
SRC_URI[md5sum] = "94273617129ced06612fcb9f5273d14c"
|
|
||||||
SRC_URI[sha256sum] = "0c321e291f8b45e6a78e379dfe80592b65955a0f0ab191f1cca0edd8ec356c85"
|
|
||||||
|
|
||||||
EXTRA_OECONF += "--enable-deprecated"
|
|
||||||
|
|
||||||
SRC_URI_append = " file://fix-out-of-bounds-heap-read.patch"
|
|
||||||
|
|
||||||
PR = "r2"
|
|
||||||
|
|
||||||
# noinst programs in Makefile.tools that are conditional on READLINE
|
|
||||||
# support
|
|
||||||
NOINST_TOOLS_READLINE ?= " \
|
|
||||||
attrib/gatttool \
|
|
||||||
tools/obex-client-tool \
|
|
||||||
tools/obex-server-tool \
|
|
||||||
tools/bluetooth-player \
|
|
||||||
tools/obexctl \
|
|
||||||
"
|
|
||||||
|
|
||||||
# noinst programs in Makefile.tools that are conditional on EXPERIMENTAL
|
|
||||||
# support
|
|
||||||
NOINST_TOOLS_EXPERIMENTAL ?= " \
|
|
||||||
emulator/btvirt \
|
|
||||||
emulator/b1ee \
|
|
||||||
emulator/hfp \
|
|
||||||
tools/3dsp \
|
|
||||||
tools/mgmt-tester \
|
|
||||||
tools/gap-tester \
|
|
||||||
tools/l2cap-tester \
|
|
||||||
tools/sco-tester \
|
|
||||||
tools/smp-tester \
|
|
||||||
tools/hci-tester \
|
|
||||||
tools/rfcomm-tester \
|
|
||||||
tools/bdaddr \
|
|
||||||
tools/avinfo \
|
|
||||||
tools/avtest \
|
|
||||||
tools/scotest \
|
|
||||||
tools/amptest \
|
|
||||||
tools/hwdb \
|
|
||||||
tools/hcieventmask \
|
|
||||||
tools/hcisecfilter \
|
|
||||||
tools/btmgmt \
|
|
||||||
tools/btinfo \
|
|
||||||
tools/btattach \
|
|
||||||
tools/btsnoop \
|
|
||||||
tools/btproxy \
|
|
||||||
tools/btiotest \
|
|
||||||
tools/mcaptest \
|
|
||||||
tools/cltest \
|
|
||||||
tools/oobtest \
|
|
||||||
tools/seq2bseq \
|
|
||||||
tools/ibeacon \
|
|
||||||
tools/btgatt-client \
|
|
||||||
tools/btgatt-server \
|
|
||||||
tools/gatt-service \
|
|
||||||
profiles/iap/iapd \
|
|
||||||
"
|
|
||||||
Loading…
Reference in New Issue