diff options
-rw-r--r-- | recipes-connectivity/pi-bluetooth/pi-bluetooth/0001-bthelper-correct-path-for-hciconfig-under-Yocto.patch | 13 | ||||
-rw-r--r-- | recipes-connectivity/pi-bluetooth/pi-bluetooth_0.1.12.bb (renamed from recipes-connectivity/pi-bluetooth/pi-bluetooth_git.bb) | 3 |
2 files changed, 7 insertions, 9 deletions
diff --git a/recipes-connectivity/pi-bluetooth/pi-bluetooth/0001-bthelper-correct-path-for-hciconfig-under-Yocto.patch b/recipes-connectivity/pi-bluetooth/pi-bluetooth/0001-bthelper-correct-path-for-hciconfig-under-Yocto.patch index 4583905..45b43c7 100644 --- a/recipes-connectivity/pi-bluetooth/pi-bluetooth/0001-bthelper-correct-path-for-hciconfig-under-Yocto.patch +++ b/recipes-connectivity/pi-bluetooth/pi-bluetooth/0001-bthelper-correct-path-for-hciconfig-under-Yocto.patch | |||
@@ -1,16 +1,18 @@ | |||
1 | From af91c96951a11f81f5cea88a0010161592c89310 Mon Sep 17 00:00:00 2001 | 1 | From a73bbed89fb049ac424c211629935b26013e2573 Mon Sep 17 00:00:00 2001 |
2 | From: "Peter A. Bigot" <pab@pabigot.com> | 2 | From: "Peter A. Bigot" <pab@pabigot.com> |
3 | Date: Wed, 14 Nov 2018 09:19:51 -0600 | 3 | Date: Wed, 14 Nov 2018 09:19:51 -0600 |
4 | Subject: [PATCH] bthelper: correct path for hciconfig under Yocto | 4 | Subject: [PATCH] bthelper: correct path for hciconfig under Yocto |
5 | 5 | ||
6 | Upstream-Status: Inapproprate [OE-specific] | 6 | Upstream-Status: Inapproprate [OE-specific] |
7 | Signed-off-by: Peter A. Bigot <pab@pabigot.com> | 7 | Signed-off-by: Peter A. Bigot <pab@pabigot.com> |
8 | Signed-off-by: Andrei Gherzan <andrei@gherzan.ro> | ||
9 | |||
8 | --- | 10 | --- |
9 | usr/bin/bthelper | 4 ++-- | 11 | usr/bin/bthelper | 4 ++-- |
10 | 1 file changed, 2 insertions(+), 2 deletions(-) | 12 | 1 file changed, 2 insertions(+), 2 deletions(-) |
11 | 13 | ||
12 | diff --git a/usr/bin/bthelper b/usr/bin/bthelper | 14 | diff --git a/usr/bin/bthelper b/usr/bin/bthelper |
13 | index 255fdeb..4e1a1a4 100755 | 15 | index af597e5..5de84f6 100755 |
14 | --- a/usr/bin/bthelper | 16 | --- a/usr/bin/bthelper |
15 | +++ b/usr/bin/bthelper | 17 | +++ b/usr/bin/bthelper |
16 | @@ -10,7 +10,7 @@ fi | 18 | @@ -10,7 +10,7 @@ fi |
@@ -18,11 +20,8 @@ index 255fdeb..4e1a1a4 100755 | |||
18 | dev="$1" | 20 | dev="$1" |
19 | # Need to bring hci up before looking at MAC as it can be all zeros during init | 21 | # Need to bring hci up before looking at MAC as it can be all zeros during init |
20 | -/bin/hciconfig "$dev" up | 22 | -/bin/hciconfig "$dev" up |
21 | -/bin/hciconfig "$dev" |grep -q "BD Address: B8:27:EB:" || exit 0 | 23 | -/bin/hciconfig "$dev" | grep -qE "BD Address: (B8:27:EB|DC:A6:32):" || exit 0 |
22 | +/usr/bin/hciconfig "$dev" up | 24 | +/usr/bin/hciconfig "$dev" up |
23 | +/usr/bin/hciconfig "$dev" |grep -q "BD Address: B8:27:EB:" || exit 0 | 25 | +/usr/bin/hciconfig "$dev" | grep -qE "BD Address: (B8:27:EB|DC:A6:32):" || exit 0 |
24 | /usr/bin/hcitool -i "$dev" cmd 0x3f 0x1c 0x01 0x02 0x00 0x01 0x01 > /dev/null | 26 | /usr/bin/hcitool -i "$dev" cmd 0x3f 0x1c 0x01 0x02 0x00 0x01 0x01 > /dev/null |
25 | 27 | ||
26 | -- | ||
27 | 2.17.1 | ||
28 | |||
diff --git a/recipes-connectivity/pi-bluetooth/pi-bluetooth_git.bb b/recipes-connectivity/pi-bluetooth/pi-bluetooth_0.1.12.bb index b2401b9..e16ed17 100644 --- a/recipes-connectivity/pi-bluetooth/pi-bluetooth_git.bb +++ b/recipes-connectivity/pi-bluetooth/pi-bluetooth_0.1.12.bb | |||
@@ -10,8 +10,7 @@ SRC_URI = "\ | |||
10 | git://github.com/RPi-Distro/pi-bluetooth \ | 10 | git://github.com/RPi-Distro/pi-bluetooth \ |
11 | file://0001-bthelper-correct-path-for-hciconfig-under-Yocto.patch \ | 11 | file://0001-bthelper-correct-path-for-hciconfig-under-Yocto.patch \ |
12 | " | 12 | " |
13 | SRCREV = "2e1a393955910aea67bbf3c921be35a66e8a8fbe" | 13 | SRCREV = "cbdbcb66bcc5b9af05f1a9fffe2254c872bb0ace" |
14 | PV = "1.1+git${SRCPV}" | ||
15 | 14 | ||
16 | S = "${WORKDIR}/git" | 15 | S = "${WORKDIR}/git" |
17 | 16 | ||