summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorBen Merritt2018-12-15 22:35:09 +0000
committerBen Merritt2018-12-18 04:53:44 +0000
commit34376e414ecf82cf1961604ad713d59776f98a42 (patch)
tree5a420b88a0a4b60819f01602132a0faf54f637cd
parent9edf5584d3ee4ffcd6200dd84252545622539462 (diff)
downloadaur-34376e414ecf82cf1961604ad713d59776f98a42.tar.gz
Update to work with more recent Bluetooth stacks
-rw-r--r--.SRCINFO20
-rw-r--r--.gitignore4
-rw-r--r--50-bluetooth-hci-auto-poweron.rules2
-rw-r--r--BCM43430A1.hcdbin35976 -> 0 bytes
-rw-r--r--PKGBUILD37
-rw-r--r--brcm43438.service2
6 files changed, 34 insertions, 31 deletions
diff --git a/.SRCINFO b/.SRCINFO
index fa46d7d255c8..f16850509424 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,23 +1,21 @@
-# Generated by mksrcinfo v8
-# Mon Oct 16 08:23:40 UTC 2017
pkgbase = pi-bluetooth
pkgdesc = Services, firmware and udev rules to get integrated bluetooth running in Raspberry Pi 3
pkgver = 1
- pkgrel = 1
+ pkgrel = 2
install = pi-bluetooth.install
arch = armv6h
arch = armv7h
arch = aarch64
license = multiple
- depends = hciattach-rpi3
- source = BCM43430A1.hcd
- source = brcm43438.service
+ depends = bluez-utils
+ source = https://raw.githubusercontent.com/RPi-Distro/bluez-firmware/master/broadcom/BCM43430A1.hcd
+ source = https://raw.githubusercontent.com/RPi-Distro/bluez-firmware/master/broadcom/BCM4345C0.hcd
source = LICENCE.broadcom_bcm43xx
- source = 50-bluetooth-hci-auto-poweron.rules
- md5sums = b95ee9032a723daa25ab9608a515e984
- md5sums = 89d9171e5693d7d3b0a3ee1710dcbe0c
- md5sums = 3160c14df7228891b868060e1951dfbc
- md5sums = 53bcbedd38f7a83920677228e45323b6
+ source = brcm43438.service
+ sha256sums = 8dd70b9003d39cb6175b4f3cd509666dad66ad23d3be1a68385817fb814c8930
+ sha256sums = 042a8c234beaa9abb8d6156430e44af983f861036e1d54ffe8cabcc0dab76a43
+ sha256sums = b16056fc91b82a0e3e8de8f86c2dac98201aa9dc3cbd33e8d38f1b087fcec30d
+ sha256sums = b4a84d669984424c7994c5a4bcbf65e1818b04c65849ac4d6ed56592a8075ec7
pkgname = pi-bluetooth
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 000000000000..90131255d52d
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,4 @@
+/src
+/pkg
+/*.hcd
+/*.pkg.tar.xz
diff --git a/50-bluetooth-hci-auto-poweron.rules b/50-bluetooth-hci-auto-poweron.rules
deleted file mode 100644
index f88cefe4abc1..000000000000
--- a/50-bluetooth-hci-auto-poweron.rules
+++ /dev/null
@@ -1,2 +0,0 @@
-# Set bluetooth power up
-ACTION=="add", SUBSYSTEM=="bluetooth", KERNEL=="hci[0-9]*", RUN+="/usr/bin/hciconfig %k up"
diff --git a/BCM43430A1.hcd b/BCM43430A1.hcd
deleted file mode 100644
index 162275ac0b18..000000000000
--- a/BCM43430A1.hcd
+++ /dev/null
Binary files differ
diff --git a/PKGBUILD b/PKGBUILD
index 3d272b2f2cff..82d2d710afcc 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,33 +1,36 @@
-# Maintainer: Jesse Jaara <jesse.jaara: gmail.com>
+# Maintainer: Ben Merritt <blm768@gmail.com>
+# Contributor: Jesse Jaara <jesse.jaara: gmail.com>
pkgname=pi-bluetooth
pkgver=1
-pkgrel=1
+pkgrel=2
pkgdesc="Services, firmware and udev rules to get integrated bluetooth running in Raspberry Pi 3"
arch=('armv6h' 'armv7h' 'aarch64')
url=""
license=('multiple')
-depends=('hciattach-rpi3')
+depends=('bluez-utils')
install=pi-bluetooth.install
-source=(BCM43430A1.hcd
- brcm43438.service
- LICENCE.broadcom_bcm43xx
- 50-bluetooth-hci-auto-poweron.rules)
-md5sums=('b95ee9032a723daa25ab9608a515e984'
- '89d9171e5693d7d3b0a3ee1710dcbe0c'
- '3160c14df7228891b868060e1951dfbc'
- '53bcbedd38f7a83920677228e45323b6')
+source=(
+ https://raw.githubusercontent.com/RPi-Distro/bluez-firmware/master/broadcom/BCM43430A1.hcd
+ https://raw.githubusercontent.com/RPi-Distro/bluez-firmware/master/broadcom/BCM4345C0.hcd
+ LICENCE.broadcom_bcm43xx
+ brcm43438.service
+)
+sha256sums=(
+ '8dd70b9003d39cb6175b4f3cd509666dad66ad23d3be1a68385817fb814c8930'
+ '042a8c234beaa9abb8d6156430e44af983f861036e1d54ffe8cabcc0dab76a43'
+ 'b16056fc91b82a0e3e8de8f86c2dac98201aa9dc3cbd33e8d38f1b087fcec30d'
+ 'b4a84d669984424c7994c5a4bcbf65e1818b04c65849ac4d6ed56592a8075ec7'
+)
package() {
cd "${srcdir}"
- mkdir -p "${pkgdir}/usr/lib/systemd/system"
- mkdir -p "${pkgdir}/etc/firmware"
- mkdir -p "${pkgdir}/etc/udev/rules.d"
+ mkdir -p "${pkgdir}/usr/lib/firmware"
mkdir -p "${pkgdir}/usr/share/licences"
+ mkdir -p "${pkgdir}/usr/lib/systemd/system"
- cp BCM43430A1.hcd "${pkgdir}/etc/firmware/"
- cp brcm43438.service "${pkgdir}/usr/lib/systemd/system/"
- cp 50-bluetooth-hci-auto-poweron.rules "${pkgdir}/etc/udev/rules.d/"
+ cp BCM43430A1.hcd BCM4345C0.hcd "${pkgdir}/usr/lib/firmware/"
cp LICENCE.broadcom_bcm43xx "${pkgdir}/usr/share/licences/"
+ cp brcm43438.service "${pkgdir}/usr/lib/systemd/system/"
}
diff --git a/brcm43438.service b/brcm43438.service
index 396b2ceb3054..770679241d38 100644
--- a/brcm43438.service
+++ b/brcm43438.service
@@ -6,7 +6,7 @@ After=dev-ttyAMA0.device
[Service]
Type=simple
-ExecStart=/usr/bin/hciattach-rpi3 -n /dev/ttyAMA0 bcm43xx 921600 noflow -
+ExecStart=/usr/bin/btattach -B /dev/ttyAMA0 -P bcm -S 3000000
[Install]
WantedBy=multi-user.target