aboutsummaryrefslogtreecommitdiffstats
path: root/templates
AgeCommit message (Collapse)AuthorFilesLines
2019-12-05Follow move of agl-image-ivi-crosssdk to meta-agl-demoJan-Simon Moeller2-2/+2
The latest changes require a follow-up. Bug-AGL: SPEC-2500 . Change-Id: Ibfbdb1c01be3a3548860313854ab45bd58748597 Signed-off-by: Jan-Simon Moeller <jsmoeller@linuxfoundation.org>
2019-12-04Move packages from agl-core to agl-iviRonan Le Martret1-9/+18
Bug-AGL: SPEC-2500 v2: moved packagegroup-agl-core-navigation as packagegroup-agl-ivi-navigation to meta-agl-demo Change-Id: I9ce852c80cc7c9789c087517aeee6ce38947a270 Signed-off-by: Ronan Le Martret <ronan.lemartret@iot.bzh> Signed-off-by: Jan-Simon Möller <jsmoeller@linuxfoundation.org>
2019-11-26agl-compositor: Add DISTRO_FEATURE to enable compositorDaniel Stone2-0/+14
When the 'agl-compositor' distro feature is enabled, the AGL compositor will be enabled and start at boot instead of Weston. Change-Id: Idcd0c401c3d2c332637ddde1cd83d1fe85c4ae2a Signed-off-by: Daniel Stone <daniels@collabora.com>
2019-11-19raspberrypi4/50_local.conf.inc: Use Image formatLeon Anavi1-0/+5
Use the "Image" format for 64-bit AGL images for Raspberry Pi 4. Bug-AGL: SPEC-2936 Change-Id: I4c671ed3cc775cd3356cb2e35a8ac73efd54603e Signed-off-by: Leon Anavi <leon.anavi@konsulko.com>
2019-11-19ebisu: Update setup.sh to adopt multiple zip fileHarunobu Kurokawa1-1/+4
Bug-AGL: SPEC-2564 Change-Id: I4462128c52b70ab6e5abcba5d89bf5b02cc79e17 Signed-off-by: Harunobu Kurokawa <harunobu.kurokawa.dn@renesas.com>
2019-11-05raspberrypi*/50_local.conf.inc: Update rpi 3/4Leon Anavi2-9/+0
Use the same versions for Linux kernel and Mesa on both Raspberry Pi 3B/B+ and 4. This allows to run firmware KMS that supports HDMI and the official 7" Raspberry Pi touch screen DSI display. Bug-AGL: SPEC-2465 Change-Id: I7ae5739bbb6b8d2efd3264d3d1eab9c28e6f2559 Signed-off-by: Leon Anavi <leon.anavi@konsulko.com>
2019-09-19raspberrypi*/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-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-05Add nogfx build for h3ulcbJan-Simon Moeller3-0/+20
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-04Revert "Add nogfx build for h3ulcb"Jan-Simon Moeller3-20/+0
This seems to have broken master. Needs to be edited. Thus revert and resubmit. This reverts commit dd21b3a6e340006d2ef4036cabf33c9e9a66e9ac. Change-Id: I2423dacba83813cc6350096c89d80cf1d23e9568
2019-09-03Add nogfx build for h3ulcbJan-Simon Moeller3-0/+20
Before we can add the h3 to CI we need a -nogfx build. v2: moved common bits Signed-off-by: Jan-Simon Moeller <jsmoeller@linuxfoundation.org> Change-Id: I9d64764fbe69dc901dc91941db1deb0073e2ae9c
2019-08-2750_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>
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-07-24templates: Add templates for Raspberry Pi 4Leon Anavi2-0/+6
Add local.conf and bblayears.conf templates for Raspberry Pi 4. Bug-AGL: SPEC-2656 Signed-off-by: Leon Anavi <leon.anavi@konsulko.com> Change-Id: I51fb521e4cb8e963420cbe7c68272299a592840e
2019-07-24add markdown documentation for all machines and featuresStéphane Desneux46-8/+474
THIS IS STILL WIP - not all features/machines are described Bug-AGL: SPEC-1902 Change-Id: I9bd5a3f57946199e1da90cfbed020742710218a1 Signed-off-by: Stéphane Desneux <stephane.desneux@iot.bzh>
2019-07-23ebisu: Add the support of a custom setup scriptPierre Marzin1-5/+10
Used to customise a setup to add specific stuff. Bug-AGL: SPEC-2564 Change-Id: I8d18d026aaeb7c35a53164ea2f1a62f510ad4217 Signed-off-by: Pierre Marzin <pierre.marzin@iot.bzh>
2019-07-23ebisu: Use a specified path to integrate binariesPierre Marzin1-4/+19
E3 binary should be ZIPped into one archive and the path to its location should be exported to the environnement before setting up the AGL build. Bug-AGL: SPEC-2564 Change-Id: Ie26ba0246e7fbd0fe923fcbe0f4b4160c6d7e0f2 Signed-off-by: Pierre Marzin <pierre.marzin@iot.bzh>
2019-07-23ebisu: Update setup fragment to copy binariesPierre Marzin1-4/+16
Use copy_proprietary_softwares.sh script to manage the zip binaries pasted into "$METADIR/binary-tmp". Bug-AGL: SPEC-2564 Change-Id: I256d1200e03ab9a9482e29d7f42016f99c7ba16c Signed-off-by: Pierre Marzin <pierre.marzin@iot.bzh>
2019-07-23machine: Add new ebisu machinePierre Marzin3-0/+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-06-26agl-hmi-framework: remove virtual/navigation over-rideScott Murray1-1/+0
Remove dangling PREFERRED_PROVIDER over-ride of virtual/navigation that was forcing the use of the older navigation application instead of the setting of the newer ondemandnavi application done in the distro configuration. Bug-AGL: SPEC-2576 Change-Id: Id6f7d6636bef5cf40dc5085b02030acd0e7d494d Signed-off-by: Scott Murray <scott.murray@konsulko.com>
2019-06-20Add cubox-i and nitrogen6x i.MX6 machinesScott Murray6-0/+23
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-11Import aglsetup templates and config for BBEPaul Barker2-0/+7
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-11Merge "feature/agl-ci-*: include agl-pipewire instead of agl-audio-4a-framework"Jan-Simon Moeller4-4/+4
2019-06-10Changes to support the repo clone reworkJan-Simon Möller18-34/+34
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-10feature/agl-ci-*: include agl-pipewire instead of agl-audio-4a-frameworkGeorge Kiagiadakis4-4/+4
Bug-AGL: SPEC-2473 Change-Id: I2ff9ec3f5a55b32737c858c5eb2e835b582af0e4 Signed-off-by: George Kiagiadakis <george.kiagiadakis@collabora.com>
2019-05-23Move hmi-framework and eg-virt from meta-agl-devel to meta-aglJan-Simon Möller2-0/+14
Part of the layer cleanup. Bug-AGL: SPEC-2450 Change-Id: I0e0517c6f5aeaa1378715acde8adda6200119aba Signed-off-by: Jan-Simon Möller <jsmoeller@linuxfoundation.org>
2019-05-21Remove the 64bit rpi3 targetJan-Simon Möller2-4/+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-04-29Merge "Add ARC HSDK board support"Jan-Simon Moeller2-0/+4
2019-04-29Merge "Remove inactive devices"Jan-Simon Moeller10-29/+0
2019-04-29Remove inactive devicesJan-Simon Möller10-29/+0
Remove device which are EOL, unused or do not work. As discussed during the SAT call: - rpi2 : -- will not work for IVI due to the CPU -- use the rpi3 instead - joule : -- EOL for ~1y, no longer available for purchase, no way to test. i.MX6: Remove currently unmaintaned boards. Can re-add on request. - imx6qsabrelite: -- replaced with uprev'd imx6qsabreauto -> imx6qdlsabreauto - nitrogen6x: -- no thud branch upstream. Bug-AGL: SPEC-2323 Change-Id: I28a70dcb7b48b6a9396d3003cc34d4c1f6570eca Signed-off-by: Jan-Simon Möller <jsmoeller@linuxfoundation.org>
2019-04-26Add ARC HSDK board supportEvgeniy Didin2-0/+4
This changeset adds the necessary files to build image for Synopsys ARC HS Development Kit (HSDK). Most of necessary tunnings are stored in meta-synopys layer. Synopsys DesignWare HSDK (which stands for ARC HS Development Kit) is the latest and greatest development platform that sports quad-core ARC HS38 in real silicon. Most noticeable features of the board are: * Quad-core ARC HS38 CPU running at 1GHz * 4Gb of DDR * Built-in Vivante GPU * Built-in Wi-Fi/Bluetooth module Peripherals: * [micro] SD-card slot * 2 USB 2.0 ports * 1Gbit Ethernet port * Built-in Digilent JTAG probe * Serial port accessible via micro-USB port New feature: SPEC-2346 Change-Id: I8772ee51cc3db9f6549da2d6a5ea2d116586cde6 Signed-off-by: Evgeniy Didin <didin@synopsys.com>
2019-04-23Fix imx6qdlsabreauto machine configurationBechir Mghirbi4-6/+4
The imx6qsabreauto target was falling behind and could not be build for GG-7.0. The commit 808fff5 from 'AGL-repo' removed reference to external repos meta-freescale-3rdparty and meta-freescale-distro. However 'meta-agl' was not updated to follow up on this change which broke configuration for imx6 based targets. This patch makes the required changes to fix the imx6qsabreauto machine configuration: - removes reference to deleted layers: meta-freescale-3rdparty and meta-freescale-distro - updates MACHINE value to imx6qdlsabreauto as defined in meta-freescale layer - deletes reference to packagegroup-fscl-* not required to build AGL - add "agl-medium-arm-compiler" to DISTRO_FEATURES so DEFAULTTUNE is correctly set to 'armv7athf-neon' v2 (jsmoeller): moved board name to match MACHINE v3 (bechir.mghirbi): - remove wayland_2.0.0 as weston_4.0.0.imx is used. - use default IMAGE_FSTYPES as bitbake is complaining that no IMAGE_CMD defined for IMAGE_FSTYPES entry 'sdcard' - Add CFG80211 Kernel configuration Change-Id: Ib8b1d254972c737725247a5b13ce333e8ef9d4dc Signed-off-by: Bechir Mghirbi <bechir.mghirbi@grammer.com> Signed-off-by: Jan-Simon Möller <jsmoeller@linuxfoundation.org>
2019-03-22Fix the wrong comment of base template fileKazumasa Mitsunari1-1/+1
Change-Id: Ia0dc7fd78f713d9bd68e1e51a84403378e083777 Signed-off-by: Kazumasa Mitsunari <knimitz@witz-inc.co.jp>
2019-03-11Add initial feature for license scanning integrationJan-Simon Möller3-0/+7
This adds a feature to enable license scanning within the AGL build. Change-Id: I478defd90f6f135b5f1f0ecd0b970ab33f25c794 Signed-off-by: Jan-Simon Möller <jsmoeller@linuxfoundation.org>
2019-03-07Remove unused isafw featureJan-Simon Möller2-2/+0
Remove old feature during uprev cycle. Change-Id: I995513464f03db2dcab0ae692ee66037291295a5 Signed-off-by: Jan-Simon Möller <jsmoeller@linuxfoundation.org>
2018-12-20Add instrument cluster profile definitionsScott Murray4-0/+8
Add definitions for instrument cluster profiles for plain Wayland/Weston based images and images that also include Qt5 support. Due to the current requirement that profiles only be a superset of one parent profile, the Qt5 profile inherits from agl-profile-graphical-qt5 and not agl-profile-cluster as one might expect. This is due to some of the required recipes and bbappends for Qt5 usage only being available in the meta-agl-profile-graphical-qt5 layer. Change-Id: I863b35bdc009775ac204a720bbc2cc85e71c268a Signed-off-by: Scott Murray <scott.murray@konsulko.com>
2018-11-22Add ptest to ci and snapshot buildsJan-Simon Möller4-4/+4
Now we are able to run the ptest's , thus add them to the build Change-Id: I9779625065a893a03b87b913569ed0699d85ed5e Signed-off-by: Jan-Simon Möller <jsmoeller@linuxfoundation.org>
2018-10-02Create a feature to activate pulseaudio in AGLRonan Le Martret1-0/+2
If pulseaudio is wanted you can use the feature agl-pulseaudio, to add pulseaudio to DISTRO_FEATURES, and so, add pulseaudio to AGL distribution. Bug-AGL: SPEC-1601 Change-Id: Ic6fcad968428c9f337f318369eef822e5e9ff84d Signed-off-by: Ronan Le Martret <ronan.lemartret@iot.bzh>
2018-10-02Fix image build with PR timestampRonan Le Martret1-2/+2
* If we using _append with PKGR the image creation failed. The _append action is done twice and so corrupt the PKGR value. Change-Id: Ia549e83a33ed667cd246a24f9a83a89d9c3f97a9 Signed-off-by: Ronan Le Martret <ronan.lemartret@iot.bzh>
2018-09-28Add an AGL revision to the RPM packageRonan Le Martret1-0/+68
* To update a rpm file (with dnf) we need to have a valid rpm revision. Let 2 packages pkg_1 and pkg_2 (built in yocto). If pkg_2 is newer than pkg_1, and one wants to be able to update it with dnf, it must respect some rpm naming rules. if ${pkg_2_name} > ${pkg_1_name} -> pkg_2 is newer than pkg_1 elif ${pkg_2_name} = ${pkg_1_name} and ${pkg_2_revision} > ${pkg_1_revision} -> pkg_2 is newer than pkg_1 else -> pkg_2 is equal or older than pkg_1 Currently, the Yocto build process (used by AGL, so whithout special service) doesn't change revisions for a build. So packages are not updatable from a repository with dnf. * This patch adds an option -r|--rpm-revision <schema> to aglsetup.sh so that RPMs produced by bitbake will have correct revisions suitable for binary publishing. <schema> can be: 'prservice[:<address>]' : Use a PR service daemon. if <address> is not specified, the default value 'localhost:0' is used (shortcut for a PR service started by bitbake) 'timestamp' : Use a generated time stamp (UTC). 'value:<revision>' : Use <revision> explicitly. 'none' : Do nothing. p16: change --rpm-revision options parsing, use UTC timestamps, refactor code p19: remove smart parsing of host:port for prservice option - back to dumb option Bug-AGL: SPEC-920 Change-Id: I1f4c9fd093fa350d19450a12ac1847885740596d Signed-off-by: Ronan Le Martret <ronan.lemartret@iot.bzh> Signed-off-by: Johann CAHIER <johann.cahier@iot.bzh> Signed-off-by: Ronan Le Martret <ronan.lemartret@iot.bzh> Signed-off-by: Stephane Desneux <stephane.desneux@iot.bzh>
2018-08-24Add the afb-test binding in the devel AGL imageRomain Forlot1-1/+3
This will build afb-test binding and tests it using PTest. Bug-AGL: SPEC-1439 Change-Id: I75d1bbb0a780ca036ab0d653fdcbacda883122f9 Signed-off-by: Romain Forlot <romain.forlot@iot.bzh>
2018-08-16Add machine templates for qemuarm and qemuarm64Jan-Simon Möller2-0/+6
This changeset adds the necessary tepmlates to build the qemu targets for ARM 32bit and 64bit. The MACHINE names are 'qemuarm' and 'qemuarm64'. As the compiler flags for qemuarm in Yocto are using the equivalent of armv5te, we need to ship our own machine/qemuarm.conf with our default tuning for armv7-a (YP name armv7ve), and overrides to build a v7 kernel and use a v7 capable QEMU machine. For qemuarm64, some additional kernel configuration is enabled to allow building and loading of the MOST drivers. Bug-AGL: SPEC-756 Change-Id: I0a688a1d61a75f1287902fc2733a8a54b0485a34 Signed-off-by: Jan-Simon Möller <jsmoeller@linuxfoundation.org> Signed-off-by: Scott Murray <scott.murray@konsulko.com>
2018-08-01Remove porter reference from meta-aglRonan Le Martret1-18/+15
* Remove, from recipes, reference to porter, gen2, krogoth. * cleanup mardown from reference to porter. * cleanup markdown (markdownlint score 0). Change-Id: I70b9880fc52ef3c848da588d3a256fa8eee48606 Signed-off-by: Ronan Le Martret <ronan.lemartret@iot.bzh>
2018-07-29Fix old bbappend in meta-qcomJan-Simon Möller1-0/+1
meta-openembedded already moved to 3.16 and there is no update in meta-qcom, yet. Change-Id: Iefbdf9bef83c01e4e37895d445d538d9e4f79957 Signed-off-by: Jan-Simon Möller <jsmoeller@linuxfoundation.org>
2018-07-28Introduce buildstat summary for CI buildsJan-Simon Möller5-4/+6
To check the sstate-reuse, print out the buildstat summary at the end. Change-Id: I64fa1591ade5f61dd3c7a2b51ebdb7afd9326de0 Signed-off-by: Jan-Simon Möller <jsmoeller@linuxfoundation.org>
2018-07-12Enable agl-audio-4a-framework in CIJan-Simon Möller4-4/+4
Use the 4a feature in gerrit (ci-change) and snapshot builds. Change-Id: I1d0550a2f1759388dc658f0951a51c3183ca7662 Signed-off-by: Jan-Simon Möller <jsmoeller@linuxfoundation.org>
2018-06-28[GEN3 KF] Configure GPS deviceRonan Le Martret3-0/+9
* For the Renesas Gen3 extention board Kingfisher, we must specify the GPS device for gpsd service. * Create a new machine type kingfisher. Bug-AGL: SPEC-1538 Change-Id: If6b7e49f6a006218e57c58e15855e0d65eb849cd Signed-off-by: Ronan Le Martret <ronan.lemartret@iot.bzh>
2018-05-313rd part of the layer/profile rework [1/2]Jan-Simon Möller8-8/+23
This is the last larger commit in this series and deals with the graphical part. We introduce the graphical profiles: - meta-agl-profile-graphical -- meta-agl-profile-graphical-html5 -- meta-agl-profile-graphical-qt5 Notable changes: - weston-ini-conf moved to the meta-agl-bsp layer. Most BSPs have bbappends, so we need to have the recipes present (but unused) even in the console images. - new image: agl-image-boot = terminal-only + network + package-manaager. Ready for using package-feeds - new image/sdk: agl-image-minimal-crosssdk - agl-service-mediaplayer has a dependency on weston, thus it cannot be in the 'core'. Moved it to profile-graphical. - The wayland-ivi-extension moved to the agl-demo-platform. - The app-framework layer included and pulled 'web-runtime' as dependency. This broke console-only images. This has been moved to be in meta-agl-demo only for now. - added and massaged the agl-features. - found and added a useful script 'oe-depends-dot' that helps to work with the dot files (produced with bitbake -g) Todo: - we'll need another pass through the packagegroups. The dependencies for the layers/profiles are now sorted-out but we might have to add/shuffle a few packages. For further details, see meta-agl/docs/profiles.md. v2: fix meta-agl/meta-security/conf/layer.conf - the immediate expansion previously used in there caused some recipes not being added to BBFILES. v3: fix packagegroup renaming (packagegroup-agl-devel -> packagegroup-agl-core-devel) v4: fix missing packagegroup inclusion (tnx Jose, Scott, Stephane) v5: fix missing packagegroup inclusion v6: explicitely put profile-graphical-qt5 on-top of profile-graphical v7: re-add 'procps' when agl-devel feature is on Bug-AGL: SPEC-145 Change-Id: I24cdcd1118932758d0c55d333338238f2a770877 Signed-off-by: Jan-Simon Möller <jsmoeller@linuxfoundation.org>
2018-04-20Introduce meta-agl-profile-core and meta-agl-profile-graphicsJan-Simon Möller8-16/+28
Rework towards agl profiles. This change is part of a series of changes to create the AGL profiles. This set will mainly introduce the 'core' profile. It is setup to be a drop-in change, thus some files were kept in (dummy) locations for now. However, they'll be taken care of in the next changes in this series. The main target of the meta-agl-profile-core layer is to host: - a minimal, bootable image with network and package management enabled -- agl-image-boot - a minimal image with network and packagemanagement and the AGL APIs -- agl-image-minimal The layer meta-agl-profile-graphical is used as superset of these and includes support for egl+wayland+weston. All recipes concerning graphics were moved there. This is not a full profile as we still have to migrate some parts of meta-agl-demo in a follow-up changeset. The roadmap as discussed during the F2F session in Karlsruhe is: - week 16 : core profile and profiles w/o graphics - week 17 : graphical profiles - week 18 : final conversion of the demo image v2: moved agl-login-manager from -graphics to -core (see Jose's comment) v3: moved back after discussion - follow-up in separate changeset Change-Id: Idacb0d1274baac1f63f8d1b850d4b1104ac33918 Signed-off-by: Jan-Simon Möller <jsmoeller@linuxfoundation.org>
2018-03-29Merge "Merge branch 'sandbox/ronan/rocko_kf'"Jan-Simon Moeller3-0/+3