diff options
Diffstat (limited to 'meta-raspberrypi/recipes-connectivity')
-rw-r--r-- | meta-raspberrypi/recipes-connectivity/bluez5/bluez5_%.bbappend | 6 | ||||
-rw-r--r-- | meta-raspberrypi/recipes-connectivity/pi-bluetooth/pi-bluetooth_0.1.17.bb | 18 |
2 files changed, 17 insertions, 7 deletions
diff --git a/meta-raspberrypi/recipes-connectivity/bluez5/bluez5_%.bbappend b/meta-raspberrypi/recipes-connectivity/bluez5/bluez5_%.bbappend index d1a07a461..09d410350 100644 --- a/meta-raspberrypi/recipes-connectivity/bluez5/bluez5_%.bbappend +++ b/meta-raspberrypi/recipes-connectivity/bluez5/bluez5_%.bbappend @@ -1,10 +1,10 @@ -FILESEXTRAPATHS_prepend_rpi := "${THISDIR}/${PN}:" +FILESEXTRAPATHS:prepend:rpi := "${THISDIR}/${PN}:" -SRC_URI_append_rpi = "\ +SRC_URI:append:rpi = "\ file://0001-bcm43xx-Add-bcm43xx-3wire-variant.patch \ file://0002-bcm43xx-The-UART-speed-must-be-reset-after-the-firmw.patch \ file://0003-Increase-firmware-load-timeout-to-30s.patch \ file://0004-Move-the-43xx-firmware-into-lib-firmware.patch \ " -RDEPENDS_${PN}_append_rpi = " pi-bluetooth" +RDEPENDS:${PN}:append:rpi = " pi-bluetooth" diff --git a/meta-raspberrypi/recipes-connectivity/pi-bluetooth/pi-bluetooth_0.1.17.bb b/meta-raspberrypi/recipes-connectivity/pi-bluetooth/pi-bluetooth_0.1.17.bb index a1eb97fe8..75b581deb 100644 --- a/meta-raspberrypi/recipes-connectivity/pi-bluetooth/pi-bluetooth_0.1.17.bb +++ b/meta-raspberrypi/recipes-connectivity/pi-bluetooth/pi-bluetooth_0.1.17.bb @@ -14,12 +14,14 @@ SRCREV = "fd4775bf90e037551532fc214a958074830bb80d" S = "${WORKDIR}/git" +inherit ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'systemd', 'update-rc.d', d)} # hciuart.service replaces what was brcm43438.service -inherit systemd -SYSTEMD_SERVICE_${PN} = "\ +SYSTEMD_SERVICE:${PN} = "\ hciuart.service \ bthelper@.service \ " +INITSCRIPT_NAME = "btuart" +INITSCRIPT_PARAMS = "start 18 2 3 4 5 ." do_install() { install -d ${D}${sysconfdir}/udev/rules.d @@ -33,15 +35,23 @@ do_install() { 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 + else + install -d ${D}${sysconfdir}/init.d/ + cat > ${WORKDIR}/btuart.init << EOF +#!/bin/sh +/usr/bin/btuart +EOF + install -m 0755 ${WORKDIR}/btuart.init ${D}${sysconfdir}/init.d/btuart + sed -i -e 's:TAG+="systemd".*$:RUN+="/usr/bin/bthelper %k":' ${D}${sysconfdir}/udev/rules.d/90-pi-bluetooth.rules fi } -FILES_${PN} = "\ +FILES:${PN} = "\ ${bindir} \ ${sysconfdir} \ ${systemd_unitdir}/system \ " -RDEPENDS_${PN} += " \ +RDEPENDS:${PN} += " \ udev-rules-rpi \ " |