summaryrefslogtreecommitdiffstats
path: root/meta-agl-bsp
AgeCommit message (Collapse)AuthorFilesLines
2019-09-04Add nogfx build for h3ulcbJan-Simon Moeller1-0/+10
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-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-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-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-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-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-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-02wayland-ivi-extension: disable building EGLWLMockNavigation exampleScott Murray2-18/+0
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-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-25Fix i.MX6 multiple package tuning problemScott Murray3-0/+15
Update the i.MX6 machine definition include files to disable the dynamic package architecture logic in meta-freescale, as it conflicts with AGL's setting of DEFAULTTUNE and results in a split package feed. Bug-AGL: SPEC-2665 Change-Id: I66ff03b0bc48b3b768b9ec88c907eaa95e1a2b00 Signed-off-by: Scott Murray <scott.murray@konsulko.com> (cherry picked from commit 1b2c904f1e4403b59fc51f8f68d4fa8f05d03332)
2019-07-24bcm2835-bootfiles.bbappend: Support Raspberry Pi 4Leon Anavi1-0/+11
Use different bootfiles if the machine has been set to the new Raspberry Pi 4 and keep the old files for Raspberry Pi 3. Bug-AGL: SPEC-2656 Signed-off-by: Leon Anavi <leon.anavi@konsulko.com> Change-Id: I3cbacc45c0f82ce2c70641c008ad2975a9e58fbd
2019-07-24rpi-config_git.bbappend: Update for Raspberry Pi 4Leon Anavi1-0/+20
Extend the deploy task to support Rasppberry Pi 4. Bug-AGL: SPEC-2656 Signed-off-by: Leon Anavi <leon.anavi@konsulko.com> Change-Id: I3a166a873b431539e154ef6a2b1e69df02a0f2a3
2019-07-24u-boot_2019.07: Bootloader for Raspberry Pi 4Leon Anavi6-0/+457
Add U-Boot version that supports Raspberry Pi 4. Bug-AGL: SPEC-2656 Signed-off-by: Leon Anavi <leon.anavi@konsulko.com> Change-Id: Ib550e38c7ecaf0ab2149b04666cffdcbaaf08134
2019-07-24linux-raspberrypi: Add 4.19 for Raspberry Pi 4Leon Anavi5-1/+158
Add recipe for Linux kernel 4.19 for Raspberry Pi 4 and keep 4.14 for Raspberry Pi 3. The recipe for 4.19 is backported from master branch of the upstream of meta-raspberrypi. Bug-AGL: SPEC-2656 Signed-off-by: Leon Anavi <leon.anavi@konsulko.com> Change-Id: I93bbc5527383e26862894859bff6e44a6bc17966 Signed-off-by: Leon Anavi <leon.anavi@konsulko.com>
2019-07-24raspberrypi4.conf: Add machine definitionLeon Anavi1-0/+25
Add a new machine definition for Raspberry Pi 4 because it is not present in branch thud of meta-raspberrypi. This machine definition is taken from the master branch of the upstream of Yocto/OE layer meta-raspberrypi. Bug-AGL: SPEC-2656 Signed-off-by: Leon Anavi <leon.anavi@konsulko.com> Change-Id: I368f6c7107ca023da66ce60d2006984f8939cf00
2019-07-23linux-renesas: Add ADSP patch only for m3ulcbPierre Marzin1-1/+1
The patch are only used for the m3ulcb machine. Bug-AGL: SPEC-2564 Change-Id: Idfca2b7a48b7a53efee6dcf2f21b0f8932d7b43d Signed-off-by: Pierre Marzin <pierre.marzin@iot.bzh>
2019-07-23machine: Add new ebisu machinePierre Marzin4-1/+19
* Add ebisu dependency within renesas bootfiles * Delete rcar ADAS layers support * Add weston video output config * Add missing modules and gst plugin Bug-AGL: SPEC-2564 Change-Id: I61a44f831d0bc55210847eade2a1eacc7599fa74 Signed-off-by: Pierre Marzin <pierre.marzin@iot.bzh>
2019-07-13Revert "Fix rpi touchscreen support on master"Jan-Simon Moeller9-1120/+4
We need to reconsider this changeset. It seems to produce a regression. This reverts commit ccb667c35ffdea7a2bc1304750e6b22368cd55f7. Change-Id: I42754a899e8530f4e18a069ed227f18a8d615801
2019-06-27linux-agl: change aloop to a module instead of built-inScott Murray2-4/+4
Rename the 4a-sound.cfg fragment to the more generic sound.cfg, and change CONFIG_SND_ALOOP to module, not built-in. This still keeps it available if something ends up needing it. Bug-AGL: SPEC-2555 Change-Id: Ib0554800dc704d19b48a7e041d4f2b60a1b42192 Signed-off-by: Scott Murray <scott.murray@konsulko.com>
2019-06-23Move the agl-service-radio to the graphical profileJan-Simon Möller1-5/+0
The agl-service-radio relies on gstreamer. Unfortunately the gstreamer recipe is currently setup to also pull-in wayland (due to a compile-flag if wayland is in DISTRO_FEATURES). To keep the distro aligned, we don't want to change the DISTRO_FEATURES between the profiles, thus we move the agl-service radio to the graphical profile where we include weston anyway by default. For now this means there is no radio service (or mediaplayer service) w/o wayland installed as well. In case we get this requirement, we'll have to work on the gstreamer recipe and its split. v2: fix bbapend in meta-agl-bsp/meta-rcar-gen3 v3: put packagegroup-agl-graphical-multimedia.bbappend in graphical profile (not the best place IMHO) This fixes the non-graphical build. Bug-AGL: SPEC-2500 Change-Id: I5ebec7d7713510f3fcd50ae425d7f8cbb6328016 Signed-off-by: Jan-Simon Möller <jsmoeller@linuxfoundation.org>
2019-06-21SPEC-2376: Add config for QEMU arm kernelsCorentin Labbe3-0/+11
The default yocto qemuarm machine is versatilepb which is not the right choice for AGL (ex: Max 256M of RAM). This patchs change qemuarm configs for using the virt machine. Change-Id: Ib5e0ae801ba152318a2455763b1a2f1020d1858e Bug-AGL: SPEC-2376 Signed-off-by: Corentin Labbe <clabbe@baylibre.com>
2019-06-20meta-rcar-gen3/setup_mm_packages.sh: always clean workdirStephane Desneux1-0/+6
The script setup_mm_packages.sh setups a temp dir to extract proprietary drivers for Renesas BSP, but it's not re-entrant: the temp dir is not cleaned after execution. With the introduction of the change 9bc6c25 (hotfix for GFX issues), more cleanup is needed to avoid duplicate zips detection in the copy script located in meta-rcar-gen3/docs/sample/copyscript/copy_evaproprietary_softwares.sh This change makes some initial cleanup in the workdir (in case of transition from a previous script without this patch) and also removes the workdir at the end Bug-AGL: SPEC-2253, SPEC-2480 Change-Id: Ia95f9045d8a695d550a061710a17676088a92c0a Signed-off-by: Stephane Desneux <stephane.desneux@iot.bzh>
2019-06-20Add cubox-i and nitrogen6x i.MX6 machinesScott Murray3-0/+44
Add the cubox-i (covering SolidRun Cubox-i, Hummingboard Gate and Edge), and nitrogen6x (covering Nitrogen 6x and SABRE Lite) machine definitions. Note that support for the Broadcom Bluetooth chipset on the SolidRun i.MX6 SOM is currently missing, as it requires firmware that is not available in either the linux-firmware package or from the firmware packages provided by meta-freescale. Bug-AGL: SPEC-2517 Change-Id: If7bdb9f1af9bb67dba5c1ff836a6d3b04160fefd Signed-off-by: Scott Murray <scott.murray@konsulko.com>
2019-06-20meta-agl-bsp: Changes to get imx6qdlsabreauto working with etnavivScott Murray5-29/+49
Update imx6qdlsabreauto configuration to use open source etnaviv GPU driver instead of Vivante. The previously required weston-ini-conf has been removed as it is not required with etnaviv, and a bbappend has been added for the linux-fslc kernel that this configuration uses so it will pull in the AGL kernel bits. Additionally, the kernel configuration for linux-fslc is tweaked with config fragments to better match the other AGL platforms. Bug-AGL: SPEC-1674, SPEC-2502 Change-Id: Ic40d310b48405ccc7d1435f0fc9f162a129cffe9 Signed-off-by: Scott Murray <scott.murray@konsulko.com>
2019-06-11Merge "Do not pull pulseaudio-misc if pulseaudio is not enabled"Jan-Simon Moeller1-1/+1
2019-06-11Merge "Import aglsetup templates and config for BBE"Jan-Simon Moeller1-0/+43
2019-06-12Do not pull pulseaudio-misc if pulseaudio is not enabledJan-Simon Möller1-1/+1
This fixes a build issue on ti vayu Missing or unbuildable dependency chain was: ['agl-demo-platform', 'pulseaudio-misc', 'alsa-plugins-pulseaudio-conf'] Bug-AGL: SPEC-2473 Change-Id: I9f9c85893b30a8aa98a6da1e76440a0df5076fa2 Signed-off-by: Jan-Simon Möller <jsmoeller@linuxfoundation.org>
2019-06-11Update weston ini file to adopt remoting pluginHarunobu Kurokawa1-7/+4
Bug-AGL : SPEC-2420 To use remoting plugin, we should use new section in weston.ini. Example) [remote-output] name=remote-1 mode=384x368@30 host=192.168.10.30 port=5005 Man) https://gitlab.freedesktop.org/wayland/weston/blob/master/man/weston-drm.man#L149 https://gitlab.freedesktop.org/wayland/weston/merge_requests/7 Change-Id: Ifc271867dd2b1f2fe1794a08af188006f7b7779b Signed-off-by: Harunobu Kurokawa <harunobu.kurokawa.dn@renesas.com>
2019-06-11Import aglsetup templates and config for BBEPaul Barker1-0/+43
The templates and config include files used with aglsetup.sh to build for the Sancloud BBE are imported from the meta-sancloud layer. This should make future maintenance easier. The templates are updated to match the new repository structure at the same time. Bug-AGL: SPEC-2507 Change-Id: I2b4717bd79d949a12b13e6bfece152e82bb8114c Signed-off-by: Paul Barker <paul.barker@sancloud.co.uk>
2019-06-10Merge "Changes to support the repo clone rework"Jan-Simon Moeller2-5/+5
2019-06-10Changes to support the repo clone reworkJan-Simon Möller2-5/+5
To be merged together with: https://gerrit.automotivelinux.org/gerrit/#/c/AGL/AGL-repo/+/21389/ v2: fix the aglsetup script v3: fix scripts to extract m3ulcb v4: use single folder for BSPs Bug-AGL: SPEC-2450 Change-Id: I3227896c68ec1413f55cf67ad8f15a7adfe87a52 Signed-off-by: Jan-Simon Möller <jsmoeller@linuxfoundation.org>
2019-06-09Merge "Pin SRCREV used by ti-sgx-ddk-km"Jan-Simon Moeller1-0/+1
2019-06-09Merge "Fix rpi touchscreen support on master"Jan-Simon Moeller9-4/+1120
2019-06-07Fix : do_patch waring weston 6.0.0Harunobu Kurokawa1-5/+5
Backport weston patch to Fix do_patch warning. http://git.yoctoproject.org/cgit/cgit.cgi/poky/tree/meta/recipes-graphics/wayland/weston/0001-make-error-portable.patch -- WARNING: weston-6.0.0-r0 do_patch: Some of the context lines in patches were ignored. This can lead to incorrectly applied patches. The context lines in the patches can be updated with devtool: devtool modify <recipe> devtool finish --force-patch-refresh <recipe> <layer_path> Then the updated patches and the source tree (in devtool's workspace) should be reviewed to make sure the patches apply in the correct place and don't introduce duplicate lines (which can, and does happen when some of the context is ignored). Further information: http://lists.openembedded.org/pipermail/openembedded-core/2018-March/148675.html https://bugzilla.yoctoproject.org/show_bug.cgi?id=10450 Details: Applying patch 0001-make-error-portable.patch patching file configure.ac Hunk #1 succeeded at 126 with fuzz 2 (offset 17 lines). patching file libweston/weston-error.h patching file libweston/weston-launch.c Now at patch 0001-make-error-portable.patch Bug-AGL: SPEC-2499 Change-Id: If80c4e71be1f58362c78fec9ca6c2ca29d224c39 Signed-off-by: Harunobu Kurokawa <harunobu.kurokawa.dn@renesas.com>
2019-06-06Pin SRCREV used by ti-sgx-ddk-kmPaul Barker1-0/+1
The commit of the omap5-sgx-ddk-linux git repository used by the ti-sgx-ddk-km recipe is changed by recent commits to meta-ti to introduce generic support for armel (soft-float) targets. This conflicts with the existing patch in meta-agl which adds support for our toolchain. The simplest fix is to pin to a working commit by setting SRCREV to the previous commit on the same branch. This is the same commit that is currently used and so it won't have any effect until the meta-ti layer itself is updated. For reference, the commit in question can be seen here: https://git.ti.com/graphics/omap5-sgx-ddk-linux/commit/dbdbd9309a58ee723fc827ef5fd45c28347cf61f Bug-AGL: SPEC-2490 Change-Id: I2924cdadd697680567a9378eb3242f8dd526a429 Signed-off-by: Paul Barker <paul.barker@sancloud.co.uk>
2019-06-06[RCAR] Remove unnecessary device tree fileHarunobu Kurokawa1-0/+20
Bug-AGL: SPEC-2486 Change-Id: Ic0cf9128d1630ede1af8024e3bd5258b7529b683 Signed-off-by: Harunobu Kurokawa <harunobu.kurokawa.dn@renesas.com>
2019-06-05Fix rpi touchscreen support on masterJan-Simon Möller9-4/+1120
We seem to miss a few bits that changed between kernel 4.9 and kernel 4.14 regarding the 7'' touchscreen. One addition is the rpi-backlight.dtbo which we also need to use in our create-combined-dtb recipe for CI use. We also seem to require https://github.com/raspberrypi/linux/pull/2693#issue-217750943 . Thanks to Scott Murray for the help digging through this. v2 and v3: add devicetree changes v4 and v5: fix name of dtbo v6: move append to machine include - we need it as a global var v7: add to config.txt for sdcard boot case Bug-AGL: SPEC-2465 Change-Id: I2bb3cd974b74a790292e1f36ffdca034928e0bca Signed-off-by: Jan-Simon Möller <jsmoeller@linuxfoundation.org>
2019-05-29Add weston 6.0.0 for WM and HS rewriteJan-Simon Möller9-1/+432
As requested for the WM and HS rewrite. Tested on m3, minnow, qemux86-64, rpi3. (cherry picked from commit fda5568cf4bc268088c9d1f925007d682bb7ef5d) Multiple commits to applied at once. Bug-AGL: SPEC-2444 Change-Id: I3f74b40213d4c4a65400a53fe9c57f52fe3b6096 Signed-off-by: Jan-Simon Möller <jsmoeller@linuxfoundation.org>
2019-05-28Merge "SPEC-2376: Add virtio configs for QEMU arm/arm64 kernels"Jan-Simon Moeller2-0/+5
2019-05-28SPEC-2376: Add virtio configs for QEMU arm/arm64 kernelsCorentin Labbe2-0/+5
QEMU arm/arm64 need some VIRTIO configs for having storage for rootfs. Bug-AGL: SPEC-2376 Change-Id: Ia4b53092418b9f5e4040b8dafc58262a98bcac46 Signed-off-by: Corentin Labbe <clabbe@baylibre.com>
2019-05-24On master enable the CONFIG_USB_NET_SMSC75XX driverbuild.automotivelinux.org1-3/+3
This is for the 3b+ board. Change-Id: I428a12b836c1f7c3f01b29602e666ae28efd647f Bug-AGL: SPEC-2456 Signed-off-by: build.automotivelinux.org <jenkins@automotivelinux.org>
2019-05-24Merge "setup_mm_packages.sh: Use GFX 3.19 binaries instead of 3.15"Stéphane Desneux1-0/+48
2019-05-24setup_mm_packages.sh: Use GFX 3.19 binaries instead of 3.15Pierre MARZIN1-0/+48
Renesas BSP 3.19 is not actually available. But the graphics binaries are. So this patch get the 3.19 GFX binaries to patch the 3.15 GFX binaries ones. To achieve that, the following zip is needed: "R-Car_Gen3_Series_Evaluation_Software_Package_for_Linux-weston5-20190516.zip" (Note: the name of the zip can change). By this way, BSP 3.15 of Renesas will be used with the 3.19 GFX binaries. This solves the graphic issue of the M3ULCB and H3ULCB boards. This hotfix has been tested on m3ulcb with success. Warning: This patch has to be revert when the BSP of Renesas will be updated to 3.19 (at least). Bug-AGL: SPEC-2253 Change-Id: Ieaab76fb08618f9994c3ff5969d9a361d08b65d2 Signed-off-by: Pierre MARZIN <pierre.marzin@iot.bzh>
2019-05-21Remove the 64bit rpi3 targetJan-Simon Möller1-25/+0
As memory is already low on 32-bit, the 64-bit target is deprecated for now. There is no benefit in maintaining two targets atm. Change-Id: I29d755ff70693280dcc1e4ce996bd4c2894bacfb Bug-AGL: SPEC-2323 Signed-off-by: Jan-Simon Möller <jsmoeller@linuxfoundation.org>
2019-05-14meta-agl-bsp: meta-sancloud: weston-ini-conf: Use 720p resolution where possiblePaul Barker1-0/+3
The BBE is has fairly limited CPU and Graphics power so everything is sluggish at 1080p. Things work much better at 720p. However, if the 'hdmi-a-1-270.cfg' file has been removed (for example, when building the cluster demo) then don't try to modify it. Bug-AGL: SPEC-2409 Change-Id: I614bf6a7d65f5d51b6f9b1b776851562151fe2f6 Signed-off-by: Paul Barker <paul.barker@sancloud.co.uk>
2019-05-14meta-agl-bsp: meta-sancloud: weston-ini-conf: Set correct gbm-formatPaul Barker1-0/+3
The default gbm-format needs to be changed on the BeagleBone Enhanced due to a hardware errata on the AM335x SoC. For further details see the following section of the TI wiki: http://processors.wiki.ti.com/index.php/Processor_Linux_SDK_Graphics_and_Display#AM3_Beagle_Bone_Black_Board_Configuration The TI documentation recommends further changes to powervr.ini and qt_env.sh. The change to powervr.ini is already applied in the meta-sancloud layer and the change to qt_env.sh was found not to be needed. Bug-AGL: SPEC-2409 Change-Id: Iec91ab939b13bd4f936e64681d45931dafb8ee91 Signed-off-by: Paul Barker <paul.barker@sancloud.co.uk>
2019-05-14meta-agl-bsp: meta-sancloud: linux-bbe: Reserve 256MB for CMAPaul Barker2-0/+5
The tilcdc DRM driver needs more CMA memory available than we reserve by default in order to give a working GUI in AGL guppy. Bug-AGL: SPEC-2409 Change-Id: I0e09773c37133db86520fc15ed0ad11e80382b2e Signed-off-by: Paul Barker <paul.barker@sancloud.co.uk>