bluez5: apply the same patches and pi-bluetooth dependency for all rpi MACHINEs

* otherwise e.g. raspberrypi2 and raspberrypi3 have bluez5 and
  everything which depends on it (e.g. libpcap, ppp, connman, ..)
  effectively MACHINE_ARCH.

bitbake-diffsigs tmp-glibc/sstate-diff/1555265356/ra*/*/bluez5/*do_fetch*
NOTE: Starting bitbake server...
Task dependencies changed from:
['ABIEXTENSION', 'ARMPKGARCH', 'ARMPKGARCH_tune-cortexa7thf-neon-vfpv4', 'ARMPKGSFX_DSP', 'ARMPKGSFX_EABI', 'ARMPKGSFX_ENDIAN', 'ARMPKGSFX_FPU', 'ARMPKGSFX_THUMB', 'ARM_INSTRUCTION_SET', 'ARM_M_OPT', 'ARM_THUMB_OPT', 'ARM_THUMB_SUFFIX', 'DEFAULTTUNE', 'EXTENDPE', 'LIBCEXTENSION', 'MULTIMACH_TARGET_SYS', 'PACKAGE_ARCH', 'PE', 'PN', 'PR', 'PV', 'SRCREV', 'SRC_URI', 'SRC_URI[md5sum]', 'SRC_URI[sha256sum]', 'STAMP', 'TARGET_OS', 'TARGET_VENDOR', 'TUNE_CCARGS_MFLOAT', 'TUNE_CCARGS_MFPU', 'TUNE_FEATURES', 'TUNE_FEATURES_tune-cortexa7', 'TUNE_FEATURES_tune-cortexa7-neon', 'TUNE_FEATURES_tune-cortexa7-neon-vfpv4', 'TUNE_FEATURES_tune-cortexa7t-neon-vfpv4', 'TUNE_FEATURES_tune-cortexa7thf-neon-vfpv4', 'TUNE_PKGARCH', 'base_do_fetch', 'clean_recipe_sysroot']
to:
['ABIEXTENSION', 'ARMPKGARCH', 'ARMPKGARCH_tune-cortexa7thf-neon-vfpv4', 'ARMPKGSFX_DSP', 'ARMPKGSFX_EABI', 'ARMPKGSFX_ENDIAN', 'ARMPKGSFX_FPU', 'ARMPKGSFX_THUMB', 'ARM_INSTRUCTION_SET', 'ARM_M_OPT', 'ARM_THUMB_OPT', 'ARM_THUMB_SUFFIX', 'BCM_BT_SOURCES', 'DEFAULTTUNE', 'EXTENDPE', 'LIBCEXTENSION', 'MULTIMACH_TARGET_SYS', 'PACKAGE_ARCH', 'PE', 'PN', 'PR', 'PV', 'SRCREV', 'SRC_URI', 'SRC_URI[md5sum]', 'SRC_URI[sha256sum]', 'STAMP', 'TARGET_OS', 'TARGET_VENDOR', 'TUNE_CCARGS_MFLOAT', 'TUNE_CCARGS_MFPU', 'TUNE_FEATURES', 'TUNE_FEATURES_tune-cortexa7', 'TUNE_FEATURES_tune-cortexa7-neon', 'TUNE_FEATURES_tune-cortexa7-neon-vfpv4', 'TUNE_FEATURES_tune-cortexa7t-neon-vfpv4', 'TUNE_FEATURES_tune-cortexa7thf-neon-vfpv4', 'TUNE_PKGARCH', 'base_do_fetch', 'clean_recipe_sysroot']
basehash changed from 64b667d84518033856312563af69f9153d8af50dc39c75386ebfbb21fc221a56 to 1b061d52d03831d80866fa7374df99c42db7851e6f259b7a33e3b05f537dd9aa
List of dependencies for variable SRC_URI changed from '{'SRC_URI[sha256sum]', 'SRC_URI[md5sum]', 'PV'}' to '{'SRC_URI[sha256sum]', 'SRC_URI[md5sum]', 'BCM_BT_SOURCES', 'PV'}'
changed items: {'BCM_BT_SOURCES'}
Dependency on variable BCM_BT_SOURCES was added
Variable SRC_URI value changed:
@@ -1,2 +1,2 @@
-    ${KERNELORG_MIRROR}/linux/bluetooth/bluez-${PV}.tar.xz     file://out-of-tree.patch     file://init     file://run-ptest     ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', '', 'file://0001-Allow-using-obexd-without-systemd-in-the-user-sessio.patch', d)}     file://0001-tests-add-a-target-for-building-tests-without-runnin.patch     file://0001-test-gatt-Fix-hung-issue.patch     file://0001-Makefile.am-Fix-a-race-issue-for-tools.patch     file://CVE-2018-10910.patch      file://0001-Case-insensitive-firmware-name.patch
+    ${KERNELORG_MIRROR}/linux/bluetooth/bluez-${PV}.tar.xz     file://out-of-tree.patch     file://init     file://run-ptest     ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', '', 'file://0001-Allow-using-obexd-without-systemd-in-the-user-sessio.patch', d)}     file://0001-tests-add-a-target-for-building-tests-without-runnin.patch     file://0001-test-gatt-Fix-hung-issue.patch     file://0001-Makefile.am-Fix-a-race-issue-for-tools.patch     file://CVE-2018-10910.patch  ${BCM_BT_SOURCES}     file://0001-Case-insensitive-firmware-name.patch
 DISTRO_FEATURES{systemd} = Set
Dependency on checksum of file 0002-bcm43xx-The-UART-speed-must-be-reset-after-the-firmw.patch was added
Dependency on checksum of file 0001-bcm43xx-Add-bcm43xx-3wire-variant.patch was added
Dependency on checksum of file 0004-Move-the-43xx-firmware-into-lib-firmware.patch was added
Dependency on checksum of file 0003-Increase-firmware-load-timeout-to-30s.patch was added

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>

1 files changed, 3 insertions, 9 deletions

diff --git a/recipes-connectivity/bluez5/bluez5_%.bbappend b/recipes-connectivity/bluez5/bluez5_%.bbappend
index 6651fb8..09fbaaa 100644
--- a/recipes-connectivity/bluez5/bluez5_%.bbappend
+++ b/recipes-connectivity/bluez5/bluez5_%.bbappend
@@ -1,16 +1,10 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
+FILESEXTRAPATHS_prepend_rpi := "${THISDIR}/${PN}:"
 
-BCM_BT_SOURCES =  " \
+RC_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 \
 "
 
-BCM_BT_RDEPENDS = "pi-bluetooth"
-
-SRC_URI_append_raspberrypi0-wifi = " ${BCM_BT_SOURCES}"
-SRC_URI_append_raspberrypi3 = " ${BCM_BT_SOURCES}"
-
-RDEPENDS_${PN}_append_raspberrypi0-wifi = " ${BCM_BT_RDEPENDS}"
-RDEPENDS_${PN}_append_raspberrypi3 = " ${BCM_BT_RDEPENDS}"
+RDEPENDS_${PN}_append_rpi = " pi-bluetooth"