aboutsummaryrefslogtreecommitdiffstats
path: root/recipes-demo
AgeCommit message (Collapse)AuthorFilesLines
2023-05-09window-management-client-grpc/window-management: Bump SRCREVMarius Vlad1-1/+1
Update window-management-client-grpc to include support for setting application on different outputs. Change-Id: Ibf21121c40758648a45ff5c82ed73828bfaaf7e3 Signed-off-by: Marius Vlad <marius.vlad@collabora.com>
2023-05-09recipes-demo/homescreen/homescreen_git: Bump homescreen SRCREVMarius Vlad1-1/+1
In order to catch up the compositor changes, specifically, to get support for placing window's application on different outputs. In more detail the following changes have been added: - c9ae3bc5a1 homescreenhandler: Handle dynamic movement of windows - 74b01c7210 homescreenhandler: Add support for starting apps on different outputs Bug-AGL: SPEC-4529, SPEC-4673 Change-Id: I09e488ce42bdb3550a03e80c1666075c97634585 Signed-off-by: Marius Vlad <marius.vlad@collabora.com>
2023-04-27kuksa-val: Rework to support updated SSL certificatesScott Murray1-1/+1
Changes: - Tweak the kuksa-val recipe to remove installing a newer server certificate (since it will be done elsewhere), and to split the certificates up into finer grained packages to ease installing them piecemeal and replacing them with other packages. - Remove the unused genCerts.sh certificate script patch form the kuksa-val recipe, an updated patch will be added in the near future. - Added a patch in the kuksa-viss-client recipe that enables the library to use certificates installed in /etc/kuksa-certificates or /etc/kuksa-val instead of the default ones that are shipped. - Add kuksa-certificates-agl recipe that installs AGL specific CA, server, and client certificates plus the required server and client keys to act as a replacement for the default ones shipped with KUKSA.val. The kuksa-certificates-agl name is used to avoid needing a rename with a future switch to kuksa-databroker. Note that the RPROVIDES variable is used for the various certificate packages to make them installable alternatives to the kuksa-val-certificates-* ones. The certificates installed are valid for 1 year and have AGL as the providing organization, longer validity ones will be added in follow up commits for Octopus and Pike. - Update the existing users of kuksa-val-*-certificates with the new kuksa-val-certificates-* package names. - Add PREFERRED_RPROVIDER definitions for the kuksa-val-certificates-* packages to quiet the BitBake warnings coming from having multiple providers. Bug-AGL: SPEC-4763 Change-Id: Ic6f1ca8b54f637674cd5ae42df0bed6ca4e729aa Signed-off-by: Scott Murray <scott.murray@konsulko.com>
2023-04-26html-homescreen: bump SRVREVRoger Zanoni1-1/+1
Includes a fix to application listing/starting after the change to gRPC API. Bug-AGL: SPEC-4764 Signed-off-by: Roger Zanoni <rzanoni@igalia.com> Change-Id: I76b9074e12c662bda4b87c2869ceb8a51188c064
2023-04-26html5-launcher: Bump SRCREVRoger Zanoni1-1/+1
Includes a fix to application listing/starting after the change to gRPC API. Bug-AGL: SPEC-4764 Signed-off-by: Roger Zanoni <rzanoni@igalia.com> Change-Id: I6062afa817d6b2435e03a1b1ede756a6cd7554b4
2023-04-13cluster-receiver: Bump SRCREVMarius Vlad1-1/+1
As to include the cluster-receiver protocol update to allowing building agl-cluster-demo-platform. Change-Id: I88403976ec1a40d3b01049343fd4cfdf36876415 Signed-off-by: Marius Vlad <marius.vlad@collabora.com>
2023-04-03agl-service-audiomixer: Update SRCREVJan-Simon Moeller1-1/+1
Update to include the compilation fix. Bug-AGL: SPEC-4732 Change-Id: I283a7a495c5356418f006932bbd1f0e1b3bdc5d4 Signed-off-by: Jan-Simon Moeller <jsmoeller@linuxfoundation.org>
2023-03-23html5 demos: Bump SRCREV for hvac and mixer appsRoger Zanoni2-2/+2
Adapted the demos to use kuksa.val Bug-AGL: SPEC-4599 Signed-off-by: Roger Zanoni <rzanoni@igalia.com> Change-Id: I32a9cca7b6289d468c14ee501574358ecc8d6680
2023-03-21homescreen_git: Bump SRCREV to support 0.0.21 AGL compositor versionMarius Vlad1-1/+1
This SRCREV bump update is required to add support for the 0.0.21 AGL compositor version. With it, we change the default homescreen with multiple surfaces to just using a single background surface and explicitly set an activation area. In more detail the following changes have been added: - 444b2a68a homescreen: Only keep the multiple surfaces approach in CI - 4c7852e6f homescreenhandler: Avoid using a stale wl_output - 7ff53ae1b meson.build: Bump to the latest agl-compositor version - bb4c83e29 homescreen: Add support for defining an activation area Change-Id: I23dfa8c8304b0493f29f38c2afb4a4837980a357 Signed-off-by: Marius Vlad <marius.vlad@collabora.com>
2023-03-20Add window-management-client-grpcMarius Vlad1-0/+28
This adds a recipe for window-management-client-grpc for testing out the gRPC interface. This client will talk with the compositor indirectly, using the gRPC interface exposed by the grpc-proxy helper client. Bug-AGL: SPEC-4673 Change-Id: Ib1a9d14a3bd41ea64180494962f97f0d5b557c09 Signed-off-by: Marius Vlad <marius.vlad@collabora.com>
2023-01-29Update radio support in demo applicationoctopus_14.94.0octopus/14.94.014.94.0Scott Murray2-2/+2
Update libqtappfw SRCREV to pick up: 9a7e2c5 Rework radio support for new gRPC API 888eca5 vehicle-signals: Increase double value precision and radio SRCREV to pick up: aef392d Update radio wrapper name Bug-AGL: SPEC-4665, SPEC-4662 Change-Id: I8478ec61d35b9ef0d45a6dff2bc9e7a3e7f8fe1b Signed-off-by: Scott Murray <scott.murray@konsulko.com>
2023-01-29Restore agl-service-radio recipeScott Murray1-0/+30
Add an update recipe for agl-service-radio to build the reworked gRPC service daemon, and add it back as a dependency in packagegroup-agl-ivi-services so it will be installed into the demo IVI images. Bug-AGL: SPEC-4665 Change-Id: I9239a1e1476687e4c41367dbdfc6051c56b88c48 Signed-off-by: Scott Murray <scott.murray@konsulko.com>
2023-01-29Run agl-compositor in system scope for QEMU+KVM demo imageScott Murray2-8/+9
To allow usefully depending on the native-shell-client "homescreen" application from the systemd units running QEMU, tweak things to drop the use of agl-session from the agl-kvm-demo-platform host image. The motivation for this is to have the VM guest start up ordering work as expected, avoiding unnecessary delays from race failures on boot. Changes: - Rework agl-kvm template to use conf/include/agl-kvm.inc include file to match other featurs and simplify development. - Add include files for the host ("default" in BitBake) and guest (so agl-kvm-guest) multiconfigs to allow disabling the agl-demo feature in the host build, which disables agl-session. - Update native-shell-client systemd unit to run at system scope and depend upon agl-compositor directly. - Update agl-qemu-runner systemd template unit to depend directly on native-shell-client. Note that a consequence of these changes is that building images other than agl-kvm-demo-platform when the "agl-kvm" feature is used will likely not yield the desired results. Future work will investigate avoiding this problem, or forcing explicit compatibility errors to avoid user confusion. Bug-AGL: SPEC-4618 Change-Id: I295caf2969c5f4179c93f1b57afa703f1a866457 Signed-off-by: Scott Murray <scott.murray@konsulko.com> (cherry picked from commit 94ee287730b16820003aece648e790923a9a5b79)
2023-01-29Make cluster dashboard KUKSA.val server configurableScott Murray2-0/+6
Add CLUSTER_DEMO_VISS_HOSTNAME variables to the cluster-dashboard and flutter-cluster-dashboard recipes and tweak the installed configuration files to use the address it specifies. This provides a hook for tweaking the configuration for e.g. running in the guest VMs in the QEMU+KVM demo. This may need to be tweaked down the road to use something like multiple packages + the alternatives mechanism instead. Bug-AGL: SPEC-4618 Change-Id: I3798987566d681eac59e8c4b9c1f2423d950b2ba Signed-off-by: Scott Murray <scott.murray@konsulko.com> (cherry picked from commit 5109016c566a4a46e4a85f2c7b9dfcd6b8540233)
2023-01-29kuksa_vss_init: update some signal namesScott Murray1-11/+11
Update some signal names that were missed in previous VSS 3.0 updates. Bug-AGL: SPEC-4664 Change-Id: I2352eb67ec5a87701c184b7d112e8a0e41a71c11 Signed-off-by: Scott Murray <scott.murray@konsulko.com> (cherry picked from commit 559c654fb03a8f7530f291066122fe33a6b99449)
2023-01-29tbtnavi: Update SRCREVScott Murray1-1/+1
Update SRCREV to pick up: f923df9 Update engine speed signal Bug-AGL: SPEC-4664 Change-Id: Ie6d2b101ba8e637af4ccef81024a269639796103 Signed-off-by: Scott Murray <scott.murray@konsulko.com>
2023-01-29flutter-hvac: Update SRCREVScott Murray1-1/+1
Update SRCREV to pick up: 20d76f9 Spelling fixes fe23ca5 Rework temperature controls Bug-AGL: SPEC-4642, SPEC-4644 Change-Id: Ia958a52ca75d450f51c93344683c0bacec8f6288 Signed-off-by: Scott Murray <scott.murray@konsulko.com>
2023-01-29flutter-cluster-dashboard: Update SRCREVScott Murray1-1/+1
Update SRCREV to pick up: be4da31 VSS signal fixes a0da726 UI tweaks Bug-AGL: SPEC-4653 Change-Id: Ie93d9a5121f83091be6f829b21953de1946c5203 Signed-off-by: Scott Murray <scott.murray@konsulko.com>
2023-01-29flutter-dashboard: Update SRCREVScott Murray1-1/+1
Update SRCREV to pick up: adc3fca UI Tweak 9ba227f Rework Riverpod provider usage 7e9b0b7 Layout simplifications and tweaks Bug-AGL: SPEC-4660 Change-Id: I74f3390d5e88e7c002a55ac0bd82f4273dfe3911 Signed-off-by: Scott Murray <scott.murray@konsulko.com>
2023-01-29flutter-homescreen: Update SRCREVScott Murray2-2/+9
Update SRCREV to pick up: 5ce59ba UI Fixes 3caff56 Improve app listing 4fbd3fd Add volume control to bottom panel As well, add installation of a now required configuration .yaml file to enable the KUKSA.val usage added by 8528b5b. Bug-AGL: SPEC-4615, SPEC-4659 Change-Id: I38ac698472acd169e9f6c8e4becf28a98e37ad42 Signed-off-by: Scott Murray <scott.murray@konsulko.com>
2022-12-30flutter-cluster-dashboard: remove warningScott Murray1-6/+0
Since the navigation support in the Flutter cluster dashboard is somewhat optional if we're using the navigation streaming, and it likely needs further development to be usable, remove the warning about supplying a MapBox API key to avoid unnecessary confusion. Bug-AGL: SPEC-4640 Change-Id: I0b34cb3b52c06cad09a447fd8b86b8f5eb4f846b Signed-off-by: Scott Murray <scott.murray@konsulko.com>
2022-12-12radio: update SRCREVoctopus_14.92.0octopus/14.92.014.92.0Scott Murray1-1/+1
Update SRCREV to pick up: 1e6de65 Merge "Update icon" 424fa46 Update icon 147a454 Fix layout issues Bug-AGL: SPEC-4444, SPEC-4643 Change-Id: I5ec9068554a0dcb80e81e9edb2c3a30501dd3b9f Signed-off-by: Scott Murray <scott.murray@konsulko.com>
2022-12-12cluster-receiver: update SRCREVScott Murray1-1/+1
Update SRCREV to pick up: f8f7cc6 Add optional override for window geometry Bug-AGL: SPEC-4640 Change-Id: I798595b4928d7378b3788bb40b60962da984ce2e Signed-off-by: Scott Murray <scott.murray@konsulko.com>
2022-12-12tbtnavi: update SRCREVScott Murray1-1/+1
Update SRCREV to pick up: 624f4e5 Update output display ID Bug-AGL: SPEC-4645 Change-Id: Ib131d09b57aa9d0adaad9575bb415c79c8821ba2 Signed-off-by: Scott Murray <scott.murray@konsulko.com>
2022-12-12flutter-hvac: update SRCREVScott Murray1-1/+1
Update SRCREV to pick up: 467221c Add icon cbe288a Update left/right labels Bug-AGL: SPEC-4634, SPEC-4644 Change-Id: I258ff81617802e8c01fed1bb5e64b4f6afba4eeb Signed-off-by: Scott Murray <scott.murray@konsulko.com>
2022-12-12flutter-dashboard: update SRCREVScott Murray1-1/+1
Update SRCREV to pick up: e6ecc5d Update Tier -> Tire 5db65d9 Update signal names and types for KUKSA.val 0.2.5 fb1a236 Add icon Bug-AGL: SPEC-4634, SPEC-4641, SPEC-4642 Change-Id: I5566c7fbc305cc8a34c9e0611db0d22f2796a05e Signed-off-by: Scott Murray <scott.murray@konsulko.com>
2022-12-12flutter-cluster-dashboard: update SRCREVScott Murray1-1/+1
Update SRCREV to pick up: e440ec3 Update signal names and types for KUKSA.val 0.2.5 Bug-AGL: SPEC-4641 Change-Id: Iac91128ed43083629aebd2f573164240a043ed04 Signed-off-by: Scott Murray <scott.murray@konsulko.com>
2022-12-10flutter-cluster-dashboard: Add demo configurationScott Murray2-4/+29
Add a demo configuration yaml file to point at the KUKSA.val server on the IVI board that can be installed as an alternative to the default. Bug-AGL: SPEC-4636 Change-Id: I75f91ad620e33ef7cbd7c6de4ef7ccae9b17cdf4 Signed-off-by: Scott Murray <scott.murray@konsulko.com>
2022-12-10radio: Update display nameScott Murray1-0/+2
Set AGL_APP_NAME for the radio application. Bug-AGL: SPEC-4638 Change-Id: I05f5e30f79d53fb9faa913d06801bfd5ec05bf85 Signed-off-by: Scott Murray <scott.murray@konsulko.com>
2022-12-10Remove demo sllin configurationScott Murray3-36/+0
Remove recipes providing sllin configuration for the full demo, as all LIN usage is being replaced with CAN. The recipes for the sllin driver and associated lin_config utility are kept for now in case there are external uses. Bug-AGL: SPEC-4635 Change-Id: I67b7acf5a8c3801cb1890ee27486080255252385 Signed-off-by: Scott Murray <scott.murray@konsulko.com>
2022-12-10Update cluster network configurationScott Murray1-1/+1
Update configuration files as appropriate with the IVI board as 192.168.10.2 and the cluster as 192.168.10.3. This includes removing the cluster-connman-conf network configuration recipe. Bug-AGL: SPEC-4632 Change-Id: I60011a3615152a036057ca1a98d3916c67a3cd1e Signed-off-by: Scott Murray <scott.murray@konsulko.com>
2022-11-22native-shell-client: Add systemd unitScott Murray3-0/+25
Add a bbappend for native-shell-client to add a systemd unit that runs in the agl-driver user session. This is required to actually get it started if it is built into an image. Bug-AGL: SPEC-4618 Change-Id: If6c1c015544ee6f126fb30ca67822a38a83df64c Signed-off-by: Scott Murray <scott.murray@konsulko.com>
2022-11-22Bump flutter-dashboard and flutter-hvacoctopus_14.91.0octopus/14.91.014.91.0Scott Murray2-2/+2
Bump flutter-dashboard and flutter-hvac SRCREVs to pick up opaque background fixes. Bug-AGL: SPEC-4614 Change-Id: I9d2630f1325c7f6e8657a9c7eb1f8ead23e3a5ba Signed-off-by: Scott Murray <scott.murray@konsulko.com>
2022-11-22Update Flutter demo image to use Flutter homescreenScott Murray2-7/+2
Changes: - Update Flutter demo image packagegroup to replace the Qt demo homescreen and launcher with the new Flutter homescreen. The list of apps to install has been tweaked to drop the Qt HVAC and dashboard applications and add the Qt settings, mediaplayer, and navigation apps, to better reflect what is likely to be usable for ALS and CES. - A AGL_FLUTTER_RUNTIME variable has been used in the Flutter demo image packagegroup to allow potentially switching the Flutter packages from release to debug or profile versions. - Add Flutter homescreen specific weston-ini-conf-flutter package to the Flutter demo image. - Tweak the application display names for the Flutter dashboard and HVAC applications to drop the Flutter prefix since they will be the only versions present in the Flutter demo image. Bug-AGL: SPEC-4615 Change-Id: Iec1c139b72cbd953420f23484942ad255080f4f7 Signed-off-by: Scott Murray <scott.murray@konsulko.com>
2022-11-21flutter-homescreen: add recipeScott Murray5-0/+80
Add recipe for Flutter homescreen application. Bug-AGL: SPEC-4615 Change-Id: I71510ff462c84bed0de36e889455828a4feb02b3 Signed-off-by: Scott Murray <scott.murray@konsulko.com>
2022-11-14Restore webapp samplesRoger Zanoni13-53/+74
The desktop files aren't used anymore, change the recipes to use appinfo.json instead. Bug-AGL: SPEC-4605 Signed-off-by: Roger Zanoni <rzanoni@igalia.com> Change-Id: Ie03aef155217f59bb6363f18b2781adbacc93786
2022-11-10Updates for KUKSA.val 0.2.5Scott Murray4-4/+4
Update SRCREVs for the agl-service-audiomixer and agl-service-hvac services as well as the dashboard and agl-cluster-demo-dashboard apps to pick up fixes for signal changes in KUKSA.val 0.2.5. Bug-AGL: SPEC-4587, SPEC-4598 Change-Id: I581ad6560032c76458e00658b750cba7d0b6e1de Signed-off-by: Scott Murray <scott.murray@konsulko.com>
2022-10-18homescreen_git.bb: Bump SRCREV to add meson supportMarius Vlad1-2/+2
Bug-AGL: SPEC-4584 Signed-off-by: Marius Vlad <marius.vlad@collabora.com> Change-Id: I3954e92177cccc5d8180956b4e482e707f043b30
2022-10-08Change SRC_URI and SRCREV for ivi-demo-flutter-appsHritik Chouhan5-14/+14
- Change SRC_URI to use the app repository on gerrit. - Renamed recipes file name. Bug-AGL: SPEC-4560 Change-Id: I2887e568e6a466836d68866ace0766c7ed7949d9 Signed-off-by: Hritik Chouhan <hritikc3961@gmail.com>
2022-10-03html5-aquarium: fix the incorrect licenseDenys Dmytriyenko1-1/+1
As "BSD-3" is incorrect and "BSD-3-Clause" should be used instead. Causes: WARNING: agl-demo-platform-html5-1.0-r0 do_rootfs: QA Issue: The license listed BSD-3 was not in the licenses collected for recipe html5-aquarium [license-file-missing] Bug-AGL: SPEC-4580 Signed-off-by: Denys Dmytriyenko <denys@konsulko.com> Change-Id: I06b3865bad8667c4f7514c70fed89730cf15e713
2022-09-23homescreen_git.bb: Bump SRCREV to get protocol updatesMarius Vlad1-1/+1
This bumps homescreen's SRCREV to include agl-shell protocol update v2 and v3. Bug-AGL: SPEC-4528 Signed-off-by: Marius Vlad <marius.vlad@collabora.com> Change-Id: I39d9fd520e398c71eb00ada376f24faaabeab85a
2022-09-22recipes-demo: camera-gstreamer: Updates for application enumeration via ↵Vasyl Vavrychuk1-1/+3
systemd units Update camera-gstreamer recipe to use the new agl-app.bbclass to install the now required by applaunchd systemd template unit instances. For application display name use it from camera-gstreamer.desktop available via application sources repository. Bug-AGL: SPEC-4466 Change-Id: I0890951d4ecac95e9d4a44ed5a83e704cd41673f Signed-off-by: Vasyl Vavrychuk <vasyl.vavrychuk@opensynergy.com>
2022-09-22recipes-demo: Add videoplayer recipe.Vasyl Vavrychuk1-0/+31
videoplayer BitBake recipe imported from attachment to AGL JIRA ticket [1] with adaptation for AGL NN. videoplayer suggested as an application to play video in [2]. Out from the box mediaplayer does not support video (only audio is supported). [1]: https://jira.automotivelinux.org/browse/SPEC-2389 [2]: https://jira.automotivelinux.org/browse/SPEC-4028 Bug-AGL: SPEC-4148 Change-Id: Ifd20f3e00ad1a99d0d05b8fb361ff7a8eb7a78f2 Signed-off-by: Vasyl Vavrychuk <vasyl.vavrychuk@opensynergy.com>
2022-09-22Add recipes for flutter appsHritik Chouhan7-4/+122
- This add the flutter dashboard,hvac,navigation, mediaplayer apps in the AGL. - Pin all the flutter apps in IVI flutter demo homescreen. - Add config file for each app for kuksaAuthToken and mapboxAccessToken. Bug-AGL: SPEC-4560 Change-Id: If5f58e6ccc402f56fef66cc29d3959b834c4e27c Signed-off-by: Hritik Chouhan <hritikc3961@gmail.com>
2022-09-22Change SRC_URI and SRCREV for flutter-cluster-dashboardAakash Solanki1-3/+3
- Change SRC_URI to use the app repository on gerrit. - Change SRCREV to use latest commit of apps/flutter-instrument-cluster on gerrit Bug-AGL: SPEC-4508 Change-Id: I7f4cc443beaa1fe8991f6f913da1b59a76321e0b Signed-off-by: Aakash Solanki <tech2aks@gmail.com>
2022-09-21Switch Qt demo apps to gRPC launcher APIScott Murray3-11/+16
Changes: - Update SRCREV in libqtappfw, launcher, and homescreen recipes to pick up gRPC API changes. - Update libqtappfw recipe for switch to meson instead of CMake, and add new protobuf and gRPC dependencies. - Update launcher recipe to pull in new libqtappfw dependency, and update some formatting for consistency with the other recipes. Bug-AGL: SPEC-4559 Signed-off-by: Scott Murray <scott.murray@konsulko.com> Change-Id: I6ec0f53a0cc68bcf9b434086d99e8849c11198f3
2022-09-15Add config file for flutter-cluster-dashboardAakash Solanki2-2/+23
- Add 'flutter-cluster-dashboard.yaml' file, which contains KUKSA.VAL auth token and few other paramenters. - Set openrouteservice API Key in local.conf to the variable `OPENROUTE_API_KEY`. - Change SRCREV Bug-AGL: SPEC-4508 Change-Id: I9a225013e18b65626b391258445ec0f6acf1a970 Signed-off-by: Aakash Solanki <tech2aks@gmail.com>
2022-09-07Add Flutter HVAC appHritik Chouhan1-1/+1
- This add the Flutter HVAC app in the AGL - Pin the flutter HVAC app in IVI flutter demo homescreen. - Integrate with kuksa-val server. Bug-AGL: SPEC-4531 Change-Id: Idebb430360cd439d1403da86b220c9e9b5c48f22 Signed-off-by: Hritik Chouhan <hritikc3961@gmail.com>
2022-09-07Add flutter dashboard appHritik Chouhan2-0/+60
- This adds the Flutter dashboard app in the AGL. - Pin the flutter dashboard app in IVI flutter demo homescreen. - Integrate with kuksa-val server. - change the homepage same as SRC_URI. - change the AGL_APP_NAME. Bug-AGL: SPEC-4524 Change-Id: I37dbcac2aa7a26b64250dd8fbec4de6051f16198 Signed-off-by: Hritik Chouhan <hritikc3961@gmail.com>
2022-09-06wam: fix surface type name in application manifestJose Dapena Paz2-2/+2
Renamed appinfo.json field surface_role to be surface_type to be consistent with other parts of the code base. Took the chance to remove types that were not meaningful, and renamed default type (the one used when it is not set) to be default instead of none. Then updated the only applications setting the value to use the new propery. Those are html5-background and html5-homescreen. wam: 8ea41f7..4fbd6e6 4fbd6e6 [op][agl][wayland] Provide only supported AGL shell types html5-background: e91be22..aa7e2a8 aa7e2a8 Rename surface/role in appinfo.json to surface/type. bb4f497 autobuild: Remove autobuild scripts html-homescreen: fc0ffa4..f3cecb6 f3cecb6 Rename surface/role in appinfo.json to surface/type. Bug-AGL: SPEC-4505 Signed-off-by: Jose Dapena Paz <jdapena@igalia.com> Change-Id: I404717dd5d848220bd5f070b98de56df38a78e20