This commit is contained in:
parent
41d8293030
commit
9c161c75f1
@ -8,11 +8,11 @@ Subject: [PATCH] bcm43xx: The UART speed must be reset after the firmware
|
|||||||
tools/hciattach_bcm43xx.c | 6 ++----
|
tools/hciattach_bcm43xx.c | 6 ++----
|
||||||
1 file changed, 2 insertions(+), 4 deletions(-)
|
1 file changed, 2 insertions(+), 4 deletions(-)
|
||||||
|
|
||||||
Index: bluez-5.60/tools/hciattach_bcm43xx.c
|
Index: bluez-5.71/tools/hciattach_bcm43xx.c
|
||||||
===================================================================
|
===================================================================
|
||||||
--- bluez-5.60.orig/tools/hciattach_bcm43xx.c
|
--- bluez-5.71.orig/tools/hciattach_bcm43xx.c
|
||||||
+++ bluez-5.60/tools/hciattach_bcm43xx.c
|
+++ bluez-5.71/tools/hciattach_bcm43xx.c
|
||||||
@@ -354,11 +354,8 @@ int bcm43xx_init(int fd, int def_speed,
|
@@ -350,11 +350,8 @@ int bcm43xx_init(int fd, int def_speed,
|
||||||
return -1;
|
return -1;
|
||||||
|
|
||||||
if (bcm43xx_locate_patch(FIRMWARE_DIR, chip_name, fw_path)) {
|
if (bcm43xx_locate_patch(FIRMWARE_DIR, chip_name, fw_path)) {
|
||||||
@ -25,7 +25,7 @@ Index: bluez-5.60/tools/hciattach_bcm43xx.c
|
|||||||
if (bcm43xx_load_firmware(fd, fw_path))
|
if (bcm43xx_load_firmware(fd, fw_path))
|
||||||
return -1;
|
return -1;
|
||||||
|
|
||||||
@@ -368,6 +365,7 @@ int bcm43xx_init(int fd, int def_speed,
|
@@ -364,6 +361,7 @@ int bcm43xx_init(int fd, int def_speed,
|
||||||
return -1;
|
return -1;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -1,8 +1,8 @@
|
|||||||
Index: bluez-5.65/Makefile.in
|
Index: bluez-5.71/Makefile.in
|
||||||
===================================================================
|
===================================================================
|
||||||
--- bluez-5.65.orig/Makefile.in
|
--- bluez-5.71.orig/Makefile.in
|
||||||
+++ bluez-5.65/Makefile.in
|
+++ bluez-5.71/Makefile.in
|
||||||
@@ -3871,7 +3871,7 @@ unit_tests = $(am__append_55) unit/test-
|
@@ -4179,7 +4179,7 @@ unit_tests = $(am__append_68) unit/test-
|
||||||
@DEPRECATED_TRUE@@READLINE_TRUE@attrib_gatttool_LDADD = lib/libbluetooth-internal.la \
|
@DEPRECATED_TRUE@@READLINE_TRUE@attrib_gatttool_LDADD = lib/libbluetooth-internal.la \
|
||||||
@DEPRECATED_TRUE@@READLINE_TRUE@ src/libshared-glib.la $(GLIB_LIBS) -lreadline
|
@DEPRECATED_TRUE@@READLINE_TRUE@ src/libshared-glib.la $(GLIB_LIBS) -lreadline
|
||||||
|
|
||||||
@ -11,11 +11,11 @@ Index: bluez-5.65/Makefile.in
|
|||||||
@CUPS_TRUE@profiles_cups_bluetooth_SOURCES = profiles/cups/main.c \
|
@CUPS_TRUE@profiles_cups_bluetooth_SOURCES = profiles/cups/main.c \
|
||||||
@CUPS_TRUE@ profiles/cups/cups.h \
|
@CUPS_TRUE@ profiles/cups/cups.h \
|
||||||
@CUPS_TRUE@ profiles/cups/sdp.c \
|
@CUPS_TRUE@ profiles/cups/sdp.c \
|
||||||
Index: bluez-5.65/Makefile.tools
|
Index: bluez-5.71/Makefile.tools
|
||||||
===================================================================
|
===================================================================
|
||||||
--- bluez-5.65.orig/Makefile.tools
|
--- bluez-5.71.orig/Makefile.tools
|
||||||
+++ bluez-5.65/Makefile.tools
|
+++ bluez-5.71/Makefile.tools
|
||||||
@@ -499,7 +499,7 @@ endif
|
@@ -541,7 +541,7 @@ endif
|
||||||
endif
|
endif
|
||||||
|
|
||||||
if CUPS
|
if CUPS
|
||||||
|
@ -1,8 +1,17 @@
|
|||||||
Index: bluez-5.65/Makefile.am
|
Index: bluez-5.71/Makefile.am
|
||||||
===================================================================
|
===================================================================
|
||||||
--- bluez-5.65.orig/Makefile.am
|
--- bluez-5.71.orig/Makefile.am
|
||||||
+++ bluez-5.65/Makefile.am
|
+++ bluez-5.71/Makefile.am
|
||||||
@@ -572,7 +574,7 @@ unit_test_midi_LDADD = src/libshared-gli
|
@@ -679,7 +679,7 @@ unit_test_bass_SOURCES = unit/test-bass.
|
||||||
|
unit_test_bass_LDADD = src/libshared-glib.la \
|
||||||
|
lib/libbluetooth-internal.la $(GLIB_LIBS)
|
||||||
|
|
||||||
|
-unit_tests += unit/test-vcp
|
||||||
|
+# unit_tests += unit/test-vcp
|
||||||
|
|
||||||
|
unit_test_vcp_SOURCES = unit/test-vcp.c $(btio_sources)
|
||||||
|
unit_test_vcp_LDADD = src/libshared-glib.la \
|
||||||
|
@@ -696,7 +696,7 @@ unit_test_midi_LDADD = src/libshared-gli
|
||||||
endif
|
endif
|
||||||
|
|
||||||
if MESH
|
if MESH
|
||||||
|
@ -414,6 +414,14 @@ done
|
|||||||
%{_mandir}/man1/rctest.1%{?ext_man}
|
%{_mandir}/man1/rctest.1%{?ext_man}
|
||||||
%{_mandir}/man1/bluetoothctl-mgmt.1%{?ext_man}
|
%{_mandir}/man1/bluetoothctl-mgmt.1%{?ext_man}
|
||||||
%{_mandir}/man1/bluetoothctl-monitor.1%{?ext_man}
|
%{_mandir}/man1/bluetoothctl-monitor.1%{?ext_man}
|
||||||
|
%{_mandir}/man1/bluetoothctl-admin.1%{?ext_man}
|
||||||
|
%{_mandir}/man1/bluetoothctl-advertise.1%{?ext_man}
|
||||||
|
%{_mandir}/man1/bluetoothctl-endpoint.1%{?ext_man}
|
||||||
|
%{_mandir}/man1/bluetoothctl-gatt.1%{?ext_man}
|
||||||
|
%{_mandir}/man1/bluetoothctl-player.1%{?ext_man}
|
||||||
|
%{_mandir}/man1/bluetoothctl-scan.1%{?ext_man}
|
||||||
|
%{_mandir}/man1/bluetoothctl-transport.1%{?ext_man}
|
||||||
|
%{_mandir}/man5/org.bluez.*.5%{?ext_man}
|
||||||
%{_mandir}/man1/btmgmt.1%{?ext_man}
|
%{_mandir}/man1/btmgmt.1%{?ext_man}
|
||||||
%{_datadir}/dbus-1/system.d/bluetooth.conf
|
%{_datadir}/dbus-1/system.d/bluetooth.conf
|
||||||
# not packaged, boo#1151518
|
# not packaged, boo#1151518
|
||||||
|
@ -11,11 +11,11 @@ Signed-off-by: Michel Normand <normand@linux.vnet.ibm.com>
|
|||||||
Makefile.am | 4 ++--
|
Makefile.am | 4 ++--
|
||||||
1 file changed, 2 insertions(+), 2 deletions(-)
|
1 file changed, 2 insertions(+), 2 deletions(-)
|
||||||
|
|
||||||
Index: bluez-5.65/Makefile.am
|
Index: bluez-5.71/Makefile.am
|
||||||
===================================================================
|
===================================================================
|
||||||
--- bluez-5.65.orig/Makefile.am
|
--- bluez-5.71.orig/Makefile.am
|
||||||
+++ bluez-5.65/Makefile.am
|
+++ bluez-5.71/Makefile.am
|
||||||
@@ -502,8 +502,8 @@ unit_test_gdbus_client_LDADD = gdbus/lib
|
@@ -602,8 +602,8 @@ unit_test_gdbus_client_LDADD = gdbus/lib
|
||||||
src/libshared-glib.la $(GLIB_LIBS) $(DBUS_LIBS)
|
src/libshared-glib.la $(GLIB_LIBS) $(DBUS_LIBS)
|
||||||
|
|
||||||
if OBEX
|
if OBEX
|
||||||
|
Loading…
Reference in New Issue
Block a user