Skip to content

Commit a9ac8df

Browse files
committed
[wpeframework-plugins] bump to latest and correctly select bluez5
1 parent 2643a0e commit a9ac8df

File tree

3 files changed

+37
-33
lines changed

3 files changed

+37
-33
lines changed

package/wpe/wpeframework-plugins/Config.in

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -309,7 +309,6 @@ config BR2_PACKAGE_WPEFRAMEWORK_BLUETOOTH
309309
bool "Bluetooth"
310310
select BR2_PACKAGE_WPEFRAMEWORK_PLUGINS
311311
select BR2_PACKAGE_BLUEZ5_UTILS
312-
select BR2_PACKAGE_BLUEZ_ALSA
313312
default n
314313
help
315314
A Bluetooth plugin to interact with Bluetooth devices.

package/wpe/wpeframework-plugins/S35WPEFrameworkBluetooth

Lines changed: 35 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -1,39 +1,43 @@
11
#!/bin/sh
22

33
start() {
4-
echo -n "Running bluetooth startup script"
5-
if [ -f /usr/bin/hciattach ]; then
6-
echo -n "Flashing Blutooth firmware"
7-
/usr/bin/hciattach /dev/ttyAMA0 bcm43xx 921600 noflow
8-
if [ ! -d "/sys/class/bluetooth/hci0" ]; then
9-
sleep 3
10-
/usr/bin/hciattach /dev/ttyAMA0 bcm43xx 921600 noflow
11-
[ $? == 0 ] && echo "OK" || echo "FAIL"
12-
else
13-
echo "OK"
14-
fi
15-
fi
16-
17-
if [ -f /usr/libexec/bluetooth/bluetoothd ]; then
18-
echo -n "Starting bluetoothd daemon"
19-
/usr/libexec/bluetooth/bluetoothd &
20-
[ $? == 0 ] && echo "OK" || echo "FAIL"
21-
fi
22-
23-
if [ -f /usr/bin/bluealsa ]; then
24-
echo -n "Starting bluealsa daemon"
25-
/usr/bin/bluealsa &
26-
[ $? == 0 ] && echo "OK" || echo "FAIL"
27-
fi
4+
if [ -f /usr/bin/hciattach ]; then
5+
echo -n "Flashing Blutooth firmware"
6+
/usr/bin/hciattach /dev/ttyAMA0 bcm43xx 921600 noflow
7+
if [ ! -d "/sys/class/bluetooth/hci0" ]; then
8+
sleep 3
9+
/usr/bin/hciattach /dev/ttyAMA0 bcm43xx 921600 noflow
10+
[ $? == 0 ] && echo "OK" || echo "FAIL"
11+
else
12+
echo "OK"
13+
fi
14+
fi
15+
if [ -f /usr/libexec/bluetooth/bluetoothd ]; then
16+
echo -n "Starting bluetoothd daemon"
17+
/usr/libexec/bluetooth/bluetoothd &
18+
[ $? == 0 ] && echo "OK" || echo "FAIL"
19+
fi
20+
if [ -f /usr/bin/bluealsa ]; then
21+
echo -n "Starting bluealsa daemon"
22+
/usr/bin/bluealsa &
23+
[ $? == 0 ] && echo "OK" || echo "FAIL"
24+
fi
2825
}
2926
stop() {
30-
echo -n "Stopping bluetoothd daemon"
31-
killall -9 bluetoothd
32-
[ $? == 0 ] && echo "OK" || echo "FAIL"
33-
34-
echo -n "Stopping bluealsa daemon"
35-
killall -9 bluealsa
36-
[ $? == 0 ] && echo "OK" || echo "FAIL"
27+
if [ -f /usr/libexec/bluetooth/bluetoothd ]; then
28+
echo -n "Stopping bluetoothd daemon"
29+
killall -9 bluetoothd
30+
[ $? == 0 ] && echo "OK" || echo "FAIL"
31+
fi
32+
if [ -f /usr/bin/bluealsa ]; then
33+
echo -n "Stopping bluealsa daemon"
34+
killall -9 bluealsa
35+
[ $? == 0 ] && echo "OK" || echo "FAIL"
36+
fi
37+
if [ -f /usr/bin/hciattach ]; then
38+
echo -n "Stopping hci0 bluetooth interface"
39+
/usr/bin/hciconfig hci0 down
40+
fi
3741
}
3842
restart() {
3943
stop

package/wpe/wpeframework-plugins/wpeframework-plugins.mk

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
#
55
################################################################################
66

7-
WPEFRAMEWORK_PLUGINS_VERSION = ad0aa66414808c3f98564901538fc485479e0f39
7+
WPEFRAMEWORK_PLUGINS_VERSION = 11594a2e00f457503d422e3358b6db1ce3307e1a
88
WPEFRAMEWORK_PLUGINS_SITE = $(call github,WebPlatformForEmbedded,WPEFrameworkPlugins,$(WPEFRAMEWORK_PLUGINS_VERSION))
99
WPEFRAMEWORK_PLUGINS_INSTALL_STAGING = YES
1010
WPEFRAMEWORK_PLUGINS_DEPENDENCIES = wpeframework libpng
@@ -139,6 +139,7 @@ ifeq ($(BR2_PACKAGE_WPEFRAMEWORK_BLUETOOTH),y)
139139
WPEFRAMEWORK_PLUGINS_CONF_OPTS += -DPLUGIN_BLUETOOTH=ON
140140
WPEFRAMEWORK_PLUGINS_CONF_OPTS += -DPLUGIN_BLUETOOTH_AUTOSTART=true
141141
WPEFRAMEWORK_PLUGINS_CONF_OPTS += -DPLUGIN_BLUETOOTH_OOP=true
142+
WPEFRAMEWORK_PLUGINS_DEPENDENCIES += bluez5_utils
142143
ifeq ($(BR2_PACKAGE_RPI_FIRMWARE),y)
143144
WPEFRAMEWORK_PLUGINS_POST_INSTALL_TARGET_HOOKS += WPEFRAMEWORK_BLUETOOTH_POST_TARGET_INITD
144145
define WPEFRAMEWORK_BLUETOOTH_POST_TARGET_INITD

0 commit comments

Comments
 (0)