summaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)AuthorFilesLines
2024-05-10meta-agl-ic-container: fix packagegroup-agl-core-selinux-guestquillback_17.1.0quillback/17.1.017.1.0Scott Murray1-1/+3
packagegroup-agl-core-selinux-guest now triggers a packaging QA check due to it being marked as allarch and pulling in libraries that get renamed by the Debian library renaming logic used by upstream. To fix, follow what is done by the similar packagegroups in meta-selinux and not use packagegroup.bbclass. Bug-AGL: SPEC-5123 Change-Id: I1391977d5db3aad3d4e87ff8d043a3bb26b7074a Signed-off-by: Scott Murray <scott.murray@konsulko.com> (cherry picked from commit c7c181b3986803e49844e1e371643b6545e8681e)
2024-03-21meta-agl-flutter: mask out libstd-rs bbappendquillback_17.0.2quillback_17.0.1quillback/17.0.2quillback/17.0.117.0.217.0.1Scott Murray1-0/+4
The libstd-rs bbappend in meta-flutter breaks building with newer versions of Rust, so BBMASK it out for now. Since the change it makes is to enable debugging Dart/Rust FFI wrappers, and AGL does not currently use such functionality, this should not change any behavior. Bug-AGL: SPEC-5070 Change-Id: I6984303bfc478a7574992f3d927bdaaeb41afa7c Signed-off-by: Scott Murray <scott.murray@konsulko.com> (cherry picked from commit 3058f411221cebcd4f97941d8e9a4c7d65a193b1)
2024-02-13Add gitreview file for Quirky Quillback branchquillback_17.0.0quillback/17.0.017.0.0Jan-Simon Moeller1-1/+1
Update the .gitreview file. Bug-AGL: SPEC-5071 Signed-off-by: Jan-Simon Moeller <jsmoeller@linuxfoundation.org> Change-Id: I43ed0d1c9b38af91a73786df320544fb220336d7
2024-02-09virtio: fix bblayer dependencies and include fileJan-Simon Moeller3-3/+13
To make the feature build, we need to adapt the dependencies. There are also 2 packages that do not build - mask them till they are fixed. Bug-AGL: SPEC-4834 Change-Id: Id35be44e14d2c0c429e403126953c3d5c78241a6 Signed-off-by: Jan-Simon Moeller <jsmoeller@linuxfoundation.org>
2024-01-29New virtio-loopback-adapter repository addedquillback_16.93.0quillback/16.93.016.93.0Michele Paolino2-2/+3
This patch forces the use of the right virtio-loopback repository. We can now close SPEC-4966 Bug-AGL: SPEC-4966 Change-Id: I85c4e290d396e7189d297c101416662940db1f35 Signed-off-by: Michele Paolino <m.paolino@virtualopensystems.com>
2024-01-29Sync rebooting cluster-service and cluster-refguiNaoto Yamaguchi3-1/+7
The cluster-refgui shall re-connect in case of cluster-service rebooting. This method should support to realize robustness system. This patch add support sync rebootig feature. Bug-AGL: SPEC-5040 Change-Id: Iadd1c254d4b8e32be15419b3526dc581333a5456 Signed-off-by: Naoto Yamaguchi <naoto.yamaguchi@aisin.co.jp>
2024-01-29Remove auditd and policy tool in guestNaoto Yamaguchi2-0/+32
The SELinux policy set at host in boot time, the guest container shall not overwrite SELinux policy. On the other hand, existing guest integration install SELinux policy tool in guest. The auditd has same issue. That shall work in host, shall not work in guest. This patch fix these issue. Bug-AGL: SPEC-5039 Change-Id: I3887d4f64d31a833f5e47fd9fb41e8fbbf6efe1e Signed-off-by: Naoto Yamaguchi <naoto.yamaguchi@aisin.co.jp>
2024-01-03flutter-auto: Add support for width/height activation areaMarius Vlad4-1/+256
Bug-AGL: SPEC-5038 Change-Id: I9d775fee5f806069982718c2b3247ce1fac3241d Signed-off-by: Marius Vlad <marius.vlad@collabora.com>
2023-12-29Vhost-user-console device and can license fixesMichele Paolino16-2/+1755
This patch presents a new console device and fixes vhost-user-can license. vhost-device can and conosle devices will be proposed to rust-vmm/vhost-device community, and in case of acceptace this patch will be updated. Bug-AGL: SPEC-4834 Change-Id: I4dcded8733195158f848bd0e4fd4f4618a378c3a Signed-off-by: Michele Paolino <m.paolino@virtualopensystems.com>
2023-12-26Move cluster core package to cluster demo imageNaoto Yamaguchi2-1/+1
This patch is a workaround. Current guest-image-minimal is used by guest-image-cluster-demo and guest-image-ivi-demo. The cluster core package is include at guest-image-minimal. In this case, cluster core package is install to cluster and ivi image. That cause twin cluster service run on one system. This patch fix this issue, but it's only a workaronud. Will be re-structure for image-recipes. Bug-AGL: SPEC-4990 Change-Id: I5b9a23042e0796b49ed7703b5860c8a600007251 Signed-off-by: Naoto Yamaguchi <naoto.yamaguchi@aisin.co.jp>
2023-12-26Up revision to cluster-service oriented versionNaoto Yamaguchi1-1/+1
The latest cluster service is supporting demo signal passing by cluster API. This patch change cluster-refgui to cluster-service oriented version that behavior is controlled by cluster-service. Bug-AGL: SPEC-4991 Change-Id: Ibe687482bbf2b21b21668596cc035e0c4fe1ec33 Signed-off-by: Naoto Yamaguchi <naoto.yamaguchi@aisin.co.jp>
2023-12-13CAN, GPIO, RNG vhost-devices for virtio-loopback [v6]quillback_16.92.0quillback/16.92.016.92.0Michele Paolino37-5695/+1941
This patch adds key components of the viritio-loopback architecture: - kernel-module-virtio-loopback: the virtio loopback kernel driver - CAN, GPIO and RNG vhost-user devices from meta-virtualization (commit a215d8320edee0a317a6511e7e2efa5bba867486) Notes: - libgpiod, comes from meta-openembedded commit 3029554ceb0b0bb52a8d8ec3f0a75c5113662fe6 - cleaned eg-virt from unused drivers (kernel-module-virtio-video) Bug-AGL: SPEC-4834 V2 changes: - related meta-virtualization commit message added in the cover letter - updated libgpio recipe to v2.1 - SPEC reference added in cover letter v3 - add vhost-device-can preliminary version. This is placed here with the objective to share the link when proposing the new device to the rust-vmm/vhost-device community - remove cargo-update-recipe-crates includes in bb file because it is not supported by the rust mixin layer - vhost-device folder README changes v4 - fixed libgpiod required version - tested ref hw and qemu x86/64 builds - vsock, scsi and i2c rust devices removed from the build as they are not yet integrated in virtiod-loopback - cleaned-up kernel modules kernel-module-virtio-video and gstreamer1.0-plugins-bad - virtio-loopback-driver set to 2-or-later v5 - Merge with Jan-Simon version v4: - remove broken kernel-module-virtio-video - use FEATURE_PACKAGES instead of IMAGE_INSTALL:append - rename virtio-loopback-driver.bb to kernel-module-virtio-loopback_git.bb for consistency v6 - adding version in the title - removing MODULE_GIT_REPOSITORY in kernel-modules Change-Id: Id6cc58e777b9edad03b6c50d0dddaac8601edeaf Signed-off-by: Michele Paolino <m.paolino@virtualopensystems.com> Signed-off-by: Jan-Simon Moeller <jsmoeller@linuxfoundation.org>
2023-12-12agl-test-framework: bump SRCREVYan1-1/+3
add tar ptest into suites. Change-Id: I668e0d92847f04c463a152010ce01b7ae51bc259 Signed-off-by: Yan <yanxk.fnst@fujitsu.com>
2023-12-12Add support wl_output version 4 and agl_shell v8Marius Vlad3-0/+596
This adds support for wl_output version 4 that allows to match an output name to a string that can be passed using gRPC APIs. With this it allows events being sent out by the compositor which the shell client can react upon. This can be seen as an intermediary step until flutter-homescreen from ICS gains (direct) support for gRPC to handle activation that way. Bug-AGL: SPEC-5004 Change-Id: I143c9dbbc044720c3dee642177d3ae175bfa9a75 Signed-off-by: Marius Vlad <marius.vlad@collabora.com>
2023-12-12UnifiedHMI: Update SRCREV for RVGPU and virtio-loopback-driver, and upgrade ↵Fumiya Kohzu19-1026/+127
mesa-virtio. - OSS RVGPU update: Support for xdg_shell. - OSS virtio-gpu-driver update: Simplify directory structure, not use cmake. - Recipe updates: 1, Update SRCREV for RVGPU. Since RVGPU now supports xdg_shell in OSS, the patch enabling xdg_shell has been removed. 2, Remove the agl-shell-desktop interface because it is planned to be phased out. 3, Upgrade the base mesa for mesa-virtio from 18.2.0 to 20.3.5. Remove patches that were used with mesa-18.2.0. We are exploring ways to run it with the newer mesa. 4, Update SRCREV for virtio-loopback-driver. 5, Update meta-data for patches of RVGPU and virtio-gpu-driver. The content of the patches remains unchanged. We are planning to support a gRPC protocol interface for RVGPU. Bug-AGL: SPEC-4898 Change-Id: Ie314f40687c92ef93258b8fdc817584586d20e25 Signed-off-by: Fumiya Kohzu <kohzu.fumiya@jp.panasonic.com>
2023-11-29Update cluster-refgui to support cluster-serviceNaoto Yamaguchi1-1/+2
Existing AGL Instrument Cluster is not implement cluster service only a framework library. This patch add support cluster service to cluster-refgui. Bug-AGL: SPEC-4991 Change-Id: Idee17d652d86e743c11de48337d01502bf9f8ff7 Signed-off-by: Naoto Yamaguchi <naoto.yamaguchi@aisin.co.jp>
2023-11-29Replace to cluster-service from libclusteripc and libclusterapiNaoto Yamaguchi3-2/+39
Existing AGL Instrument Cluster is not implement cluster service only a framework library. We create cluster service to realize AGL Instrument Cluster based product. This patch add cluster-service and replace from libclusteripc and libclusterapi. Bug-AGL: SPEC-4990 Change-Id: I236eb33376b1a6a8be4c5677b0aa19b3729376c2 Signed-off-by: Naoto Yamaguchi <naoto.yamaguchi@aisin.co.jp>
2023-11-23egvirt feature updates with virtio-loopbackquillback_16.91.0quillback/16.91.016.91.0Michele Paolino2-10/+21
Automatically installs virtio-loopback when eg-virt feature is enabled. This might be helpful to create images for CI testing. It also aligns egvirt with other featues moving the .inc file outside the template folder. v2: restrict effects only to h3ulcb machine for virtio-loopback components. v3: revert to v1. We don't restrict the append to a specific machine. Bug-AGL: SPEC-4834 Depends on change: 29407 Change-Id: I43222f1711b96e1c76028355611e9d8758204a17 Signed-off-by: Michele Paolino <m.paolino@virtualopensystems.com>
2023-11-16tar: fix ptest with upgrade 1.34 -> 1.35quillback_16.91.1quillback/16.91.116.91.1Qiu Tingting5-26/+57
Rename tar_1.34.bbappend -> tar_1.35.bbappend Add 0004-disable-sparse05.patch to fix ptest-runner pipeline crash, becuase case sparse05 will write files larger than 2 ^ 33 bytes. Bug-AGL: SPEC-4753 Signed-off-by: Qiu Tingting <qiutt@fujitsu.com> Change-Id: Ia8b301fb104c4699d95804d8f4074f4a5b58737a
2023-11-14Fix for typo in agl-service-voiceagent recipeJan-Simon Moeller1-1/+1
There is an error in the SRC_URI. Fix it. Bug-AGL: SPEC-4906 Change-Id: I27d10760401226f4427152554535be75c1bbc77e Signed-off-by: Jan-Simon Moeller <jsmoeller@linuxfoundation.org>
2023-11-09flutter-auto: apply Vivante workaround for NXP BSPScott Murray3-0/+30
Add flutter-auto bbappend back and use it to apply the patch provided in SPEC-4947 when building for NXP BSP platforms that use the Vivante driver. This fixes the crashes observed on imx8mq-evk-viv. Bug-AGL: SPEC-4947 Change-Id: I71786b037f1670e8188d6818a05cb98bc4c129a7 Signed-off-by: Scott Murray <scott.murray@konsulko.com>
2023-11-07virtio-loopback-adapter: Update adapter recipe for sound and GPIO Yocto buildsAngelos Mouzakitis1-1/+1
Signed-off-by: Angelos Mouzakitis <a.mouzakitis@virtualopensystems.com> Change-Id: I3920dc90a6929e00d0a1491f8e63a7e982da9fe7
2023-11-07virtio-loopback kernel driver: Follow updates on the repoAngelos Mouzakitis1-1/+1
Change-Id: I9944c2d385363eda108bd1a585e25d5a3433116a Signed-off-by: Angelos Mouzakitis <a.mouzakitis@virtualopensystems.com>
2023-11-06Fix Flutter versionScott Murray1-1/+1
FLUTTER_SDK_TAG needs to be bumped to 3.13.9 to match the new default in meta-flutter from the most recent layer bump. Bug-AGL: SPEC-4938 Change-Id: I16d95f5b3ac60d4b0d7c4f9ca26bc2f36fd1e5e2 Signed-off-by: Scott Murray <scott.murray@konsulko.com>
2023-11-06meta-agl-flutter READMEJoel Winarske1-0/+48
-add general working notes Signed-off-by: Joel Winarske <joel.winarske@gmail.com> Change-Id: If9abf99a0ea9a1e32fd21d41b7964aa8338c9fd5
2023-11-05Add initial DRM lease test imagesScott Murray20-0/+250
Add guest and host image as well as associated configuration recipes for simple DRM lease testing. The agl-host-image-drm-least-test image has two guests that each run Weston + desktop-shell with a different background color. A known issue at the moment is that networking is not functional in the guests, this will be investigated further. Bug-AGL: SPEC-4955 Change-Id: Ib69e627bb251180c2d7a1175de53d2fb1561aa61 Signed-off-by: Scott Murray <scott.murray@konsulko.com>
2023-11-03Update voice agent related recipesMalik Talha11-17/+103
Change the SRCURI to use gerrit repos. Update agl-service-voicegent recipe to correctly package all the required content. Add recipe for another en-us vosk model. Add service files for RASA and Voice Agent server. Bug-AGL: SPEC-4906 Change-Id: Ic9f77386ff5c545c2a80433dd538c94bd8763e9e Signed-off-by: Malik Talha <talhamalik727x@gmail.com>
2023-11-02Remove unused filesJoel Winarske3-39/+0
-bbappends have been moved upstream Signed-off-by: Joel Winarske <joel.winarske@gmail.com> Change-Id: I7d65ba7b477b67a3e9601633bf4a09f4532fc0ce
2023-10-24agl-wireless-monitor: include CH341 driverYan2-0/+6
CH341 driver is required for the demo for UART communications. Bug-AGL: SPEC-4838 Signed-off-by: Yan <yanxk.fnst@fujitsu.com> Change-Id: I9d1baf6a9463f07631e6737b2b9cdd2c4abe0ee9
2023-10-19flutter-auto: add rcar3 build fix patchScott Murray2-0/+36
Add the patch with the EGL 1.4 compatibility tweak required to build for rcar3 that was accidentally dropped in upstream rebasing. This should be able to dropped when the next update happens. Bug-AGL: SPEC-4937 Change-Id: I5635ab099e5e0bd7240f87f4060815829fb51ac0 Signed-off-by: Scott Murray <scott.murray@konsulko.com>
2023-10-18Flutter 3.13.2 updateJoel Winarske16-561/+133
-README update -workspace-automation configs * _global.json - move to 3.13.2 * _repos.json - remove wonderous, update commits, add depot_tools * flutter-engine.json - flutter engine local build (optional) * desktop-auto.json - remove clang from desktop-auto config -flutter-engine recipe * remove bbappend patches -flutter-auto * update agl-shell PACKAGECONFIG addition * remove patches upstream picked up 0001-shell-wayland-display-Handle-flags-as-bitfield-entri.patch dropped 0001-Add-optional-agl_shell-plugin.patch Bug-AGL: SPEC-4936 Signed-off-by: Joel Winarske <joel.winarske@gmail.com> Signed-off-by: Scott Murray <scott.murray@konsulko.com> Change-Id: Iddd7c0f735abb4d114ba89a8bf0e49977b469150
2023-10-16agl-wireless-monitor: add libcgicYan4-6/+85
cgic library is now added, test cgi deployed onto board. this library would play a build time dependency role later on. Bug-AGL: SPEC-4838 Signed-off-by: Yan <yanxk.fnst@fujitsu.com> Change-Id: I16d67e2bacabb12bd36f2c439eeee91ef786e7c5
2023-10-16agl-wireless-monitor: add MJPG streamerYan2-0/+33
a new component of the monitor called MJPG streamer is added. Bug-AGL: SPEC-4838 Signed-off-by: Yan <yanxk.fnst@fujitsu.com> Change-Id: I300e50d3f9c803c95de9b620318dbf26d597f6b3
2023-10-13virtio-loopback: Update upstream to epsilon branchesAngelos Mouzakitis5-27/+28
These is the prerequisite work to enable support for feature vhost-devices on the adapter (gpu, sound, gpio) v2: Add sound support on virtio-loopback-adapter v2: Update recipe names of adapter and loopbackdriver with virtio- prefixes v2: Update recipes URI location to AGL-gerrit servers Change-Id: I15b45d37f0726864629749e8cb77dd6cf6d03628 Signed-off-by: Angelos Mouzakitis <a.mouzakitis@virtualopensystems.com>
2023-10-11offline-voice-agent: increase BAZEL_JOBS and BAZEL_MEM defaultsJan-Simon Moeller1-1/+6
To speed up the build process, increase the default values for BAZEL_JOBS to HOST_CPUS*.4 and for BAZEL_MEM to HOST_RAM*0.4 . Bug-AGL: SPEC-4856 Change-Id: I3a167df914373979ea39b7ccbd508de15861c115 Signed-off-by: Jan-Simon Moeller <jsmoeller@linuxfoundation.org>
2023-10-11Add recipes for voice agent service and appMalik Talha3-0/+63
Recipe files to compile the voice agent service and the flutter app, also add meta-tensorflow layer conf. Bug-AGL: SPEC-4906 Change-Id: I0e2eea863c95cd84d85d06194fbf01fcc64adb86 Signed-off-by: Malik Talha <talhamalik727x@gmail.com>
2023-10-06Add dependencies for RASA frameworkMalik Talha58-8/+1334
This adds the libraries for the RASA machine learning framework. Bug-AGL: SPEC-4856 Change-Id: I477b09cae8ff51e284b51238cb5940464ea57a51 Signed-off-by: Malik Talha <talhamalik727x@gmail.com>
2023-10-06Fix Scipy, OpenBlas, and NumPy library linking issuesMalik Talha5-53/+7
This fixes the linking issues primarily between Scipy and OpenBlas caused due to Scipy expecting a different name for OpenBlas dynamic linking library. Bug-AGL: SPEC-4925 Change-Id: Idb8f620134d63e7d9425a0df8942370430b3f700 Signed-off-by: Malik Talha <talhamalik727x@gmail.com>
2023-10-06Add support Salvator-x H3/M3 to IC container demoHau Vo2-0/+6
This enable lxc auto start on Salvator-x H3/M3 and specify drm interface for M3. Bug-AGL: SPEC-4808 Signed-off-by: Hau Vo <hau.vo.ra@renesas.com> Change-Id: I45e9ff5453655f814f067ec1f48611ee4cea8442
2023-10-06Fix missing gles-user-module-firmware in agl-cluster-demo-lxc-host imageHau Vo1-1/+1
rcar platform need gles-user-module-firmware for graphics Bug-AGL: SPEC-4808 Signed-off-by: Hau Vo <hau.vo.ra@renesas.com> Change-Id: I0dfc229b185bbe039a01f1c8a2f4ce031fbbc728
2023-10-05Add dependencies for intent engine snipsMalik Talha28-5/+1551
This adds the libraries for the snips intent engine. Bug-AGL: SPEC-4856 Change-Id: I0acec6fdd1d0809ee2a0a52ee2c95cd86671d760 Signed-off-by: Malik Talha <talhamalik727x@gmail.com>
2023-09-28tar: Add ptest supportQiu Tingting5-0/+442
Add ptest support for tar. It contains two parts. One part is a backport for http://cgit.openembedded.org/openembedded-core/commit/?h=master-next&id=878e154181e5e8d18e3605f0989bebf4aec1c6e1 It should be deleted after yocto version up. Another part is changing formate of the result of "ptest-runner tar" Because some cases have same name, adding a case number can better locate incorrect case. A sample: PASS: tar version --> PASS: 1: tar version SPEC-4753 Signed-off-by: Qiu Tingting <qiutt@fujitsu.com> Change-Id: I878bdf1693f0e71c1ba33642cd4ff70977e125f9
2023-09-25agl-test-framework: Bump SRCREVYan1-1/+5
Bump agl-test-framework SRCREV to include recently added test suites into the test framework. Bug-AGL: SPEC-4753 Signed-off-by: Yan <yanxk.fnst@fujitsu.com> Change-Id: I0594d08ed6077d61a96285a28dcfd22456459236
2023-09-15agl-wireless-monitor: provide boa and basic dependency chainYan12-0/+256
1, add new feature 'agl-wireless-monitor' to help compile the project. 2, provide boa web server for project, it is fixed and configured, for more information you can go check the conf patch. 3, provide basic bb file for main program, currently some of the html files are included. Bug-AGL: SPEC-4838 Signed-off-by: Yan <yanxk.fnst@fujitsu.com> Change-Id: Ia870a76be602a9bc10eeed5e91873c2757a56a2a
2023-09-11Unified HMI: initial commitFumiya Kohzu34-0/+1488
This is the initial commit for RVGPU of Unified HMI. `Unified HMI` is a common platform that promotes UX innovation in integrated cockpits and enables flexible information display from various applications across multiple displays. `RVGPU` is a client-server based rendering engine that creates 3D commands on a client device, sends them to a server for GPU rendering, and displays the results. - create new layer, meta-uhmi - create sub-layer, meta-rvgpu - add 1 feature to enable basesystem, agl-rvgpu Bug-AGL: SPEC-4744 Change-Id: I9b6f3966e3d5a859787f81c41b584fa686fd1f87 Signed-off-by: Fumiya Kohzu <kohzu.fumiya@jp.panasonic.com>
2023-09-05xz: Add ptest supportQiu Tingting2-0/+38
Add ptest support for xz. It is a backport for https://lists.openembedded.org/g/openembedded-core/message/182481 It should be deleted after yocto version up. SPEC-4753 Signed-off-by: Qiu Tingting <qiutt@fujitsu.com> Change-Id: I3dd4f7f70d1f71cb277506af2cd2e3d28d596150
2023-09-04Fix agl IC demo is not show both screenNaoto Yamaguchi9-12/+38
In R-Car platform such as ref-hw is not show cluster and ivi screen. It cause by installing gles-user-module-firmware into guest image. gles-user-module-firmware is installed by kernel-module-gles dependency. kernel-module-gles is installed by MACHINE_EXTRA_RRECOMMENDS from agl_rcar.inc, but this environment variable can't delete in guest build. This patch fix this issue. Bug-AGL: SPEC-4888 Change-Id: Ica0f8d6ef48d30333bbccdff7380471b11ad063c Signed-off-by: Naoto Yamaguchi <naoto.yamaguchi@aisin.co.jp>
2023-08-23fontconfig: Add ptest supportQiu Tingting3-0/+66
Add a ptest for fontconfig. It is a backport for https://lists.openembedded.org/g/openembedded-core/topic/meta_oe_patch_v1/100753708 It should be deleted after yocto version up. SPEC-4753 Signed-off-by: Qiu Tingting <qiutt@fujitsu.com> Change-Id: Icfc3e3b4503000c02c2156f20bc8dc9ae3cbfa5b
2023-08-21Move momi ivi repo from outside development repository to AGLNaoto Yamaguchi3-9/+9
Mominavi, momiplay and momiscreen are refernce application of AGL IC container integration. These repository was refer to outside development repository. This patch change repository from outside development repository to AGL repository. Bug-AGL: SPEC-4821 Change-Id: I5380f002982978457df5320c66a4bba3135778db Signed-off-by: Naoto Yamaguchi <naoto.yamaguchi@aisin.co.jp>
2023-08-16agl-test-framework: Bump SRCREVYan1-1/+35
Bump agl-test-framework SRCREV to include recently added test suites into the test framework. Bug-AGL: SPEC-4753 Signed-off-by: Yan <yanxk.fnst@fujitsu.com> Change-Id: Ia31d2cb091598406abb3f3683d02be0f939df499