aboutsummaryrefslogtreecommitdiffstats
path: root/meta-agl-distro
AgeCommit message (Collapse)AuthorFilesLines
2019-01-06Post rc3 bump of distro configStephane Desneux1-2/+2
we're heading towards rc4 now. Change-Id: I06afbe8fd76a4d7eaf8a72353eae0363ee8f8a53 Signed-off-by: Stephane Desneux <stephane.desneux@iot.bzh>
2018-12-27Update distro configuration for GG rc3 6.99.3guppy_6.99.3guppy/6.99.36.99.3Jan-Simon Möller1-3/+3
We cut GG rc3 after the CES integration session. Notable changes: - Microphones working - Bluetooth -- A2DP in mediaplayer -- HFP (one call due to pending bug) - Mediaplayer and Radio ramping (radio lower prio) - btwilink disabled on kingfisher (unstable) - agl-demo-preload feature (load maps, POI api key, ...) - nfc improvements Change-Id: I978dd02a0b4d5aefcfc0d7d46287b27bc1f1d396 Signed-off-by: Jan-Simon Möller <jsmoeller@linuxfoundation.org>
2018-12-09Post rc2 bump of distro configJan-Simon Möller1-2/+2
we're heading towards rc3 now. Change-Id: I294f40e5c6f779a6ee7db984c2d475e9e230f54d Signed-off-by: Jan-Simon Möller <jsmoeller@linuxfoundation.org>
2018-11-30Prepare 6.99.2 Guppy RC2guppy_6.99.2guppy/6.99.26.99.2Jan-Simon Möller1-3/+3
Change the distro configuration in preparation of GG RC2. Change-Id: I2eb05adf8f4f909d90aed81b75ba04a0933ae02e Signed-off-by: Jan-Simon Möller <jsmoeller@linuxfoundation.org>
2018-11-26Post-RC1 bumpJan-Simon Möller1-2/+2
Change-Id: I39ef7dc1023c80ca313ad80d5bd10df0c4fbe0c9 Signed-off-by: Jan-Simon Möller <jsmoeller@linuxfoundation.org>
2018-11-15Prepare Grumpy Guppy RC1Jan-Simon Möller1-3/+3
Modify the distro config to reflect the RC1 release. Change-Id: If46096e12c0917ee517835e5803ec32b80a6a37a Signed-off-by: Jan-Simon Möller <jsmoeller@linuxfoundation.org>
2018-10-08Fix optee-client buildRonan Le Martret1-0/+1
optee-client fails to compile when enabling FORTIFY_SOURCE=2 option. Change-Id: I4e4a5fea098470f63a3d8b49b9bb4fc8b8c0bbbc Signed-off-by: Ronan Le Martret <ronan.lemartret@iot.bzh>
2018-10-02Remove pulseaudio from AGL DISTRO_FEATURESRonan Le Martret1-1/+1
Bug-AGL: SPEC-1601 Change-Id: I5f6f82dad72cb5f1570c6354d360cebd056489a1 Signed-off-by: Ronan Le Martret <ronan.lemartret@iot.bzh>
2018-09-28Change SDKPATH for something more stable in timeRonan Le Martret1-1/+1
* The SDKPATH must be fix to be used with YoMo. Inside rpm nativesdk file all the path is prefed by SDKPATH/sysroots/${HOSTARCH}-${SDK_VENDOR}-${OSHOST}/ * have a (day) time stamp in ${DISTRO_VERSION} force the rebuild of the package every day. eg: At runtime /etc becomes: (old value): /opt/agl-sdk/6.90.0+snapshot-20180921-aarch64/sysroots/x86_64-aglsdk-linux/etc (new value): /opt/agl-sdk/6.90.0+snapshot-aarch64/sysroots/x86_64-aglsdk-linux/etc in native sdk Bug-AGL: SPEC-921 Bug-AGL: SPEC-1667 Change-Id: I28d7f8d140ba75d9d8c68c84ba5fc697e6011836 Signed-off-by: Ronan Le Martret <ronan.lemartret@iot.bzh>
2018-09-12Move master to guppyJan-Simon Möller1-5/+5
We move master to guppy and development. Change-Id: If6fc9f1e89298f604e94055b75362df7a7cbdde0 Signed-off-by: Jan-Simon Möller <jsmoeller@linuxfoundation.org>
2018-09-09Prepare Flounder rc6flounder_5.99.6flounder/5.99.65.99.6Jan-Simon Möller1-3/+3
Change the distro config for the RC6. Change-Id: I174d28086f7b9de8d94840f7451b65f8ba06c347 Signed-off-by: Jan-Simon Möller <jsmoeller@linuxfoundation.org>
2018-09-01Post FF rc5 merge window openJan-Simon Möller1-2/+2
Adapt the distro config. Change-Id: I216fc5071e8f7a6ff5df221224bd065698ee5a8d Signed-off-by: Jan-Simon Möller <jsmoeller@linuxfoundation.org>
2018-09-01Cut Flounder RC5flounder_5.99.5flounder/5.99.55.99.5Jan-Simon Möller1-3/+3
Adapt distro conf. Change-Id: Ic4f5463967870d9caebdc0a1a47f5811faf3b60d Signed-off-by: Jan-Simon Möller <jsmoeller@linuxfoundation.org>
2018-08-27Bump distro post-rc4Jan-Simon Möller1-3/+3
Open up development for rc5/final. Change-Id: I8a724aec556e4020c60dc6e920c97ed776cf7499 Signed-off-by: Jan-Simon Möller <jsmoeller@linuxfoundation.org>
2018-08-24Prepare FF RC4flounder_5.99.4flounder/5.99.45.99.4Jan-Simon Möller1-12/+24
Change the distro vars for RC4. Change-Id: I74af40b74fd55bae4c0779c055ba97499c354e75 Signed-off-by: Jan-Simon Möller <jsmoeller@linuxfoundation.org>
2018-08-23Change the default sdk install pathJan-Simon Möller1-0/+5
Installing 2 SDKs of the same version but different arch results in broken compilation due to a bug in the meta-qt5 sdk environment scripts. Mitigate it by adding the DEFAULTTUNE to the SDK installation folder until the issue can be addressed in SPEC-1686. Bug-AGL: SPEC-1667, SPEC-1686 v2 (jsmoeller): rewrite to use /opt and SDKPATH Change-Id: Id7e6c919631fc0bcc630a6b813a714f83adaf148 Signed-off-by: Ronan Le Martret <ronan.lemartret@iot.bzh> Signed-off-by: Jan-Simon Möller <jsmoeller@linuxfoundation.org>
2018-08-23Bump post releaseJan-Simon Möller1-6/+6
Change-Id: Ibb43e5499ebc2c271843dad4ba0162b6cce9bf9c Signed-off-by: Jan-Simon Möller <jsmoeller@linuxfoundation.org>
2018-08-23Port the latest version of valgrindRonan Le Martret1-0/+5
Some issues appear with the current version of valgrind on aarch64. (valgrind exits due to an unhandled instruction) An update of valgrind solves this problem. I guess other platform need a update on valgrind too, so this port is not gen3 exclusive. This port uses the yocto recipes(poky:7e7ee662f5dea4d090293045f7498093322802cc): * with some fix on the patch. * remove patch already merged in valgrind git. Bug-AGL: SPEC-1677 Change-Id: Ibf467bee03487252f24ef046b9fe4e4ff6d389da Signed-off-by: Ronan Le Martret <ronan.lemartret@iot.bzh>
2018-08-17Prepare rc3 releaseflounder_5.99.3flounder/5.99.35.99.3Jan-Simon Möller1-6/+6
Change the distro vars to FF rc3. Change-Id: I75afebf4dfed7fafd80cbfb2fcc5d369048fbefa Signed-off-by: Jan-Simon Möller <jsmoeller@linuxfoundation.org>
2018-08-17Mask conflicting variables from package_write_rpm hashJan-Simon Möller1-0/+5
See https://jira.automotivelinux.org/browse/SPEC-1629 for the details. Bug-AGL: SPEC-1629 Change-Id: Id828aab52826b14005d69af5bfaddc4a4c709842 Signed-off-by: Jan-Simon Möller <jsmoeller@linuxfoundation.org>
2018-07-30Post-rc2 bumpJan-Simon Möller1-6/+6
Open-up the app builds again post-rc2. Change-Id: I231608c7aecb8180a9a50e4c95302f5d6cf0a546 Signed-off-by: Jan-Simon Möller <jsmoeller@linuxfoundation.org>
2018-07-25Matrix reloaded Funky Flounder RC2Jan-Simon Möller1-6/+6
respin rc2 Change-Id: If860a1797650625350350cf42ab8f0b996e9337c Signed-off-by: Jan-Simon Möller <jsmoeller@linuxfoundation.org>
2018-07-19Enable autorev again for masterJan-Simon Möller1-6/+6
Change-Id: I7176338b5608f6cef857d3426c7e6f21e202bd3b Signed-off-by: Jan-Simon Möller <jsmoeller@linuxfoundation.org>
2018-07-13Bump version number to FF rc2 v5.99.2Jan-Simon Möller1-6/+6
In preparation of the 2nd release candidate of Funky Flounder. Change-Id: Id26c91112c54a99a1fa8f16311049b15e0ac5544 Signed-off-by: Jan-Simon Möller <jsmoeller@linuxfoundation.org>
2018-06-29Post rc1 bump of poky-agl.confJan-Simon Möller1-6/+6
Change-Id: I6f9f494a5456bd7c2e9f6a11c7cf36d50f488571 Signed-off-by: Jan-Simon Möller <jsmoeller@linuxfoundation.org>
2018-06-29Prepare the Funky Flounder RC1 releaseflounder_5.99.1flounder/5.99.15.99.1Jan-Simon Möller1-7/+7
Modify the poky-agl.conf to match the rc1 version. Change-Id: I0619bcab2ab1274905477d53e62f924fa1141009 Signed-off-by: Jan-Simon Möller <jsmoeller@linuxfoundation.org>
2018-06-15Re-enable fix for cmake in sdkJan-Simon Möller1-2/+2
The hotfix is still necessary as of 2018-06-15 in the meta-qt5 version we use. Change-Id: If650d3056deb604107145dc501a4ba0bf95802e3 Signed-off-by: Jan-Simon Möller <jsmoeller@linuxfoundation.org>
2018-05-313rd part of the layer/profile rework [1/2]Jan-Simon Möller2-2/+129
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-05Rework how we pass arguments to QEMU, provide a wks.in fileTom Rini1-1/+0
- The official hook for changing the resolution we tell QEMU is UVESA_MODE so change agl_qemux86-64.inc to set the value there rather than override the whole of QB_KERNEL_CMDLINE_APPEND. - Make agl_qemux86-64.inc further append what's needed to QB_KERNEL_CMDLINE_APPEND as APPEND isn't used in the filesystem images we create anymore. - Create a directdisk.wks.in file that will (a) use --use-uuid and not force /boot to be looked for on /dev/sda1 (when it will _NOT_ be) and (b) evaluate QB_KERNEL_CMDLINE_APPEND to determine what the bootargs to the kernel will be. Change-Id: I49894d70e6c0010e0907b72f19fcc8fb0917e34a Bug-AGL: SPEC-1301 Signed-off-by: Tom Rini <trini@konsulko.com>
2018-04-04Adapt repository priorities in preparation of the profilesJan-Simon Möller1-1/+1
The profiles need a clear priorization of the layers. Especially the core layers need a high prio in this context. Apply a prio of 70 to core/essential layers and of 60 to BSP, netboot and smack. Change-Id: I24a59daadab4c98ffbcb799cc784e84e87ac7d23 Signed-off-by: Jan-Simon Möller <jsmoeller@linuxfoundation.org>
2018-03-13re-enable gobject-introspectionMartin Kelly1-0/+4
In commit f9a285987c5c956d445efeea6c60f258534fe57b, we disabled gobject-introspection due to a build error as part of the Rocko transition. However, the only build errors were on qemu, which were caused by not emulating SSE4.2 (see poky commit 5b2b343453e805be013e721d079bc24de946f28b for details). Emulate SSE4.2 in qemu and re-enable gobject-introspection. Change-Id: I073db2c37623bb8ba6b7809ca0c3bba5213001e2 Signed-off-by: Martin Kelly <mkelly@xevo.com>
2018-02-20Merge "move GPLv2 logic into agl-gplv2 feature"Jan-Simon Moeller1-9/+0
2018-02-13Upgrade wayland-ivi-extensionKazumasa Mitsunari1-1/+1
Upgrade wayland-ivi-extension version to 2.0.% from 1.13. Currently, version is 2.0.2 This change is for only master branch. Bug-AGL: SPEC-1244 Change-Id: I200c19837b8f7b646296a868c14423e55e98bf86 Signed-off-by: Kazumasa Mitsunari <knimitz@witz-inc.co.jp>
2018-02-13pokg-agl.conf: Use gstreamer v1.2Changhyeok Bae1-7/+7
Bug-AGL: SPEC-1181 Change-Id: Ib5aa07171a361210b9bae0f62f38595c62099dda Signed-off-by: Changhyeok Bae <changhyeok.bae@gmail.com>
2018-02-12move GPLv2 logic into agl-gplv2 featureMartin Kelly1-9/+0
Currently, we hardcode GPLv2/GPLv3 logic directly into the poky-agl distro config, and in agl-demo. However, the recipes in meta-gplv2 are very old, poorly supported, and receive no security updates. So, they can easily cause issues. To allow the choice of both GPLv2 and GPLv3, refactor the meta-gplv2 logic into its own "agl-gplv2" feature. The default is GPLv3, which points to well-supported layers with security updates. However, by adding the "agl-gplv2" feature in aglsetup.h, the meta-gplv2 layer gets added to bblayers.conf and recipe versions get set to those in meta-gplv2. Change-Id: I62d7f2daa58b0690b5b27740257bd15097fcee5c Signed-off-by: Martin Kelly <mkelly@xevo.com>
2018-02-08poky-agl: conf: change to gplv2 version of gdbmMatt Ranostay1-1/+1
Change-Id: Ic0f97832caeeb0952e64dec73d98f2c77483660a Bug-AGL: SPEC-1256 Signed-off-by: Matt Ranostay <matt.ranostay@konsulko.com>
2018-01-30poky-agl: conf: make gplv3 versions of packages less preferredMatt Ranostay1-0/+9
Make PREFERRED_VERSION of packages of ones that are in meta-gplv2 to clean up GPLv3 taint Bug-AGL: SPEC-1256 Change-Id: I07b20e7869b4839253e803c13c33c69bea0ef687 Signed-off-by: Matt Ranostay <matt.ranostay@konsulko.com>
2018-01-10Change distro config post releaseJan-Simon Möller1-7/+6
This changeset prepares the next cycle towards FF Change-Id: I6051297b47c076d0fa79c153e7d5528f20a30740 Signed-off-by: Jan-Simon Möller <jsmoeller@linuxfoundation.org>
2017-11-29mxml: remove SECURITY_CFLAGS overrideStephane Desneux1-1/+0
mxml is not neeeded anymore as a dependency of agl-service-unicens so the override on SECURITY_CLAGS can be removed Bug-AGL: SPEC-1108 Change-Id: I704fdeed2db07a159a1cd32ebcf6ae93d8702a2b Signed-off-by: Stephane Desneux <stephane.desneux@iot.bzh> Reviewed-on: https://gerrit.automotivelinux.org/gerrit/12171 Reviewed-by: Thomas Rini <trini@konsulko.com> Tested-by: Jenkins Job builder account <agl-jobbuilder@automotivelinux.org> ci-image-build: Jenkins Job builder account <agl-jobbuilder@automotivelinux.org> Reviewed-by: Matt Ranostay <matt.ranostay@konsulko.com> Reviewed-by: José Bollo <jobol@nonadev.net> Reviewed-by: Romain Forlot <romain.forlot@iot.bzh> Reviewed-by: Jan-Simon Moeller <jsmoeller@linuxfoundation.org>
2017-11-27Merge window for EE rc4 is openJan-Simon Möller1-6/+6
Change-Id: I11fdb68861c74532fa2cd1014195f1585330d981 Signed-off-by: Jan-Simon Möller <jsmoeller@linuxfoundation.org> Reviewed-on: https://gerrit.automotivelinux.org/gerrit/12161 Reviewed-by: Thomas Rini <trini@konsulko.com> Tested-by: Jenkins Job builder account <agl-jobbuilder@automotivelinux.org> ci-image-build: Jenkins Job builder account <agl-jobbuilder@automotivelinux.org>
2017-11-27Added XDG compatibility to ivi-shellRomain Forlot1-0/+1
Backported M.Teyfel patch from wayland-devel mailing list: https://lists.freedesktop.org/archives/wayland-devel/2017-November/035700.html Upgrade wayland-ivi-extension to v2.0.2 but keep using 1.1x for now with PREFERRED_VERSION until HMI could use the new version. Added Emre Ucan simple-id-agent to review. Bug-AGL: SPEC-1096 Change-Id: I74c4ae0bf0bf822e27dcbb193dc9f7a13d3e270d Signed-off-by: Romain Forlot <romain.forlot@iot.bzh> Reviewed-on: https://gerrit.automotivelinux.org/gerrit/11991 Tested-by: Jenkins Job builder account <agl-jobbuilder@automotivelinux.org> ci-image-build: Jenkins Job builder account <agl-jobbuilder@automotivelinux.org> Reviewed-by: Nobuhiko Tanibata <nobuhiko_tanibata@denso.co.jp> Reviewed-by: Tadao Tanikawa <tanikawa.tadao@jp.panasonic.com> Reviewed-by: Jan-Simon Moeller <jsmoeller@linuxfoundation.org>
2017-11-26Prepare for eel rc3 releaseeel_4.99.3eel/4.99.34.99.3Jan-Simon Möller1-7/+7
Change-Id: I0adcb275bca01ef7e32d6c0d6fdfabdf078e0bfc Signed-off-by: Jan-Simon Möller <jsmoeller@linuxfoundation.org> Reviewed-on: https://gerrit.automotivelinux.org/gerrit/12149 ci-image-build: Jenkins Job builder account <agl-jobbuilder@automotivelinux.org>
2017-11-16mxml: disable SECURITY_CFLAGSScott Murray1-0/+1
The mxml shared library was failing to link on x86-64, disable the SECURITY_CFLAGS on it for now until we can contact upstream and get the underlying issue addressed. Change-Id: I53578544222294119f4141ccc4dfa28d2737983b Signed-off-by: Scott Murray <scott.murray@konsulko.com> Reviewed-on: https://gerrit.automotivelinux.org/gerrit/11999 Tested-by: Jenkins Job builder account <agl-jobbuilder@automotivelinux.org> ci-image-build: Jenkins Job builder account <agl-jobbuilder@automotivelinux.org> Reviewed-by: Jan-Simon Moeller <jsmoeller@linuxfoundation.org>
2017-11-09Bump poky-agl.conf post releaseJan-Simon Möller1-6/+6
Change-Id: Ib87b6ba6cccd56bb85b3c2086fc10227beaeffbc Signed-off-by: Jan-Simon Möller <jsmoeller@linuxfoundation.org> Reviewed-on: https://gerrit.automotivelinux.org/gerrit/11779 Reviewed-by: Thomas Rini <trini@konsulko.com> Tested-by: Jenkins Job builder account <agl-jobbuilder@automotivelinux.org> ci-image-build: Jenkins Job builder account <agl-jobbuilder@automotivelinux.org>
2017-11-05Prepare Electric Eel RC2 releaseJan-Simon Möller1-1/+2
Change-Id: I5e286abc387fa15883ff288093cd5bc91b495ec0 Signed-off-by: Jan-Simon Möller <jsmoeller@linuxfoundation.org> Reviewed-on: https://gerrit.automotivelinux.org/gerrit/11691
2017-11-05Allow SRCREV handling through poky-agl.confJan-Simon Möller1-2/+13
This change simplifies the SRCREV handling by using - AGL_APP_REVISION and AGL_DEFAULT_REVISION in recipes. Also the AGL_BRANCH can be used to switch to release branches. Bug-AGL: SPEC-864 Change-Id: I9384c85d4f7434416d87359f88c482887ac2ead8 Signed-off-by: Jan-Simon Möller <jsmoeller@linuxfoundation.org> Reviewed-on: https://gerrit.automotivelinux.org/gerrit/11685 Tested-by: Jenkins Job builder account <agl-jobbuilder@automotivelinux.org> ci-image-build: Jenkins Job builder account <agl-jobbuilder@automotivelinux.org> ci-image-boot-test: Jenkins Job builder account <agl-jobbuilder@automotivelinux.org>
2017-10-14Remove rc1 locks merge window open for rc2Jan-Simon Möller2-74/+0
Change-Id: I4fd65b5c932992b7b2247e81af6c1f33567d4813 Signed-off-by: Jan-Simon Möller <jsmoeller@linuxfoundation.org> Reviewed-on: https://gerrit.automotivelinux.org/gerrit/11323 Tested-by: Jenkins Job builder account <agl-jobbuilder@automotivelinux.org> ci-image-build: Jenkins Job builder account <agl-jobbuilder@automotivelinux.org> ci-image-boot-test: Jenkins Job builder account <agl-jobbuilder@automotivelinux.org>
2017-10-13Lock down of SRCREVS matching EE RC1eel_4.99.1eel/4.99.14.99.1Jan-Simon Möller2-0/+75
This change locks down any use of SRCREV to the version of EE RC1 . Change-Id: I09a3e6b5c1fe2a37cf03a5db7bd7cb31386e8eb8 Signed-off-by: Jan-Simon Möller <jsmoeller@linuxfoundation.org> Reviewed-on: https://gerrit.automotivelinux.org/gerrit/11303 Tested-by: Jenkins Job builder account <agl-jobbuilder@automotivelinux.org> ci-image-build: Jenkins Job builder account <agl-jobbuilder@automotivelinux.org>
2017-10-11Change DISTRO_VERSION for EE rc1Jan-Simon Möller1-2/+2
This change adapts the DISTRO_VERSION for Electric Eel RC1. Change-Id: I44389dcc08537b0b2ab985a8500f5d36d13fcbde Signed-off-by: Jan-Simon Möller <jsmoeller@linuxfoundation.org> Reviewed-on: https://gerrit.automotivelinux.org/gerrit/11199 Tested-by: Jenkins Job builder account <agl-jobbuilder@automotivelinux.org> ci-image-build: Jenkins Job builder account <agl-jobbuilder@automotivelinux.org>
2017-09-15Fix clash in metadata of nativesdk-cmake and nativesdk-qtbase-toolsJan-Simon Möller1-0/+5
This is related to the change from rpm5 to rpm4 in pyro and a slightly different behaviour when treating directories during the packaging. Result is that both packages claim to 'own' the directory environment-setup.d . The packager 'dnf' then reports the collision and aborts when constructing the SDK. This is a temporary fix until the issue is resolved upstream Reference: https://bugzilla.yoctoproject.org/show_bug.cgi?id=12093 Change-Id: I7be94e02251a8bd55a656d986654085039026bb5 Bug-AGL: SPEC-888 Signed-off-by: Jan-Simon Möller <jsmoeller@linuxfoundation.org> Reviewed-on: https://gerrit.automotivelinux.org/gerrit/10925