|
@@
-116,7
+116,6
if [ "$RPI_MODEL" = 3 ] || [ "$RPI_MODEL" = 3P ] ; then
|
|
116
|
|
|
116
|
|
|
117
|
# Raspberry-sys-mod package for /dev/serial device needed by bluetooth service
|
|
117
|
# Raspberry-sys-mod package for /dev/serial device needed by bluetooth service
|
|
118
|
wget -O "${R}/tmp/pi-bluetooth/99-com.rules" https://raw.githubusercontent.com/RPi-Distro/raspberrypi-sys-mods/master/etc.armhf/udev/rules.d/99-com.rules
|
|
118
|
wget -O "${R}/tmp/pi-bluetooth/99-com.rules" https://raw.githubusercontent.com/RPi-Distro/raspberrypi-sys-mods/master/etc.armhf/udev/rules.d/99-com.rules
|
|
119
|
|
|
|
|
|
120
|
# Bluetooth firmware from arch aur https://aur.archlinux.org/packages/pi-bluetooth/
|
|
119
|
# Bluetooth firmware from arch aur https://aur.archlinux.org/packages/pi-bluetooth/
|
|
121
|
wget -O "${R}/tmp/pi-bluetooth/LICENCE.broadcom_bcm43xx" https://aur.archlinux.org/cgit/aur.git/plain/LICENCE.broadcom_bcm43xx?h=pi-bluetooth
|
|
120
|
wget -O "${R}/tmp/pi-bluetooth/LICENCE.broadcom_bcm43xx" https://aur.archlinux.org/cgit/aur.git/plain/LICENCE.broadcom_bcm43xx?h=pi-bluetooth
|
|
122
|
wget -O "${R}/tmp/pi-bluetooth/BCM43430A1.hcd" https://aur.archlinux.org/cgit/aur.git/plain/BCM43430A1.hcd?h=pi-bluetooth
|
|
121
|
wget -O "${R}/tmp/pi-bluetooth/BCM43430A1.hcd" https://aur.archlinux.org/cgit/aur.git/plain/BCM43430A1.hcd?h=pi-bluetooth
|
|
@@
-128,26
+127,29
if [ "$RPI_MODEL" = 3 ] || [ "$RPI_MODEL" = 3P ] ; then
|
|
128
|
# Install tools
|
|
127
|
# Install tools
|
|
129
|
install_readonly "${R}/tmp/pi-bluetooth/usr/bin/btuart" "${R}/usr/bin/btuart"
|
|
128
|
install_readonly "${R}/tmp/pi-bluetooth/usr/bin/btuart" "${R}/usr/bin/btuart"
|
|
130
|
install_readonly "${R}/tmp/pi-bluetooth/usr/bin/bthelper" "${R}/usr/bin/bthelper"
|
|
129
|
install_readonly "${R}/tmp/pi-bluetooth/usr/bin/bthelper" "${R}/usr/bin/bthelper"
|
|
131
|
|
|
|
|
|
132
|
# Install bluetooth udev rule
|
|
130
|
# Install bluetooth udev rule
|
|
133
|
install_readonly "${R}/tmp/pi-bluetooth/lib/udev/rules.d/90-pi-bluetooth.rules" "${LIB_DIR}/udev/rules.d/90-pi-bluetooth.rules"
|
|
131
|
install_readonly "${R}/tmp/pi-bluetooth/lib/udev/rules.d/90-pi-bluetooth.rules" "${LIB_DIR}/udev/rules.d/90-pi-bluetooth.rules"
|
|
134
|
# aur
|
|
132
|
# aur
|
|
135
|
# install_readonly "${R}/tmp/pi-bluetooth/50-bluetooth-hci-auto-poweron.rules" "${ETC_DIR}/udev/rules.d/50-bluetooth-hci-auto-poweron.rules"
|
|
133
|
# install_readonly "${R}/tmp/pi-bluetooth/50-bluetooth-hci-auto-poweron.rules" "${ETC_DIR}/udev/rules.d/50-bluetooth-hci-auto-poweron.rules"
|
|
136
|
|
|
|
|
|
137
|
# Install Firmware Flash file and apropiate licence
|
|
134
|
# Install Firmware Flash file and apropiate licence
|
|
138
|
mkdir "${ETC_DIR}/firmware/"
|
|
135
|
mkdir "${ETC_DIR}/firmware/"
|
|
139
|
|
|
|
|
|
140
|
# Install firmware and licence
|
|
136
|
# Install firmware and licence
|
|
141
|
# install_readonly "${R}/tmp/pi-bluetooth/LICENCE.broadcom_bcm43xx" "${ETC_DIR}/firmware/LICENCE.broadcom_bcm43xx"
|
|
137
|
# install_readonly "${R}/tmp/pi-bluetooth/LICENCE.broadcom_bcm43xx" "${ETC_DIR}/firmware/LICENCE.broadcom_bcm43xx"
|
|
142
|
# install_readonly "${R}/tmp/pi-bluetooth/BCM43430A1.hcd" "${ETC_DIR}/firmware/BCM43430A1.hcd"
|
|
138
|
# install_readonly "${R}/tmp/pi-bluetooth/BCM43430A1.hcd" "${ETC_DIR}/firmware/BCM43430A1.hcd"
|
|
143
|
install_readonly "${R}/tmp/pi-bluetooth/LICENCE.broadcom_bcm43xx" "${ETC_DIR}/firmware/LICENCE.broadcom_bcm43xx"
|
|
139
|
install_readonly "${R}/tmp/pi-bluetooth/LICENCE.broadcom_bcm43xx" "${ETC_DIR}/firmware/LICENCE.broadcom_bcm43xx"
|
|
144
|
install_readonly "${R}/tmp/pi-bluetooth/BCM43430A1.hcd" "${ETC_DIR}/firmware/LICENCE.broadcom_bcm43xx"
|
|
140
|
install_readonly "${R}/tmp/pi-bluetooth/BCM43430A1.hcd" "${ETC_DIR}/firmware/LICENCE.broadcom_bcm43xx"
|
|
145
|
|
|
|
|
|
146
|
# Install systemd service for bluetooth
|
|
141
|
# Install systemd service for bluetooth
|
|
147
|
# install_readonly "${R}/tmp/pi-bluetooth/brcm43438.service" "${ETC_DIR}/systemd/system/brcm43438.service"
|
|
142
|
# install_readonly "${R}/tmp/pi-bluetooth/brcm43438.service" "${ETC_DIR}/systemd/system/brcm43438.service"
|
|
|
|
|
143
|
<<<<<<< HEAD
|
|
|
|
|
144
|
install_readonly "${R}/tmp/pi-bluetooth/debian/pi-bluetooth.bthelper@.service" "${ETC_DIR}/systemd/system/pi-bluetooth.bthelper@.service"
|
|
|
|
|
145
|
install_readonly "${R}/tmp/pi-bluetooth/debian/pi-bluetooth.hciuart.service" "${ETC_DIR}/systemd/system/pi-bluetooth.hciuart.service"
|
|
|
|
|
146
|
# Install udev rule for bluetooth device
|
|
|
|
|
147
|
install_readonly "${R}/tmp/pi-bluetooth/99-com.rules" "${ETC_DIR}/udev/rules.d/99-com.rules"
|
|
|
|
|
148
|
=======
|
|
148
|
install_readonly "${R}/tmp/pi-bluetooth/debian/pi-bluetooth.bthelper@.service" "${ETC_DIR}/systemd/system/pi-bluetooth.bthelper@.service"
|
|
149
|
install_readonly "${R}/tmp/pi-bluetooth/debian/pi-bluetooth.bthelper@.service" "${ETC_DIR}/systemd/system/pi-bluetooth.bthelper@.service"
|
|
149
|
install_readonly "${R}/tmp/pi-bluetooth/debian/pi-bluetooth.hciuart.service" "${ETC_DIR}/systemd/system/pi-bluetooth.hciuart.service"
|
|
150
|
install_readonly "${R}/tmp/pi-bluetooth/debian/pi-bluetooth.hciuart.service" "${ETC_DIR}/systemd/system/pi-bluetooth.hciuart.service"
|
|
150
|
install_readonly "${R}/tmp/pi-bluetooth/99-com.rules" "${ETC_DIR}/udev/rules.d/99-com.rules"
|
|
151
|
install_readonly "${R}/tmp/pi-bluetooth/99-com.rules" "${ETC_DIR}/udev/rules.d/99-com.rules"
|
|
|
|
|
152
|
>>>>>>> bc6d966f8243dd759dfc1c0811528e37879ceb1b
|
|
151
|
|
|
153
|
|
|
152
|
# Remove temporary directory
|
|
154
|
# Remove temporary directory
|
|
153
|
rm -fr "${temp_dir}"
|
|
155
|
rm -fr "${temp_dir}"
|