From 985dee9cb6bb29800a933e882913a44e6b9d4f42 Mon Sep 17 00:00:00 2001 From: Brad Bishop Date: Mon, 11 Nov 2019 08:08:32 -0500 Subject: meta-raspberrypi: subtree update:254c9366b9..a430f1e50a Andrei Gherzan (5): pi-bluetooth: Update to latest version (0.1.12) raspberrypi-firmware: Update to current HEAD raspberrypi-tools: Update to current HEAD linux-firmware-rpidistro: Bump revision linux-raspberrypi: Bump to 4.19 recipe to 4.19.81 Pierre-Jean Texier (2): raspi-gpio: bump to revision 2eaa8b8 wiringpi: remove obsolete files Change-Id: I001e619182aaa07a08c18dbac7381df5c848787d Signed-off-by: Brad Bishop --- ...er-correct-path-for-hciconfig-under-Yocto.patch | 13 +++--- .../pi-bluetooth/pi-bluetooth_0.1.12.bb | 45 +++++++++++++++++++++ .../pi-bluetooth/pi-bluetooth_git.bb | 46 ---------------------- 3 files changed, 51 insertions(+), 53 deletions(-) create mode 100644 meta-raspberrypi/recipes-connectivity/pi-bluetooth/pi-bluetooth_0.1.12.bb delete mode 100644 meta-raspberrypi/recipes-connectivity/pi-bluetooth/pi-bluetooth_git.bb (limited to 'meta-raspberrypi/recipes-connectivity') diff --git a/meta-raspberrypi/recipes-connectivity/pi-bluetooth/pi-bluetooth/0001-bthelper-correct-path-for-hciconfig-under-Yocto.patch b/meta-raspberrypi/recipes-connectivity/pi-bluetooth/pi-bluetooth/0001-bthelper-correct-path-for-hciconfig-under-Yocto.patch index 45839053c..45b43c725 100644 --- a/meta-raspberrypi/recipes-connectivity/pi-bluetooth/pi-bluetooth/0001-bthelper-correct-path-for-hciconfig-under-Yocto.patch +++ b/meta-raspberrypi/recipes-connectivity/pi-bluetooth/pi-bluetooth/0001-bthelper-correct-path-for-hciconfig-under-Yocto.patch @@ -1,16 +1,18 @@ -From af91c96951a11f81f5cea88a0010161592c89310 Mon Sep 17 00:00:00 2001 +From a73bbed89fb049ac424c211629935b26013e2573 Mon Sep 17 00:00:00 2001 From: "Peter A. Bigot" Date: Wed, 14 Nov 2018 09:19:51 -0600 Subject: [PATCH] bthelper: correct path for hciconfig under Yocto Upstream-Status: Inapproprate [OE-specific] Signed-off-by: Peter A. Bigot +Signed-off-by: Andrei Gherzan + --- usr/bin/bthelper | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/usr/bin/bthelper b/usr/bin/bthelper -index 255fdeb..4e1a1a4 100755 +index af597e5..5de84f6 100755 --- a/usr/bin/bthelper +++ b/usr/bin/bthelper @@ -10,7 +10,7 @@ fi @@ -18,11 +20,8 @@ index 255fdeb..4e1a1a4 100755 dev="$1" # Need to bring hci up before looking at MAC as it can be all zeros during init -/bin/hciconfig "$dev" up --/bin/hciconfig "$dev" |grep -q "BD Address: B8:27:EB:" || exit 0 +-/bin/hciconfig "$dev" | grep -qE "BD Address: (B8:27:EB|DC:A6:32):" || exit 0 +/usr/bin/hciconfig "$dev" up -+/usr/bin/hciconfig "$dev" |grep -q "BD Address: B8:27:EB:" || exit 0 ++/usr/bin/hciconfig "$dev" | grep -qE "BD Address: (B8:27:EB|DC:A6:32):" || exit 0 /usr/bin/hcitool -i "$dev" cmd 0x3f 0x1c 0x01 0x02 0x00 0x01 0x01 > /dev/null --- -2.17.1 - diff --git a/meta-raspberrypi/recipes-connectivity/pi-bluetooth/pi-bluetooth_0.1.12.bb b/meta-raspberrypi/recipes-connectivity/pi-bluetooth/pi-bluetooth_0.1.12.bb new file mode 100644 index 000000000..e16ed17b1 --- /dev/null +++ b/meta-raspberrypi/recipes-connectivity/pi-bluetooth/pi-bluetooth_0.1.12.bb @@ -0,0 +1,45 @@ +SUMMARY = "Script to properly configure BT-HCI on Raspberry Pi" +HOMEPAGE = "https://github.com/RPi-Distro/pi-bluetooth" +SECTION = "kernel" +LICENSE = "BSD-3-Clause" +LIC_FILES_CHKSUM = "\ + file://debian/copyright;md5=6af8de3c8ee71f8e91e9b22f84ff2022 \ +" + +SRC_URI = "\ + git://github.com/RPi-Distro/pi-bluetooth \ + file://0001-bthelper-correct-path-for-hciconfig-under-Yocto.patch \ +" +SRCREV = "cbdbcb66bcc5b9af05f1a9fffe2254c872bb0ace" + +S = "${WORKDIR}/git" + +# hciuart.service replaces what was brcm43438.service +inherit systemd +SYSTEMD_SERVICE_${PN} = "\ + hciuart.service \ + bthelper@.service \ +" + +inherit allarch + +do_install() { + install -d ${D}${sysconfdir}/udev/rules.d + install -m 0644 ${S}/lib/udev/rules.d/* ${D}${sysconfdir}/udev/rules.d + + install -d ${D}${bindir} + install -m 0755 ${S}/usr/bin/bthelper ${D}${bindir} + install -m 0755 ${S}/usr/bin/btuart ${D}${bindir} + + if ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then + install -d ${D}${systemd_system_unitdir} + install -m 0644 ${S}/debian/pi-bluetooth.bthelper@.service ${D}${systemd_system_unitdir}/bthelper@.service + install -m 0644 ${S}/debian/pi-bluetooth.hciuart.service ${D}${systemd_system_unitdir}/hciuart.service + fi +} + +FILES_${PN} = "\ + ${bindir} \ + ${sysconfdir} \ + ${systemd_unitdir}/system \ +" diff --git a/meta-raspberrypi/recipes-connectivity/pi-bluetooth/pi-bluetooth_git.bb b/meta-raspberrypi/recipes-connectivity/pi-bluetooth/pi-bluetooth_git.bb deleted file mode 100644 index b2401b93c..000000000 --- a/meta-raspberrypi/recipes-connectivity/pi-bluetooth/pi-bluetooth_git.bb +++ /dev/null @@ -1,46 +0,0 @@ -SUMMARY = "Script to properly configure BT-HCI on Raspberry Pi" -HOMEPAGE = "https://github.com/RPi-Distro/pi-bluetooth" -SECTION = "kernel" -LICENSE = "BSD-3-Clause" -LIC_FILES_CHKSUM = "\ - file://debian/copyright;md5=6af8de3c8ee71f8e91e9b22f84ff2022 \ -" - -SRC_URI = "\ - git://github.com/RPi-Distro/pi-bluetooth \ - file://0001-bthelper-correct-path-for-hciconfig-under-Yocto.patch \ -" -SRCREV = "2e1a393955910aea67bbf3c921be35a66e8a8fbe" -PV = "1.1+git${SRCPV}" - -S = "${WORKDIR}/git" - -# hciuart.service replaces what was brcm43438.service -inherit systemd -SYSTEMD_SERVICE_${PN} = "\ - hciuart.service \ - bthelper@.service \ -" - -inherit allarch - -do_install() { - install -d ${D}${sysconfdir}/udev/rules.d - install -m 0644 ${S}/lib/udev/rules.d/* ${D}${sysconfdir}/udev/rules.d - - install -d ${D}${bindir} - install -m 0755 ${S}/usr/bin/bthelper ${D}${bindir} - install -m 0755 ${S}/usr/bin/btuart ${D}${bindir} - - if ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then - install -d ${D}${systemd_system_unitdir} - install -m 0644 ${S}/debian/pi-bluetooth.bthelper@.service ${D}${systemd_system_unitdir}/bthelper@.service - install -m 0644 ${S}/debian/pi-bluetooth.hciuart.service ${D}${systemd_system_unitdir}/hciuart.service - fi -} - -FILES_${PN} = "\ - ${bindir} \ - ${sysconfdir} \ - ${systemd_unitdir}/system \ -" -- cgit v1.2.3