rpi/domo
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Bump buidlroot version to 2018.02.6

Browse Source
This commit is contained in:
jbnadal
2018-10-22 14:55:59 +02:00
parent 222960cedb
commit bec94fdb63
6150 changed files with 84803 additions and 117446 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
bsp/buildroot/package/bluez5_utils/0002-bt_shell-APIs-shall-only-be-build-if-readline-is-pre.patch Normal file
View File

@@ -0,0 +1,32 @@
From 654444dd8faf02b46f41d81f3d9c623d57bdd399 Mon Sep 17 00:00:00 2001
From: Luiz Augusto von Dentz <luiz.von.dentz@intel.com>
Date: Fri, 20 Apr 2018 16:04:17 +0200
Subject: [PATCH] bt_shell APIs shall only be build if readline is present on
the system since it currently depend on it.
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Upstream-status: https://marc.info/?l=linux-bluetooth&m=152422938306592&w=2
---
Makefile.am | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/Makefile.am b/Makefile.am
index daf34b6ca..9c3c17139 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -119,7 +119,11 @@ shared_sources = src/shared/io.h src/shared/timeout.h \
src/shared/gatt-server.h src/shared/gatt-server.c \
src/shared/gatt-db.h src/shared/gatt-db.c \
src/shared/gap.h src/shared/gap.c \
- src/shared/tty.h src/shared/shell.c src/shared/shell.h
+ src/shared/tty.h
+
+if READLINE
+shared_sources += src/shared/shell.c src/shared/shell.h
+endif
src_libshared_glib_la_SOURCES = $(shared_sources) \
src/shared/io-glib.c \
--
2.14.3

29
bsp/buildroot/package/bluez5_utils/0002-sdp-Fix-Out-of-bounds-heap-read-in-service_search_at.patch
View File

@@ -1,29 +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: [PATCH] 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.
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
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 1eefdce1a..318d04467 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);
--
2.11.0

49
bsp/buildroot/package/bluez5_utils/Config.in
View File

@@ -29,8 +29,8 @@ if BR2_PACKAGE_BLUEZ5_UTILS
config BR2_PACKAGE_BLUEZ5_UTILS_OBEX
bool "build OBEX support"
select BR2_PACKAGE_LIBICAL
depends on BR2_INSTALL_LIBSTDCPP
select BR2_PACKAGE_LIBICAL
help
Enable the OBEX support in Bluez 5.x.
@@ -39,36 +39,51 @@ comment "OBEX support needs a toolchain w/ C++"
config BR2_PACKAGE_BLUEZ5_UTILS_CLIENT
bool "build CLI client"
# wordexp support not in our uClibc configuration
depends on !BR2_TOOLCHAIN_USES_UCLIBC
select BR2_PACKAGE_READLINE
help
Enable the Bluez 5.x command line client.
comment "bluez5-utils client needs a glibc or musl toolchain"
depends on BR2_TOOLCHAIN_USES_UCLIBC
config BR2_PACKAGE_BLUEZ5_UTILS_GATTTOOL
bool "install GATT tool"
config BR2_PACKAGE_BLUEZ5_UTILS_DEPRECATED
bool "install deprecated tool"
depends on BR2_PACKAGE_BLUEZ5_UTILS_CLIENT
help
Generic Attribute Profile (GATT) support. This provides
profile discovery and description services for Bluetooth Low
Energy. This will install the gatttool utility.
It is always built with BlueZ 5.x, but upstream choose not
to install it by default.
Build BlueZ 5.x deprecated tools. These currently include:
hciattach, hciconfig, hcitool, hcidump, rfcomm, sdptool,
ciptool, gatttool.
config BR2_PACKAGE_BLUEZ5_UTILS_EXPERIMENTAL
bool "build experimental plugins"
bool "build experimental obexd plugin"
help
Build BlueZ 5.x experimental plugins (SAP, NFC, ...).
Build BlueZ 5.x experimental Nokia OBEX PC Suite plugin
config BR2_PACKAGE_BLUEZ5_PLUGINS_HEALTH
bool "build health plugin"
help
Build BlueZ 5.x health plugin
config BR2_PACKAGE_BLUEZ5_PLUGINS_MIDI
bool "build midi profile"
select BR2_PACKAGE_ALSA_LIB
select BR2_PACKAGE_ALSA_LIB_SEQ
help
Build BlueZ 5.x midi plugin
config BR2_PACKAGE_BLUEZ5_PLUGINS_NFC
bool "build nfc plugin"
help
Build BlueZ 5.x nfc plugin
config BR2_PACKAGE_BLUEZ5_PLUGINS_SAP
bool "build sap plugin"
help
Build BlueZ 5.x sap plugin
config BR2_PACKAGE_BLUEZ5_PLUGINS_SIXAXIS
bool "build sixaxis plugin"
depends on BR2_PACKAGE_HAS_UDEV
help
Build BlueZ 5.x sixaxis plugin (support Sony Dualshock controller)
Build BlueZ 5.x sixaxis plugin (support Sony Dualshock
controller)
comment "sixaxis plugin needs udev /dev management"
depends on !BR2_PACKAGE_HAS_UDEV

2
bsp/buildroot/package/bluez5_utils/bluez5_utils.hash
View File

