summaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)AuthorFilesLines
2021-05-25Restore chromium target and browser serviceRoger Zanoni4-11/+32
- Merged chromium changes to fix build after bumping to chromium 84 - Fixed chromium install on current recipe - Restored the chromium browser service Bug-AGL: SPEC-3830 Signed-off-by: Roger Zanoni <rzanoni@igalia.com> Change-Id: I5cde7972021a4200581c2e161f848bcf7d8d0458
2021-03-24web-runtime: Fix chromium do_install on yp 3.1.6koi_11.0.1koi/11.0.111.0.1Roger Zanoni2-3/+13
Remove DESTDIR from the build directory Bug-AGL: SPEC-3856 Signed-off-by: Roger Zanoni <rzanoni@igalia.com> Change-Id: I7ea01750daab1522f2e7558a11e0594ec0772bba
2021-03-24web-runtime: Update from chromium79 to chromium84Roger Zanoni7-107/+165
This patch contains all the squashed changes needed to bump WAM and chromium, including the ported changes from cr79. Bug-AGL: SPEC-3806 Signed-off-by: Roger Zanoni <rzanoni@igalia.com> Change-Id: If2b18e2978e8b1050e4b167b9627c1a526867cfb
2021-03-09ondemandnavi-config: update MapBox style URLScott Murray1-1/+1
Remove the leading "mapbox://" from the default MapBox style URL, as it now seems to break the resulting generated tile URLs in QtLocation. I suspect this is related to the HTTPS support that was added in Qt 5.12. Bug-AGL: SPEC-3837 Signed-off-by: Scott Murray <scott.murray@konsulko.com> Change-Id: Ib5bfe75a2e741b10791260c408dedfee1dbd60cb
2021-03-09packagegroup-agl-demo-platform: fix POI API key preloadingScott Murray1-6/+1
Fix missing switch from DISTRO_FEATURES to AGL_FEATURES in the definition of DEMO_PRELOAD. Also remove the now unused variables for the old navigation app as cleanup. Bug-AGL: SPEC-3833 Signed-off-by: Scott Murray <scott.murray@konsulko.com> Change-Id: I39b4d49c0a213f162657f0086b21b81eb0524ab8
2021-03-03Mask out older recipes in meta-iot-cloudScott Murray2-0/+9
Add BBMASK additions to mask out older cjson, python3-httplib2, and python3-xmltodict recipes in meta-iot-cloud. Since meta-iot-cloud is related to the agl-cloudproxy feature, they have been added to a new agl-cloudproxy.inc file to keep them distinct from other agl-demo configuration. Bug-AGL: SPEC-3826 Signed-off-by: Scott Murray <scott.murray@konsulko.com> Change-Id: I19a4e94f312e72b5770ecfe836fca9e8df6a91bc (cherry picked from commit d0284872017e0c7a98d6ac1104472a7b32ea57d5)
2021-03-01Remove duplicate afb-test recipeScott Murray2-28/+0
The recipe here is a duplicate of the one in meta-app-framework, remove it to avoid confusion. Bug-AGL: SPEC-3827 Signed-off-by: Scott Murray <scott.murray@konsulko.com> Change-Id: I1ab6a814295ce8d8a5780cdf12bd140f93a46365 (cherry picked from commit 371925b6b3a6961c575d4041ed7dee61a78d0a2b)
2021-02-09Add reference hardware GPS supportkoi_11.0.0koi/11.0.011.0.0Scott Murray1-0/+4
Add the new gpsd-conf-refhw package to packagegroup-agl-ivi-navigation when building for the AGL reference hardware. Bug-AGL: SPEC-3792 Signed-off-by: Scott Murray <scott.murray@konsulko.com> Change-Id: Ia4a14e6ef6d9be78bc8364c185528cd368cc2596
2021-02-09Update cluster demo weston configurationScott Murray2-1/+1
Tweak the cluster demo to move the weston-ini-conf-landscape dependency to the image recipe, where the use of the regular or inverted configuration is now based on whether the "agl-demo-preload" feature is set. This means the cluster demo images will now by default have no rotation, but still allows building images for the AGL demo setup with its inverted cluster display. Bug-AGL: SPEC-3791 Signed-off-by: Scott Murray <scott.murray@konsulko.com> Change-Id: I4f82cc84d27687f228ed3b9587103edef9c150c0 (cherry picked from commit 8184e5d18b223be1bb9260383bf18469d770f843)
2021-02-08qtwayland: Mitigate crash when platforminputcontext library is missingMarius Vlad2-0/+38
Turns out that in the case a plug-in library is missing (which is the actual root cause of this problem) we do not properly check if it can use it, leading to a crash when attempting to make of use QT_LOGGING_RULES. This patch mitigates that and allows to debug Qt w/ the help of QT_LOGGING_RULES. Bug-AGL: SPEC-3359 Signed-off-by: Marius Vlad <marius.vlad@collabora.com> Change-Id: If8c0f0f030c7ca53aca701a54ceea317cc7fd695
2021-02-08qtwayland: Remove unneeded (mostly) xdg-shell related patchesMarius Vlad6-2322/+0
This patch removes the following patches: - 0016-xdg-shell-Add-xdg-shell-protocol-file-version-1.4.0.patch - 0017-xdg-shell-Add-minimize-feature-to-QWindow-using-wayl.patch - 0019-xdg-shell-upgrade-to-support-current-version-weston-.patch - 0099_qtwayland_no_evdev.patch - UNUSED_NEEDS_CHECK_YOCTO_0018-packaging-enable-xdg-shell-at-runtime.patch Bug-AGL: SPEC-3797 Signed-off-by: Marius Vlad <marius.vlad@collabora.com> Change-Id: Ida16800b4209166725d4aeae5e446214f5d46f1e
2021-02-02wam: Fix startup issue on qemux86-64koi_10.93.1koi/10.93.110.93.1Lorenzo Tilve1-1/+1
There was an issue on WAM startup related with the initialization of the pmlog that was causing a crash on qemu. Update the WAM version to avoid that crash. It includes a revert on a change added to the logging system that triggered memory errors on qemu, and which with the fix for user-data-dir creation, allow WAM to startup correctly. https://github.com/Igalia/webosose-wam/commit/8a1ec2f3e474199a689ae71a12ba70a230770c0d BUG-AGL: SPEC-3780 BUG-AGL: SPEC-3781 Signed-off-by: Lorenzo Tilve <ltilve@igalia.com> Change-Id: Id528f8e3270e4f5417fbfda4cdb6a10b001cd6bb (cherry picked from commit 1f35f571b8bf96ff29b80c5750998a2f31391887)
2021-01-29Add gitreview file for Kooky Koi branchJan-Simon Möller1-1/+1
Update the .gitreview file. Bug-AGL: SPEC-3782 Signed-off-by: Jan-Simon Möller <jsmoeller@linuxfoundation.org> Change-Id: I0c392d69b40b486c5a2b8a819412280759f87aba
2021-01-27wam: add user setup script/servicekoi_10.93.0koi/10.93.010.93.0Scott Murray3-0/+42
Add a per-user setup script, systemd unit to run it, and add the unit as a dependency of systemd's user-runtime-dir@.service so it will be run before the user services on each boot. This should fix the various permission issues currently being seen with WAM startup. Bug-AGL: SPEC-3781 Signed-off-by: Scott Murray <scott.murray@konsulko.com> Change-Id: Ie45b43a39530c23439332cdcd7f4550c9f6fc23c
2021-01-26Allow compositor be started using software renderingJan-Simon Moeller1-0/+2
This allows to produce working images without restricted licenses. Software rendering will be slow and screen updates take a while. Bug-AGL: SPEC-3774 Signed-off-by: Jan-Simon Moeller <jsmoeller@linuxfoundation.org> Change-Id: I4edb1a66284d60d4bae7e9f09f87b4268e2431df
2021-01-22packagegroup-agl-demo-platform: Fix waltham-remoting featureMarius Vlad1-1/+1
And avoid using waltham-recevier for the moment, until we get it in the tree. Not only that, but instead use the correct name of the feature while at it (there's no agl-weston-waltham-remoting). Bug-AGL: SPEC-3601 Signed-off-by: Marius Vlad <marius.vlad@collabora.com> Change-Id: I2ee39dd603a41e147b95aa77237bcc06947c1028
2021-01-15Remove unused navigation-demo app recipekoi_10.92.0koi/10.92.010.92.0Scott Murray1-32/+0
The navigation-demo application has never been used and its role as an example of using QtLocation has for the most part been supplanted by ondemandnavi, so remove it to reduce maintenance burden. Bug-AGL: SPEC-3748 Signed-off-by: Scott Murray <scott.murray@konsulko.com> Change-Id: I3e9c17aab82fa4a05181eaa2f13efc77e4dbcd40
2021-01-15Update demo app runtime dependenciesScott Murray6-2/+12
Update runtime dependencies in demo app recipes to match current binding requirements. Bug-AGL: SPEC-3748 Signed-off-by: Scott Murray <scott.murray@konsulko.com> Change-Id: Ibaab8d0d2b00f764946ed8472e76a504647b697e
2021-01-15Remove unused demo app build dependenciesScott Murray8-27/+6
Update demo app recipes as appropriate to remove now unused build dependencies such as libhomescreen, qlibhomescreen, and qtwebsockets. Bug-AGL: SPEC-3748 Signed-off-by: Scott Murray <scott.murray@konsulko.com> Change-Id: Ic3b17bf868dcd0ad633bd09f53311e11ec0a1a00
2021-01-15Fix style issues in app recipesScott Murray24-204/+236
Update spacing and variable ordering in the demo app recipes for consistency per the OpenEmbedded syle guide (see: https://www.openembedded.org/wiki/Styleguide). Additionally, a common cut-and-pasted unnecessary comment has been removed from the recipes. There are no functional changes. Bug-AGL: SPEC-3748 Signed-off-by: Scott Murray <scott.murray@konsulko.com> Change-Id: Ic7cf3a1392678e76e8f512acb4f16b623fa35d3f
2021-01-15Remove unneeded gitsm usage from app recipesScott Murray5-5/+5
Replace remaining now unnecessary gitsm fetcher usage with just plain git. Bug-AGL: SPEC-3748 Signed-off-by: Scott Murray <scott.murray@konsulko.com> Change-Id: Ic6913eb833ea3a8166db02064828f737da49cf92
2021-01-15Update SUMMARY and DESCRIPTION in app recipesScott Murray16-32/+32
Update the SUMMARY and DESCRIPTION variable definitions in the various demo application recipes to remove old references to "CES 2017" and make them more consistent. Bug-AGL: SPEC-3748 Signed-off-by: Scott Murray <scott.murray@konsulko.com> Change-Id: I97cc00610463aa59f7e23ecccc9c625fbfed7a74
2021-01-14meta-agl-demo: move open-vm-tools and vboxguestdrivers to meta-agl-demoJan-Simon Moeller1-0/+3
open-vm-tools and vboxguestdrivers do have a dependency to meta-networking which is no longer included in meta-agl-core . Move the inclusion into meta-agl-demo . Bug-AGL: SPEC-3769 Signed-off-by: Jan-Simon Möller <jsmoeller@linuxfoundation.org> Change-Id: I966145d53ce1522fdac1d57075b93f0063d2dc89 Signed-off-by: Jan-Simon Moeller <jsmoeller@linuxfoundation.org>
2021-01-13Update agl-cluster-demo-support featureScott Murray4-2/+9
Changes: - Switch agl-cluster-demo-support from using IMAGE_FEATURES to AGL_FEATURES to work better with building the different demo images. - Add a connman bbappend to move the agl-cluster-demo-support specific logic out of meta-agl-core. Bug-AGL: SPEC-3749 Signed-off-by: Scott Murray <scott.murray@konsulko.com> Change-Id: Iad42662db903b7403ec7985c315793fdcd6fc9a7
2021-01-13Remove separate agl-{cluster,telematics}-demo featuresScott Murray15-36/+8
Changes: - Remove feature templates and associated include files for the agl-cluster-demo and agl-telematics-demo features. All of the demo images can now be built by just configuring with the agl-demo feature. - Remove feature template for agl-cluster-demo-preload, the cluster demo configuration it was pulling into the cluster image is now driven by the agl-demo-preload feature instead. - Moved speech framework and Alexa voiceagent feature inclusion to agl-demo-platform.inc to avoid them accidentally being pulled into the cluster or telematics demo images. Part of this change is moving agl-voiceagent-alexa from using IMAGE_FEATURES to AGL_FEATURES, which needs a corresponding change to meta-agl-devel. - Remove leftover use of agl-core-image-profile DISTRO_FEATURE, which no longer exists. - Remove unneeded explicit dependency on the PREFERRED_RPROVIDER_virtual/voice-high-config, things seem to be working fine with the dependency from agl-service-voice-high, so it is not required. Bug-AGL: SPEC-3749 Signed-off-by: Scott Murray <scott.murray@konsulko.com> Change-Id: Ibcfbce28231a91aa56269db9196c471458d0e928
2021-01-13pyagl: update SRCREVJan-Simon Möller1-1/+1
Update SRCREV in pyagl recipe to pick up: 5a7414c Support specifying CAN interface for tests Bug-AGL: SPEC-3756 Signed-off-by: Jan-Simon Möller <jsmoeller@linuxfoundation.org> Change-Id: Ib4ad93474fa07d9dbe6cba59bcd5d99eda7fd374
2021-01-13web-runtime: Bump chromium79 and wam to adress first-frame dection and loggingLorenzo Tilve4-17/+6
Bump the versions of Chromium79 to include a workaround for the webapps launching delay that was introduced in order to address problems happening with first-frame detection. These updates also fix full WAM verbosity to journalctl when defined, and building Chromium with externalsrc, and removes lld and gold. Also iclude explicit dependency chain when building html5 dempo platform to packagegroup-agl-profile-graphical-html5. Bug-AGL: SPEC-3576 Bug-AGL: SPEC-3767 Signed-off-by: Lorenzo Tilve <ltilve@igalia.com> Change-Id: I34b0001c58522cfc7940d0384809e14e3d999ea8
2021-01-12weston-init_agldemo: Enable debug option for agl-compositorMarius Vlad1-0/+1
We only enable it conditionally if agl-devel is distro feature is on, as it might be seen as a security hole. This helps CI to take screenshots. Bug-AGL: SPEC-3752 Signed-off-by: Marius Vlad <marius.vlad@collabora.com> Change-Id: I3731b19b557fca3d7e00906a37355db3e9f7b8d0
2021-01-12pyagl: update SRCREVScott Murray1-1/+1
Update SRCREV in pyagl recipe to pick up: 003ccc0 Mark CAN J1939 tests as xfail for now Bug-AGL: SPEC-3765 Signed-off-by: Scott Murray <scott.murray@konsulko.com> Change-Id: I71903b781ebe43e3c2a55c87b745de33d817d4e6
2021-01-12Add dev-mapping-ci recipeScott Murray6-0/+30
Add a dev-mapping-ci recipe that installs a CI specific version of /etc/dev-mapping.conf for the agl-service-can-low-level binding. Additionally, the dev-mapping-demo recipe files have been moved to recipes-config/dev-mapping so all the dev-mapping* recipes are in the same place, and the now required "j1939" bus mapping has been added to the various dev-mapping files. To enable use of the new recipe, a definition of the variable PREFERRED_RPROVIDER_virtual/low-can-dev-mapping has been added to the agl-demo feature definition that enables it based on the AGLCI DISTRO_FEATURE. This is intended to replace the definition in poky-agl.conf, which will be removed in subsequent cleanup. Bug-AGL: SPEC-3756 Signed-off-by: Scott Murray <scott.murray@konsulko.com> Change-Id: Ieb80a7f4b76ddd7851acca521dea1a8dd104cf86
2021-01-12Update weston-ini-conf package useScott Murray4-1/+3
The rework of the weston-ini-conf recipe in meta-agl new means that there are separate weston-ini-conf and weston-ini-conf-landscape packages for portrait versus landscape mode, so update use in the demo image packagegroups to use the appropriate one explicitly. The previous dependency in packagegroup-agl-graphical-weston has been removed since weston-init now has a dependency on the new "weston-ini" runtime (i.e. explicit RPROVIDES) dependency. Note, however, that explicitly pulling weston-ini-conf or weston-ini-conf-landscape into images is recommended as opposed to relying on PREFERRED_RPROVIDER. Bug-AGL: SPEC-3745 Signed-off-by: Scott Murray <scott.murray@konsulko.com> Change-Id: Ia37d61c5684a06755d2761850394e5f887f14a4a
2021-01-08web-runtime: Update from chromium68 to chromium79Lorenzo Tilve10-294/+209
This patch contains all the squashed changes needed to bump WAM and Chromium to M79, including all the ported changes from both upstream Chromium, webOSE and and the former chromium 68 version. It includes the needed changes on the recipes, and bumps the versions to the new commits/branches of the Chromium and Wam repositories. The split of the ongoing changes merged is available here: https://github.com/Igalia/meta-agl-html5-dev/commits/chromium79 Bug-AGL: SPEC-3576 Change-Id: Ia0de6f11001189789d4ffbf01ed81929c57bc7c5 Signed-off-by: Lorenzo Tilve <ltilve@igalia.com>
2021-01-07SPEC-3723: add appfw dependencies back to SDK imageJan-Simon Moeller1-0/+14
This is required in the SDK for some apps. Bug-AGL: SPEC-3723 Signed-off-by: Jan-Simon Moeller <jsmoeller@linuxfoundation.org> Change-Id: I5169e3e15fe8221583b3510ff3b94aa4a27c597a
2021-01-05packagegroup-agl-image-ivi: restore agl-login-manager dependencyScott Murray1-0/+4
Restore the agl-login-manager RDEPENDS to packagegroup-agl-image-ivi so that it will get pulled into agl-image-ivi(-crosssdk) images. This was removed during the layer reorganization done for SPEC-3723, but is required so that afm-user-session and its dependencies will be started for boot. This will restore CI functionality while further post layer reorganization cleanup to rationalize where the dependency should go is considered. Bug-AGL: SPEC-3753 Signed-off-by: Scott Murray <scott.murray@konsulko.com> Change-Id: I2ef8a5bf05e5c29267643ca93748ae7dad42c8fa
2020-12-17Move core speech service to meta-agl-demokoi_10.91.0koi/10.91.010.91.0Jan-Simon Moeller6-0/+76
This moves the generic agl-speechframework to meta-agl-demo. The alexa-voiceagent bits remain in meta-agl-devel for now. This fixes a dependency of the settings app. Bug-AGL: SPEC-3734 Signed-off-by: Jan-Simon Moeller <jsmoeller@linuxfoundation.org> Change-Id: If177271a4a2584ec71ab53ac02764c8065f8b313
2020-12-17SPEC-3723: restructure meta-agl-demoJan-Simon Moeller324-69/+16341
All demo related components should be in here now. We keep the packagegroups on purpose for now to stay backward-compatible. v2: layer does pass yocto-check-layer, dependencies adapted v3: remove the dynamic-layer setup, use all-in-one approach v4: Fixed comments from Paul Barker. Tnx! v5: Removed wayland/weston/agl-compositor additions, except for demo specific weston-init bbappend Follow-up changes required later: - massaging packagegroups - scrub of recipes Bug-AGL: SPEC-3723 Signed-off-by: Jan-Simon Moeller <jsmoeller@linuxfoundation.org> Signed-off-by: Scott Murray <scott.murray@konsulko.com> Change-Id: I47cefd8c23d46b2cdd063470e3f7d97d5ad952d8
2020-12-11Added cannelloni to packagegroup-agl-demoThomas Walzer1-0/+1
To have cannelloni as a standard tool when can-utils is integrated to AGL. Bug-AGL: SPEC-3698 Signed-off-by: Thomas Walzer <Thomas.Walzer@Reutlingen-University.DE> Change-Id: Iba74594925bd25af6d62326dea9b2b269bdc876b
2020-12-07Change poiapp to use LICENSEJan-Simon Möller1-1/+1
instead of COPYING to simplify and align with other recipes. Bug-AGL: SPEC-3440 Patch prepared initially by Li Xiaoming. Signed-off-by: Jan-Simon Möller <jsmoeller@linuxfoundation.org> Change-Id: I3e57bd3606e8b4b36fdde38ecfb57c3f46873c59
2020-12-07Adding the cannelloni tool for can over ethernet to agl-demoThomas Walzer2-0/+39
It could be used via cli cannelloni Bug-AGL: [SPEC-3698] Signed-off-by: Thomas Walzer <Thomas.Walzer@Reutlingen-University.DE> Change-Id: Id07dcaf440a5b205da3ab120f4744866c4ff36de
2020-12-07Workaround issue with homescreen-demo-ci with AGLCI onJan-Simon Moeller1-1/+2
Ensure we can build master with AGLCI on. This fixes: Error: Problem: package packagegroup-agl-demo-platform-1.0-r0.noarch requires packagegroup-hmi-framework, but none of the providers can be installed - conflicting requests - nothing provides homescreen-demo-ci needed by packagegroup-hmi-framework-1.0-2.noarch (try to add '--skip-broken' to skip uninstallable packages or '--nobest' to use not only best candidate packages) until we can debug the root cause. Bug-AGL: SPEC-3718 Signed-off-by: Jan-Simon Moeller <jsmoeller@linuxfoundation.org> Change-Id: Ide1836430622f91a34a7acb012c444b26c983505
2020-12-04Add waltham-dev dependency to agl-demo-platform-crosssdkJan-Simon Moeller1-0/+1
This fixes: Missing or unbuildable dependency chain was: ['agl-image-minimal-crosssdk', 'waltham-dev'] Bug-AGL: SPEC-3605, SPEC-3604 Signed-off-by: Jan-Simon Moeller <jsmoeller@linuxfoundation.org> Change-Id: I89bfe1e7b044ec471c7688459ca9cf7a4ce4977d
2020-11-25waltham-receiver_git: Add missing waltham runtime dependencyMarius Vlad1-0/+1
Seems I missed adding the runtime dependecy for waltham, and testing it with the transmitter (which already had a runtime dependency for waltham) didn't revealed any issue. Fixed by adding the RDEPENDS in the receiver as well. Bug-AGL: SPEC-3605 Signed-off-by: Marius Vlad <marius.vlad@collabora.com> Change-Id: Icbfb6686223582acab753911803f66f5aa8b99b0
2020-11-11pickckagegroup-agl-demo-platform: Enable waltham-receiverMarius Vlad1-0/+1
Only if we specify agl-weston-waltham-remoting distro feature Bug-AGL: SPEC-3605 Signed-off-by: Marius Vlad <marius.vlad@collabora.com> Change-Id: I64b5746a96e9e8e7226c6c9068f2eda5a6644c49
2020-11-11waltham-receiver: Added waltham-receiver recipeMarius Vlad1-0/+25
Bug-AGL: SPEC-3605 Signed-off-by: Marius Vlad <marius.vlad@collabora.com> Change-Id: I14009401162f22a597f2abd970ab9e6b681c08ed
2020-10-29Add kr font into agl-demo-platformhongyevgeny1-0/+1
Signed-off-by: hongyevgeny <yev@drimaes.com> Change-Id: I931c449b32dad02830d2db4f49d07f6d4c0f763a
2020-10-26Add libcloudproxy to demo image and crosssdk as featureAndrey Shamanin2-1/+20
Bug-AGL: SPEC-3667 Signed-off-by: Andrey Shamanin <andrei.shamanin@orioninc.com> Change-Id: I9b14ebd1e3c3c647c8c2b90f02886b397e9a81bc
2020-10-23Adapt agl-service-cloudproxy dependenciesJan-Simon Moeller1-2/+2
The latest changes require the recipe to change. Also the LICENSE file had whitespace at the end removed. Required to fix the build. Signed-off-by: Jan-Simon Moeller <jsmoeller@linuxfoundation.org> Change-Id: I07c2ce652f67757ba303c343ed0410baf3f7e7ac
2020-10-20Add AWS SDK dependency to the cloudproxyAndrey Shamanin1-2/+2
Bug-AGL: SPEC-3644 Signed-off-by: Andrey Shamanin <andrei.shamanin@orioninc.com> Change-Id: I1810931aab0bc8dafc057f82517ba570a82f66fa
2020-10-14Adapt packages of agl-image-ivi-crosssdkJan-Simon Moeller3-7/+22
The agl-image-ivi-crosssdk image was missing multiple services required for CI use. Bug-AGL: SPEC-3598 Signed-off-by: Jan-Simon Moeller <jsmoeller@linuxfoundation.org> Change-Id: Ide6a367955b9a019863d7b29e04157c94dd33f60
2020-09-29packagegroup-hmi-framework: Add homescreen-demo-ci packageMarius Vlad1-0/+3
Include the homescreen-demo-ci application when agl-ci distro feature has been passed. Bug-AGL: SPEC-3592 Signed-off-by: Marius Vlad <marius.vlad@collabora.com> Change-Id: I7b27d96a3451fd80ef290eef5ae6ebddbc654e98