summaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)AuthorFilesLines
2019-10-05bluez-alsa: update to latest masterGeorge Kiagiadakis1-2/+2
This adds, among others, the d-bus interface that is necessary for the pipewire gstreamer helper from meta-pipewire to work. The LICENSE file was changed to not include the contributors list, but otherwise the license is unchanged. Bug-AGL: SPEC-2792 Change-Id: I7d9e954691e617b3c8ba8165864b32f3831e28b7 Signed-off-by: George Kiagiadakis <george.kiagiadakis@collabora.com>
2019-10-01meta-agl-profile-core: update curl and nghttp2Scott Murray4-0/+144
Backport newer curl and nghttp2 recipes, and bbappend curl to enable nghttp2 support by default when building for target. In concert with a change to mask out the curl bbappend in meta-aac, this should provide the requirements for alexa-voiceagent-service and avoid significant rebuilds when the agl-voiceagent-alexa feature is enabled/disabled. The curl recipe backport is from commit 0b7320b in upstream oe-core master branch, the nghttp2 recipe backport is from commit 5a9b6d3 in meta-networking in meta-openembedded master branch. Bug-AGL: SPEC-2839 Change-Id: Id1ec872dfcb4ecc7a9ba68bdefb114ceeff066c3 Signed-off-by: Scott Murray <scott.murray@konsulko.com> (cherry picked from commit 7f4b218599f3c6a0c7b77d1d2866e5b71d920179)
2019-09-20raspberrypi4: enable v3d and dependencies in mesaJan-Simon Möller1-0/+2
To enable the gfx acceleration, enable the necessary flags in mesa. Bug-AGL: SPEC-2656 Change-Id: I8bfb2f4034679f4703ddcb4bdb4c1363eee3d9d4 Signed-off-by: Jan-Simon Möller <jsmoeller@linuxfoundation.org>
2019-09-20raspberrypi*/50_local.conf.inc: Set Mesa versionLeon Anavi2-0/+7
Use Mesa 18.1 for Raspberry Pi 3 and Mesa 19.1 for Raspberry Pi 4. With the older version of Mesa Weston and the home screen doesn't launch properly on Raspberry Pi 4 therefore version 19.1 has been ported from master branch of layer openembedded-core to layer meta-agl-bsp/meta-raspberrypi. This solution is temporary until the next major update of AGL from Yocto Project release Thud to a newer release. Bug-AGL: SPEC-2656 Signed-off-by: Leon Anavi <leon.anavi@konsulko.com> Change-Id: I7b3d87a42c6e65014705d98bfbd8ebdabb48eadd Signed-off-by: Leon Anavi <leon.anavi@konsulko.com>
2019-09-20mesa: Upgrade Mesa for Raspberry Pi 4Leon Anavi16-0/+2080
Bring Mesa 19.1.6 to meta-agl-bsp/meta-raspberrypi because there are driver issues with Mesa 18.1 for Raspberry Pi 4. The recipes for this new version are coming from the master branch of layer openembedded-core. With the newer version of Mesa Weston works fine on Raspberry Pi 4 and the home screen appears as expected. Bug-AGL: SPEC-2656 Signed-off-by: Leon Anavi <leon.anavi@konsulko.com> Change-Id: I0d4f6e6fdff3c6ac54a72d19abfc292efcea7a3f
2019-09-17Remove pulseaudio feature, not relevant any moreRonan Le Martret2-11/+0
Bug-AGL: SPEC-2817 Change-Id: I0323e97ed9aca036685e946752aa7bade8fc5057 Signed-off-by: Ronan Le Martret <ronan.lemartret@iot.bzh>
2019-09-16[RCAR] BSP update to v3.21.0Ronan Le Martret1-2/+2
Bug-AGL: SPEC-2785 Change-Id: I34e6798b31515f1a3528af80de8232fa7daa250a Signed-off-by: Ronan Le Martret <ronan.lemartret@iot.bzh>
2019-09-16base-files: add /media to System::Shared SMACK labelMatt Ranostay1-0/+6
All media mountpoints should have the System::Shared label to avoid access denials on multimedia items. Bug-AGL: SPEC-2774 Change-Id: Ib9bb1b26a1950cacd5e1f384cbe19d4a4a6373d9 Signed-off-by: Matt Ranostay <matt.ranostay@konsulko.com>
2019-09-16meta-agl-bsp/meta-rcar-gen3: Update asound.state to pipewireHarunobu Kurokawa1-4/+4
pipewire is using default audio card volume. Current 50% of DVC Out is laudy and 0% of DVC In is small. Update 20% of DVC Out and 10% of DVC In for R-Car. Bug-AGL: SPEC-2808 Change-Id: Iac572255977d6a0111026a6426081efb0edbf0aa Signed-off-by: Harunobu Kurokawa <harunobu.kurokawa.dn@renesas.com> (cherry picked from commit f7c7f376caefa9a788eee191220a4a424d0dad0c)
2019-09-13udisks: remove unneeded execute bit on automount.shMatt Ranostay1-0/+0
On do_install() the correct execute bits are set and shouldn't be in the repo version of automount.sh Bug-AGL: SPEC-2774 Change-Id: Ic66707f9e9367ed02c523f11cb6d6ba360e6fe9f Signed-off-by: Matt Ranostay <matt.ranostay@konsulko.com> (cherry picked from commit bad943d52c413e35879cc48a0df257f983190de8)
2019-09-12meta-agl-bsp: meta-rcar-gen3-adas: Rework KF radio initializationScott Murray3-0/+39
Add a systemd service unit and recipe to install it and a udev rules file so that the Kingfisher Si4689 radio will be initialized on boot if present, and the I2C device to access it will be accessible to applications with the "audio" permission. Note that an accompanying change to agl-service-radio is required to remove its now unworkable usage of the si_init script, which is replaced by this change. Bug-AGL: SPEC-2716 Change-Id: I81cf4b8c439598bdac1eb7910a0d693825141d7b Signed-off-by: Scott Murray <scott.murray@konsulko.com> (cherry picked from commit c369b00e617f408e2a408b0c04dc44fe7e06b7a1)
2019-09-11agl-service-navigation: Switch to AGL GerritScott Murray1-4/+4
Update agl-service-navigation recipe to switch to using AGL Gerrit for the source repository. Bug-AGL: SPEC-2787 Change-Id: I9a494adb8972b8cf20681ab37d2756459448e13d Signed-off-by: Scott Murray <scott.murray@konsulko.com>
2019-09-10Post 8.0.1 release bump of distro configJan-Simon Moeller1-2/+2
Development is open for 8.0.2. Change-Id: Ib9723af707b5713e8f6bb6776f3450b518c4b8b9 Signed-off-by: Jan-Simon Moeller <jsmoeller@linuxfoundation.org>
2019-09-09freetype: add pixmap to PACKAGECONFIGMatt Ranostay1-0/+3
To allow rendering of color emojis the pixmap/libpng support needs to be enabled. Bug-AGL: SPEC-2701 Change-Id: I7f0dc2cf54f0cf587d72a81fbf06c5750bbdeefb Signed-off-by: Matt Ranostay <matt.ranostay@konsulko.com> (cherry picked from commit dcda26bd13b88f51a197324d4894fe189f9dc504)
2019-09-09af-platform-setup: fix installation modeJosé Bollo1-1/+1
The file systemd-udevd.service.d/udev-shared.conf was installed with default rigths meaning rwxr-xr-x. Systemd complains about it: Configuration file /lib/systemd/system/systemd-udevd.service.d/udev-shared.conf is marked executable. Please remove executable permission bits. Proceeding anyway. This commit fix that issue. Bug-AGL: SPEC-2798 Change-Id: I90a2b0f538416b5e8e6f8e1aaf552530150c8103 Signed-off-by: José Bollo <jose.bollo@iot.bzh>
2019-09-04Add nogfx build for h3ulcbJan-Simon Moeller4-0/+30
Before we can add the h3 to CI we need a -nogfx build. v3: leave the BBMASK in the board specific file due to inc file stacking. Change-Id: Ic59784aa143e3346d2f999060214411497fc1b54 Signed-off-by: Jan-Simon Moeller <jsmoeller@linuxfoundation.org>
2019-09-04Prepare Happy Halibut v8.0.1 patch releasehalibut_8.0.1halibut/8.0.18.0.1Jan-Simon Moeller1-1/+1
Change the distro configuration. Change-Id: I4ea995a2b8504b30117dc514f55cc18b84bd116b Signed-off-by: Jan-Simon Moeller <jsmoeller@linuxfoundation.org>
2019-09-04agl_raspberrypi3.inc: Set CMA for SOTALeon Anavi1-0/+2
Add CMA to the kernel arguments in uEnv.txt for U-Boot in images with enabled feature agl-sota for software-over-the-air (SOTA) updates for Raspberry Pi 3 B/B+. Bug-AGL: SPEC-2729 Signed-off-by: Leon Anavi <leon.anavi@konsulko.com> Change-Id: Id6914de6a41ebfd3fc28ca2948a15d891c9a30b3 (cherry picked from commit 86f76e0578b4cbb1a3b286b6e959e317866f9c31)
2019-09-0350_local.conf.inc: Extend DISTRO_FEATURES for sotaLeon Anavi1-0/+2
Extend DISTRO_FEATURES with sota and usrmerge to successfully build AGL image with feature agl-sota. Bug-AGL: SPEC-2736, SPEC-2729 Change-Id: Ie056d233f1c528719361a8c958233a2ba58f7345 Signed-off-by: Leon Anavi <leon.anavi@konsulko.com> (cherry picked from commit 73b849c0d72f94eb1c0db582a9dc684123793960)
2019-09-03meta-agl-profile-cluster-qt5: Add qtcompositor-conf recipeScott Murray2-0/+41
Add qtcompositor-conf recipe to create the udev rule files required to set up the "display" group ownership of graphics devices when not using weston. The recipe is based on what is done in the weston-init bbappend in the meta-agl-profile-graphical layer. The package is also added to the agl-profile-cluster-qtcompositor packagegroup so that the qtcompositor cluster demo image will pick it up. Bug-AGL: SPEC-2775 Change-Id: I375e915b2074eb2abcec534a88fddfc6445730e1 Signed-off-by: Scott Murray <scott.murray@konsulko.com>
2019-09-03wayland bug backport: Fix fake "Address already in use" errorZhou Mingying2-0/+36
Backport a bug modification to the wayland used by AGL, because the bug may effect the applications start error The bug modification detail is as bellow: In the current workflow, socket file will be deleted if it already exists. However, if the socket file is a symbolic link or the file that it refers to not exist, we will got "Address already in use", because bind() thinks the socket file exists and won't create it. Now, use lstat() to determine whether the socket file exists. Bug-AGL: SPEC-2783 Signed-off-by: Zhou Mingying <zhoumy@cn.fujitsu.com> Change-Id: Iff2c7abefa56104eef49ae7102ee8a1de796b813
2019-09-03fix drm-introduce-drm_get_dmafd_from_view.patchVeeresh Kadasani1-14/+22
Fix crashing transmitter when testing with weston 6.0 because of unregistered API. Bug-AGL: SPEC-2696 Change-Id: Ib7cc01a4305da9a656b933f295e745dd56131ff4 Signed-off-by: Veeresh Kadasani <external.vkadasani@jp.adit-jv.com>
2019-09-03[RCAR] update to BSP v3.19.0Ronan Le Martret1-2/+2
Bug-AGL: SPEC-2681 Change-Id: Ie397c943762c20b0231ca7c0e44323bdf6101790 Signed-off-by: Ronan Le Martret <ronan.lemartret@iot.bzh>
2019-09-03Revert "setup_mm_packages.sh: Use GFX 3.19 binaries instead of 3.15"Ronan Le Martret1-51/+0
Bug-AGL: SPEC-2681 This reverts commit 9bc6c25f56f4997e55b60e969e9f942cc1859988. Change-Id: Ice72ff5f510ac848679c7d09ed4d0bde2d0940d7 Signed-off-by: Ronan Le Martret <ronan.lemartret@iot.bzh>
2019-08-26Fix qtbase compile error for dra7xx-evmZhou Mingying3-0/+76
Fix qtbase plugin eglfs kms gbm compile error, and conversion error from EGLNativeDisplayType to void. Bug-AGL: SPEC-2763 Signed-off-by: Zhou Mingying <zhoumy@cn.fujitsu.com> Change-Id: I73cc7d635a0e451fce7fe557f9433f397e107a7a (cherry picked from commit 647ed1cbae42411b187cab794e495f39cf2ec883)
2019-08-25Fix combined dtb names to match original filebuild.automotivelinux.org1-4/+4
Make the filenames conformant to the original files. Thanks to Khouloud Touil for finding this. Good catch! Change-Id: I1e4e95dc1148ddf1a9a3a09c22ceab75d1d88115 Bug-AGL: SPEC-2721 Signed-off-by: build.automotivelinux.org <jenkins@automotivelinux.org>
2019-08-23af-binder: Fix client disconnection closeJosé Bollo1-1/+1
This correctly close sockets. This integrates the following fixes * 99ad30b Fix client disconnection close Bug-AGL: SPEC-2759 Change-Id: Ia37ead39c31081bf99ed63b2e90ff0fe0226c999 Signed-off-by: José Bollo <jose.bollo@iot.bzh>
2019-08-23afs-supervisor: Start the service on needJosé Bollo1-1/+1
afs-supervisor.service failed to start the supervisor due to a non available activation socket. This change start the api socket and will activate the service on need. Bug-AGL: SPEC-2753 Change-Id: I2fd3c2d2d29bce8d70becaba0792918d6f6c0769 Signed-off-by: José Bollo <jose.bollo@iot.bzh>
2019-08-23dbus-cynara: Fix SIGSEGV on disconnectionsJosé Bollo2-0/+111
Sometime, at start of the system, dbus-daemon was crashing because a pending authorisation were reactivating a closed connection. Also, clean unused function and improve compatibilty to newer gcc. Bug-AGL: SPEC-2752 Change-Id: I0ad32e93bd0de099a304e37d0c91c56915fb731c Signed-off-by: José Bollo <jose.bollo@iot.bzh>
2019-08-22agl-service-windowmanager: fix typo on RDEPENDSStephane Desneux1-1/+1
Bug-AGL: SPEC-2768 Change-Id: I0c51b775196563780a097468e2b8db352cb377ad Signed-off-by: Stephane Desneux <stephane.desneux@iot.bzh>
2019-08-20u-boot_2019.07.bbappend: Apply patch for AGL SOTALeon Anavi2-0/+88
Recently we have updated u-boot to version 2019.07 to support Raspberry Pi 4 in AGL based on Yocto release Thud. Therefore a new version of the patch from meta-updater-raspberrypi branch warrior has to be applied to successfully build U-Boot when feature agl-sota is enabled. Bug-AGL: SPEC-2729 Signed-off-by: Leon Anavi <leon.anavi@konsulko.com> Change-Id: Ie72cc9b81ff6e041cfe6edb26f383b7e0d43d8f9 (cherry picked from commit 71aaf3886c5dd98b04cb9c6abe40850090a09fde)
2019-08-20uEnv.txt: Modify uEnv.txt for SOTALeon Anavi2-14/+42
Modify uEnv.txt and uEnv.cma.txt according to the recent changes in layers meta-updater and meta-updater-raspberrypi to ensure that AGL image with agl-sota feature will boot properly on Raspberry Pi 3 B/B+. Bug-AGL: SPEC-2729 Signed-off-by: Leon Anavi <leon.anavi@konsulko.com> Change-Id: Ib8fe74bcd6e12208aaddc81f608fe84eee9de601
2019-08-20dbus-cynara: Simplifies build recipeJosé Bollo7-87/+18
Simplifies the way of building dbus-cynara by removing the specific recipes in favour of a recipe for dbus that handles the class-target build feature. It requires to remove fake dependencies of cynara. This is a suggestion of Tom Rini. Bug-AGL: SPEC-1839 Change-Id: Id7a736eb4b73cdb679fa9dde30e9ad8e56c2894e Signed-off-by: José Bollo <jose.bollo@iot.bzh>
2019-08-13create-combined-dtb: Check if DTB files existLeon Anavi1-8/+20
Check if files exist before creating and deploying DTB. In some cases, for example with AGL SOTA, the DTB and DTBO files might not exist and without checks the recipe will fail. Bug-AGL: SPEC-2729, SPEC-1775 Change-Id: Id96e0c56989569feead076406534334766604cfd Signed-off-by: Leon Anavi <leon.anavi@konsulko.com> (cherry picked from commit 6e89e0296dd28b0c0e9f0f0693f096c281b9d908)
2019-08-06Bump waltham-transmitter src revision.Veeresh Kadasani3-5/+44
SPEC-2696 * 0fc0e97 - waltham-transmitter: Migrate to weston 6.0 Signed-off-by: Veeresh Kadasani <external.vkadasani@jp.adit-jv.com> Change-Id: I1155dc67c45ee6143a3198f198af55274041b13f
2019-08-06meta-agl-bsp: recipes-kernel: linux: Add USB host driverCorentin Labbe1-0/+3
Both qemuarm and qemuarm64 builds lack USB drivers. This patch enable basic USB drivers necessary for them. Change-Id: I35064b0b4018c0953c609cebcab102b898d04f70 Bug-AGL: SPEC-2722 Signed-off-by: Corentin Labbe <clabbe@baylibre.com>
2019-08-06machine: Add readme for ebisuPierre Marzin1-0/+44
Bug-AGL: SPEC-1902 Change-Id: I73fcf4da0e96497ee98a043bdc8d7cc1da1b11a6 Signed-off-by: Pierre Marzin <pierre.marzin@iot.bzh>
2019-08-05Update waltham-transmitter patches to weston 5.0 & 6.0halibut_8.0.0halibut/8.0.08.0.0Veeresh Kadasani8-332/+647
Change-Id: Idedada02d63914f247a137d031e44b15bef16134 Signed-off-by: Veeresh Kadasani <external.vkadasani@jp.adit-jv.com>
2019-08-02wayland-ivi-extension: disable building EGLWLMockNavigation exampleScott Murray4-18/+23
Disable building the EGLWLMockNavigation in wayland-ivi-extension to avoid needing to patch it to build for the TI platforms. This fixes the issue of meta-agl-bsp/meta-ti breaking non-graphics profile builds like the telematics profile, and seems reasonable since there are no known users inside AGL. Since it is no longer needed, also remove the offending patch from meta-agl-bsp/meta-ti. Bug-AGL: SPEC-2677 Change-Id: If87c3c238e880d01f99401ea4610616656f16185 Signed-off-by: Scott Murray <scott.murray@konsulko.com>
2019-08-01meta-rcar-gen3-adas: improve BBFILE descriptionHarunobu Kurokawa1-1/+1
To avoid the followings warning. WARNING: No bb files matched BBFILE_PATTERN_rcar-gen3-cogent Bug-AGL: SPEC-2708 Change-Id: I4bebc3203f947834b9264b4f79b0856c908af493 Signed-off-by: Harunobu Kurokawa <harunobu.kurokawa.dn@renesas.com> (cherry picked from commit b8860aceeaea4bb7dac2da5fab1f18af933e59f9)
2019-07-31bluez5: add obex.service.d conf to fix smack label issuesMatt Ranostay2-0/+7
All data transfer from obexd need to be located in a direcory that has a User::App-Shared label for bindings to be able to access them. This is done by moving the TMPDIR to /run/user/UID/usrshr Bug-AGL: SPEC-2695 Change-Id: I076eb89d0ed14af67811d497217db583e4f5902b Signed-off-by: Matt Ranostay <matt.ranostay@konsulko.com> (cherry picked from commit b999b3e4147d065b55c1a7ce53125f767c0a0c8f)
2019-07-30Bump the distro config for HH 8.0.0Jan-Simon Möller1-1/+1
Bump the distro config to match 8.0.0 Bug-AGL: SPEC-2700 Change-Id: I9e0d93cba8aa82595d71f0025790065cc95775cd Signed-off-by: Jan-Simon Möller <jsmoeller@linuxfoundation.org>
2019-07-30af-binder: Fix error in synchronous callsJosé Bollo1-1/+1
There fixes a bug with an inversion between info and error in implementation of synchronous calls, leading to bad detection of errors. Includes: * 91de250 Fix detection of error in call synchronous Bug-AGL: SPEC-2697 Change-Id: I42f2e9872f363526a2378e07afa21664863fec3a Signed-off-by: José Bollo <jose.bollo@iot.bzh>
2019-07-29lightmediascanner: remove user media directories scanningMatt Ranostay1-1/+1
Since lightmediascanner is now a system service it shouldn't scan user directories of the running user. For any demo uses of preloaded media it should be put in a directory under /media Bug-AGL: SPEC-2655 Change-Id: Ib62527f0742673081e1f225e98fe7eff90738e0e Signed-off-by: Matt Ranostay <matt.ranostay@konsulko.com>
2019-07-26intel-corei7-64: Remove ttyS2 from SERIAL_CONSOLESScott Murray1-0/+2
Remove ttyS2 from SERIAL_CONSOLES in the intel-corei7-64 include file. This quiets the log spamming on Up^2 from the device not being present. The commit that added ttyS2 to SERIAL_CONSOLES in meta-intel (61634f8) does not explain what boards need it, but since neither the minnowboard or Up^2 do, not having it by default seems reasonable. Bug-AGL: SPEC-2678 Change-Id: I9afd1584dd7b92e8d15363c3119b770c592b3c52 Signed-off-by: Scott Murray <scott.murray@konsulko.com> (cherry picked from commit a3564c68e9a5268ede1988a65559cb22a0fd98b5)
2019-07-26recipes-multimedia: lightmediascanner: move database to globally accessible areaMatt Ranostay1-2/+1
On runtime the agl-service-mediaplayer needs to access the sqlite3 database from lightmediascanner. Thus the database needs to be in an accessible location, and with the correct permissions. Bug-AGL: SPEC-2655 Change-Id: Ia1fc9ce7fa2f782ebc1784e130152baebb441cad Signed-off-by: Matt Ranostay <matt.ranostay@konsulko.com> (cherry picked from commit 03ef60ee0aed59deb1f554a3a194ad2ff54be276)
2019-07-25Enable eglfs for QT based application in cluster profileOuyang Jun2-0/+38
Platform eglfs should be enabled if using a qtwayland compositor instead of weston. Bug-AGL: SPEC-2487 Signed-off-by: Ouyang Jun <ouyangj.fnst@cn.fujitsu.com> Signed-off-by: Zhou Mingying <zhoumy@cn.fujitsu.com> Signed-off-by: Liu Wenlong <liuwl.fnst@cn.fujitsu.com> Change-Id: Ic4d35999ea5f3f08b7a47baa5cf2f48bc01df6ee (cherry picked from commit b2881c336770d5a04a6b0ec8595617cad85d7dcf)
2019-07-25Bump cmake-apps-module revisionFrederic Marec1-1/+1
Bump revision following gerrit review 21859 bd9e1c9 Fix new target test-tree d9af887 Add automatic test tree creation 5a26df7 02-variables.cmake: Fix wrong variable tested 7593f0f Recurse path when using fallback zip tool 4e1d47b CMake Nav Panel: Changed configuration title afba79c CMake project arch: Fixed title to match nav panel c26a064 CMake Configuring: Updated topic title. b99684d CMake Overview: Added TOC links and edits. 0c10393 Book manual updates for CMake Templates f46dcf2 02-variables.cmake: project options for 3.12.4 1e0f297 02-variables.cmake: project options for 3.12.4 3490ab7 02-variables.cmake: warns - unset project options 9ad5e65 02-variables.cmake: fix project cmake-commands 74fd1a5 Fix cmake-apps-module document typo. 2345e80 CMake: Complete re-write of the CMake topic. 9c07127 CMake Topic book: Updated for the new file names. 2710740 CMake Section: Complete re-write. 16829a3 cmake-apps-module: New file names. a6daa45 autobuild: fix warnings due to cp command exit code bcdefaf docs: add yaml book f3ce787 Avoid a target to link against itself Bug-AGL: SPEC-2040 Change-Id: I51d60cf572eb2a9a49ed25d3bb162c4f70b0b316 Signed-off-by: Frederic Marec <frederic.marec@iot.bzh> (cherry picked from commit 47090c323cb7d3a17c7b0d99f0678311ed829447)
2019-07-25recipes-multimedia: lightmediascanner: switch from user dbus session to systemMatt Ranostay4-15/+69
To avoid multiple instances of lightmediascanner from being created it should run only once in the system dbus session. Bug-AGL: SPEC-2655 Change-Id: I6c9510926f82ec9eb5625d63d08998a145504227 Signed-off-by: Matt Ranostay <matt.ranostay@konsulko.com> (cherry picked from commit af1c6967f09a51c600742de6e299255ff07b4a47)
2019-07-25Change AGL_BRANCH to halibutJan-Simon Möller1-1/+1
Release branches are created. Now use the new branches. Signed-off-by: Jan-Simon Möller <jsmoeller@linuxfoundation.org> Change-Id: I263ed30f347648a462c2bb4180e5a1faa7402b7d