@@ -1,2 +1,2 @@
# From https://www.kernel.org/pub/linux/bluetooth/sha256sums.asc:
sha256 16c9c05d2a1da644ce3570d975ada3643d2e60c007a955bac09c0a0efeb58d15 bluez-5.43.tar.xz
sha256 b9a8723072ef66bae7ec301c774902ebcb444c9c5b149b5a199e60a1ba970e90 bluez-5.48.tar.xz

52
bsp/buildroot/package/bluez5_utils/bluez5_utils.mk
View File

@@ -4,17 +4,19 @@
#
################################################################################
BLUEZ5_UTILS_VERSION = 5.43
BLUEZ5_UTILS_VERSION = 5.48
BLUEZ5_UTILS_SOURCE = bluez-$(BLUEZ5_UTILS_VERSION).tar.xz
BLUEZ5_UTILS_SITE = $(BR2_KERNEL_MIRROR)/linux/bluetooth
BLUEZ5_UTILS_INSTALL_STAGING = YES
BLUEZ5_UTILS_DEPENDENCIES = dbus libglib2
BLUEZ5_UTILS_LICENSE = GPLv2+, LGPLv2.1+
BLUEZ5_UTILS_LICENSE = GPL-2.0+, LGPL-2.1+
BLUEZ5_UTILS_LICENSE_FILES = COPYING COPYING.LIB
# 0001-bt_shell-APIs-shall-only-be-build-if-readline-is-pre.patch
BLUEZ5_UTILS_AUTORECONF = YES
BLUEZ5_UTILS_CONF_OPTS = \
--enable-tools \
--enable-library \
BLUEZ5_UTILS_CONF_OPTS = \
--enable-tools \
--enable-library \
--disable-cups
ifeq ($(BR2_PACKAGE_BLUEZ5_UTILS_OBEX),y)
@@ -38,6 +40,35 @@ else
BLUEZ5_UTILS_CONF_OPTS += --disable-experimental
endif
# enable health plugin
ifeq ($(BR2_PACKAGE_BLUEZ5_PLUGINS_HEALTH),y)
BLUEZ5_UTILS_CONF_OPTS += --enable-health
else
BLUEZ5_UTILS_CONF_OPTS += --disable-health
endif
# enable midi profile
ifeq ($(BR2_PACKAGE_BLUEZ5_PLUGINS_MIDI),y)
BLUEZ5_UTILS_CONF_OPTS += --enable-midi
BLUEZ5_UTILS_DEPENDENCIES += alsa-lib
else
BLUEZ5_UTILS_CONF_OPTS += --disable-midi
endif
# enable nfc plugin
ifeq ($(BR2_PACKAGE_BLUEZ5_PLUGINS_NFC),y)
BLUEZ5_UTILS_CONF_OPTS += --enable-nfc
else
BLUEZ5_UTILS_CONF_OPTS += --disable-nfc
endif
# enable sap plugin
ifeq ($(BR2_PACKAGE_BLUEZ5_PLUGINS_SAP),y)
BLUEZ5_UTILS_CONF_OPTS += --enable-sap
else
BLUEZ5_UTILS_CONF_OPTS += --disable-sap
endif
# enable sixaxis plugin
ifeq ($(BR2_PACKAGE_BLUEZ5_PLUGINS_SIXAXIS),y)
BLUEZ5_UTILS_CONF_OPTS += --enable-sixaxis
@@ -46,11 +77,18 @@ BLUEZ5_UTILS_CONF_OPTS += --disable-sixaxis
endif
# install gatttool (For some reason upstream choose not to do it by default)
ifeq ($(BR2_PACKAGE_BLUEZ5_UTILS_GATTTOOL),y)
ifeq ($(BR2_PACKAGE_BLUEZ5_UTILS_DEPRECATED),y)
define BLUEZ5_UTILS_INSTALL_GATTTOOL
$(INSTALL) -D -m 0755 $(@D)/attrib/gatttool $(TARGET_DIR)/usr/bin/gatttool
endef
BLUEZ5_UTILS_POST_INSTALL_TARGET_HOOKS += BLUEZ5_UTILS_INSTALL_GATTTOOL
# hciattach_bcm43xx defines default firmware path in `/etc/firmware`, but
# Broadcom firmware blobs are usually located in `/lib/firmware`.
BLUEZ5_UTILS_CONF_ENV += \
CPPFLAGS='$(TARGET_CPPFLAGS) -DFIRMWARE_DIR=\"/lib/firmware\"'
BLUEZ5_UTILS_CONF_OPTS += --enable-deprecated
else
BLUEZ5_UTILS_CONF_OPTS += --disable-deprecated
endif
# enable test
@@ -80,7 +118,7 @@ define BLUEZ5_UTILS_INSTALL_INIT_SYSTEMD
mkdir -p $(TARGET_DIR)/etc/systemd/system/bluetooth.target.wants
ln -fs ../../../../usr/lib/systemd/system/bluetooth.service \
$(TARGET_DIR)/etc/systemd/system/bluetooth.target.wants/bluetooth.service
ln -fs ../../../../usr/lib/systemd/system/bluetooth.service \
ln -fs ../../../usr/lib/systemd/system/bluetooth.service \
$(TARGET_DIR)/etc/systemd/system/dbus-org.bluez.service
endef