diff options
| author |   Scott Murray <scott.murray@konsulko.com> | 2018-12-18 16:22:10 -0500 |
|---|---|---|
| committer |   Jan-Simon Moeller <jsmoeller@linuxfoundation.org> | 2018-12-20 21:10:18 +0000 |
| commit | 4913c46bf2c4099bf467eee30c0faf1d41618fa2 (patch) | |
| tree | b8b3309d42f4ca3ab1d1b539905d90b04e8aee6e | |
| parent | d786abb46aa885898c61d08dc7d6b4564bea2b93 (diff) | |
Disable btwilink by default on m3ulcb
Testing for CES has found the wilink BT on the M3+Kingfisher somewhat
unreliable. To disable it by default for now, add a demo platform
configuration hook to packagegroup-agl-demo-platform and use it to
pick up a modprobe configuration file to prevent btwilink from loading.
This addition is specific to the m3ulcb platform, and the variable
DEMO_ENABLE_BTWILINK can be used to over-ride the behavior by setting
it to "true" in local.conf or site.conf.
Change-Id: Ia645d9329594547f83601526e3f3fd5da5845b24
Signed-off-by: Scott Murray <scott.murray@konsulko.com>
3 files changed, 23 insertions, 2 deletions
diff --git a/recipes-connectivity/btwilink-disable-conf/btwilink-disable-conf_1.0.bb b/recipes-connectivity/btwilink-disable-conf/btwilink-disable-conf_1.0.bb new file mode 100644 index 000000000..9170a84e6 --- /dev/null +++ b/recipes-connectivity/btwilink-disable-conf/btwilink-disable-conf_1.0.bb @@ -0,0 +1,14 @@ +SUMMARY = "btwilink module disabling modprobe configuration" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" + +SRC_URI = "file://btwilink-disable.conf" + +COMPATIBLE_MACHINE = "m3ulcb" + +do_compile[noexec] = "1" + +do_install() { + install -d ${D}${sysconfdir}/modprobe.d + install -m 0644 ${WORKDIR}/btwilink-disable.conf ${D}${sysconfdir}/modprobe.d +} diff --git a/recipes-connectivity/btwilink-disable-conf/files/btwilink-disable.conf b/recipes-connectivity/btwilink-disable-conf/files/btwilink-disable.conf new file mode 100644 index 000000000..8d28f629e --- /dev/null +++ b/recipes-connectivity/btwilink-disable-conf/files/btwilink-disable.conf @@ -0,0 +1 @@ +install btwilink /bin/false diff --git a/recipes-platform/packagegroups/packagegroup-agl-demo-platform.bb b/recipes-platform/packagegroups/packagegroup-agl-demo-platform.bb index 40e4d3c20..d7dddb7db 100755 --- a/recipes-platform/packagegroups/packagegroup-agl-demo-platform.bb +++ b/recipes-platform/packagegroups/packagegroup-agl-demo-platform.bb @@ -65,6 +65,13 @@ MAPVIEWER = "${@bb.utils.contains("DISTRO_FEATURES", "agl-cluster-demo-support", DEMO_MAPS_LOCALE ?= "uk" DEMO_PRELOAD = "${@bb.utils.contains("DISTRO_FEATURES", "agl-demo-preload", " navigation-maps-${DEMO_MAPS_LOCALE} poiapp-api-key", "",d)}" +# Hook for demo platform configuration +# ATM, only used to disable btwilink module on M3ULCB + Kingfisher by default, +# setting DEMO_ENABLE_BTWILINK to "true" in local.conf / site.conf re-enables. +DEMO_ENABLE_BTWILINK ?= "" +DEMO_PLATFORM_CONF = "" +DEMO_PLATFORM_CONF_append_m3ulcb = "${@bb.utils.contains("DEMO_ENABLE_BTWILINK", "true", "", " btwilink-disable-conf", d)}" + RDEPENDS_${PN}_append = " \ qtquickcontrols2-agl \ qtquickcontrols2-agl-style \ @@ -75,6 +82,5 @@ RDEPENDS_${PN}_append = " \ ${QTAGLEXTRAS} \ ${MAPVIEWER} \ ${DEMO_PRELOAD} \ + ${DEMO_PLATFORM_CONF} \ " - - |