summaryrefslogtreecommitdiff
path: root/meta-fii
AgeCommit message (Collapse)AuthorFilesLines
2024-04-22meta-fii: meta-mori: Remove multi-user require of obmc-host-reset targetKyle Nieman1-0/+1
Rebooting the host will stop multi-user.target from reaching an active state if obmc-host-reboot@0.target is called before then. As a result, the BMC state will always be set to NotReady. Testing: Calling obmc-host-reboot@0.target prior to multi-user.target being reached will no longer cause multi-user.target to fail. Change-Id: Ie0e8fc5341472a930f9ec6f0bf74c9a2b2687d32 Signed-off-by: Kyle Nieman <kyle.nieman@fii-na.com>
2024-04-04meta-fii: meta-mori: Move BMC BIOS CPLD update to phosphor-ipmi-flashVincent Chou17-181/+117
Combine the update packages into phosphor-ipmi-flash to clean up the meta layer. Since meta-google has installed their virtual/bmc-update, so we specify phosphor-ipmi-flash as the preferred provider to use our configuration. Tested: 1. Ran burn-my-bmc from host side to flash BMC/BIOS/BMC CPLD/MB CPLD. 2. Checked the corresponding service has been executed. 3. Checked the versions have been updated. Change-Id: I0a6408778ce928aa032b085e65dbd797f5c5e1e6 Signed-off-by: Vincent Chou <vincent.chou@fii-na.com>
2024-04-03smbios-mdr: Add cpuinfo-peci PACKAGECONFIGJonathan Doman2-3/+0
Part of the functionality contained in the existing `cpuinfo` flag is now split into a new flag `cpuinfo-peci`. The new flag is still logically dependent on the existing one, but it gives finer control over enabled features. Remove all cpuinfo flags from default PACKAGECONFIG. Update bbappend based on new defaults. smbios-mdr: srcrev bump abdccd3af9..4e1cf09955 Jonathan Doman (1): cpuinfoapp: Make PECI features optional Change-Id: Ib9a1e634634f046b2ec6ff5629d4498bf0d5914b Signed-off-by: Jonathan Doman <jonathan.doman@intel.com>
2024-03-26meta-fii: kudo: Use entity-manager-decorators in IPMIVikram Gara1-0/+1
Enable entity-manager-decorators packageconfig for phosphor-ipmi-host. Change-Id: I42364257c3330c1332694070cb135731fba08e63 Signed-off-by: Vikram Gara <vikramgara@google.com>
2024-03-19meta-kudo: Use virtual/bios-updateWilly Tu3-1/+5
Use virtual/bios-update instead of kudo-bios-update to make sure we don't install multiple different BIOS update recipes. Set virtual/bios-update to `kudo-bios-update` in kudo.conf to make sure there are no regression. Change-Id: I2eb7823e174daa06ededeb0ce72d361f80bf21d5 Signed-off-by: Willy Tu <wltu@google.com>
2024-03-13meta-fii: kudo: Remove bmcwebVivekanand Veeracholan2-0/+6
Kudo does not use bmcweb. Remove bmcweb packages. Change-Id: I354c45686679b68ebbf5528378b80374d3789a0e Signed-off-by: Vivekanand Veeracholan <vveerach@google.com>
2024-03-06meta-fii: meta-mori: Remove pwn-initVincent Chou4-69/+0
No need to enable fan in script because there's already a commit cofigure the pwm enable file. https://github.com/openbmc/dbus-sensors/commit/abf91de1876278b8b8f98787577a539804833ad4 Change-Id: Id884bfb16c20218cdcc48b290ba04db8d0584ed3 Signed-off-by: Vincent Chou <vincent.chou@fii-na.com>
2024-01-18meta-fii: meta-mori: Assert LED group upon OS and power state changeVincent Chou11-73/+203
* Replace the polling style OS state monitor with the event-driven style monitor to detect state change and assert/deassert the led groups if the condition is met. * Change the target OS state from Standby to BootComplete for the "on" state of boot-status-led. - The led group would be assert upon the OS and power state change in dbus instead of waiting for 10s polling interval. - A monitor can be added/removed by its own yaml, which makes it easy to maintain. Change-Id: I838e8d688305fe5d5aa6053f4544173a7fe9a652 Signed-off-by: Vincent Chou <vincent.chou@fii-na.com>
2024-01-06meta-fii: meta-mori: Launch apps by correct path to avoid anti-patternKyle Nieman5-7/+7
As specified by OpenBMC anti-pattern document, calls to a binary/script should be the fully qualified path to the application being launched. https://github.com/openbmc/docs/blob/717d273cf8bceac3868a278aeb34d19e8d74c1b3/anti-patterns.md#resolution-4 This follows the systemd recommendation to use the full path to avoid ambiguity. https://www.freedesktop.org/software/systemd/man/systemd.service.html#:~:text=Using%20an%20absolute%20path%20is%20recommended%20to%20avoid%20ambiguity In addition, OpenBMC applications that are intended to be used by users should be located in /usr/bin. Changes: Place user scripts in /usr/bin instead of /usr/sbin. Start scripts by their absolute path in service files. Testing: The services that are modified can find and start their scripts. The scripts that had their locations modified can be called by the user without providing their full path. Change-Id: Ibe7fbb1644aa1b0df0f296ea1f1a8ceaf444fe35 Signed-off-by: Kyle Nieman <kyle.nieman@fii-na.com>
2023-12-06meta-fii: Assign FRU MACs to bridge and NCSIWilliam A. Kennington III2-2/+2
Our prod policy requires the MAC be assigned to both of these interfaces. Change-Id: I1ed1d8120597a031592c0121f4a657fca7d18b7f Signed-off-by: William A. Kennington III <wak@google.com>
2023-11-25treewide: add scarthgap to LAYERSERIES_COMPAT2.16.0-devPatrick Williams3-3/+3
Signed-off-by: Patrick Williams <patrick@stwcx.xyz> Change-Id: I28ee50fa55ae47dd7fd8c99f8f6db8f5f6dfa53d
2023-11-24treewide: add nanbield to LAYERSERIES_COMPATPatrick Williams3-3/+3
Signed-off-by: Patrick Williams <patrick@stwcx.xyz> Change-Id: I85272779478b66452acd11be93f5fea99e4c3a34
2023-10-12meta-phosphor: remove obmc-rng featurePatrick Williams1-1/+0
Since Linux 5.6, the entropy generation provided by rng-tools is now in the kernel directly. Yocto has removed all dependencies on rng-tools for packages that use to use it, such as ssh[1]. There isn't any reason for us to explicitly include rng-tools any longer. Remove the feature and package group that we had that included it. [1]: https://lore.kernel.org/openembedded-core/20221209070538.72901-1-xiangyu.chen@eng.windriver.com/ Signed-off-by: Patrick Williams <patrick@stwcx.xyz> Change-Id: I85cbe7f30bb41045b7fd1170391a083db9e378b7
2023-10-11meta-fii: mori: clean up package groupsPatrick Williams2-7/+0
The mori config subtracts 3 and then adds 1 three times. Remove the redundancy. Signed-off-by: Patrick Williams <patrick@stwcx.xyz> Change-Id: I4617ca3701fc58617c78d5e4083d5c802dbc90dd
2023-10-04phosphor-sel-logger clears SELAlexander Hansen2-3/+3
the ambiguity is removed and there is no longer the option to choose who clears the SEL. Change-Id: I47ee70061f72cdf878c918e49c5b461019398943 Signed-off-by: Alexander Hansen <alexander.hansen@9elements.com>
2023-08-31meta-fii: include meta-security to kudo and meta-tpm to moriTom Tung2-0/+2
glome was moved to meta-security layer and libhoth was moved to meta-tpm layer. Change-Id: I4bcfb78948da25b90e02a1db786937484c09d93f Signed-off-by: Tom Tung <shes050117@gmail.com>
2023-08-16meta-fii: meta-mori: Enable dynamic-sensors featureJohn Wedig1-0/+2
Enable dynamic sensors for phosphor-ipmi-host. This allows us to use the entity manager decorators, e.g. for the FRU device names. This change is necessary as of this commit: https://github.com/openbmc/phosphor-host-ipmid/commit/23a722ca7c6ca2ac93a8ecbe44550e9429e1a8f1 Tested: Ran "ipmitool fru" on the BMC and confirmed that the FRU Device Description fields are populated (not UNKNOWN). Change-Id: I6cb2c3ffd87c2294c27158d0ee52589ae80c0e9b Signed-off-by: John Wedig <johnwedig@google.com>
2023-08-10meta-fii: meta-kudo: Add meta-tpm layerAnthony1-0/+1
meta-google layer now requires meta-tpm layer. Tested: kudo machine can be built Signed-off-by: Anthony <anthonyhkf@google.com> Change-Id: I7f5a7c43c5123a155090c171864d6e0afaf02fc2
2023-08-09meta-fii: Add John to OWNERSCharles Boyer1-0/+1
John is to be added to the OWNERS file for code reviews. Signed-off-by: Charles Boyer <Charles.Boyer@fii-usa.com> Change-Id: If5a32a129330238a79c7086e08cdd4739a0dda25
2023-08-01meta-fii: meta-kudo: Bypass mandatory power_on led groupJonico Eustaquio1-0/+1
By setting CHASSIS_TARGETS = "", obmc-chassis-poweron/off@0.target will not have a dependency on obmc-led-groups-start/stop@power_on.service. This keeps us from having to add the led.yaml file for phosphor-led-manager since we do not require obmc-led-groups-start/stop@power_on.service to activate. Signed-off-by: Jonico Eustaquio <jonico.eustaquio@fii-na.com> Change-Id: I8e9581b067cf2a5589da9dc18a6a140c40130c63
2023-07-21meta-fii: meta-mori: Add usblist supportJonico Eustaquio1-0/+12
Add the usblist support in mori. Change-Id: Ie503ec73496cdc4f0927060cb668fec38061030c Signed-off-by: Jonico Eustaquio <jonico.eustaquio@fii-na.com>
2023-07-21meta-fii: meta-kudo: Remove host status check for resetJonico Eustaquio1-4/+0
As part of performing a reset instead of DC cycling when reboot is called from the host. Remove the check on host status since previously it would prevent a host reboot. Change-Id: Id4b7888ebcb87c42cd46363b883d88ffa851d67e Signed-off-by: Jonico Eustaquio <jonico.eustaquio@fii-na.com>
2023-07-21meta-fii: meta-mori: Uniform syntax for recipesKyle Nieman18-170/+157
Update bitbake recipe format to make uniform with the following rules: 1) Generally bbappends should have layer(mori) overrides 2) Add uniform appending by using "append" instead of "+=" 3) bb files (excluding bbappends) typically should not have "append" phrase except for limited amount of variables (RDEPENDS,DEPENDS,FILES, ...) 4) Wrap lines greater than 80 chars when applicable 5) Switch syntax for long list values over multiple lines to use four-space indent In addition, oe-stylize.py was applied to further refine recipe syntax. Tested: Built successfully. Individual packages were tested for functionality with no notable change. Change-Id: I626c529373805aa696f7c574e10c1617493d4f61 Signed-off-by: Kyle Nieman <kyle.nieman@fii-na.com>
2023-07-11meta-fii: meta-mori: Remove watchdog supportKyle Nieman3-38/+0
Remove watchdog support added in https://gerrit.openbmc.org/c/openbmc/openbmc/+/57895 Change-Id: I370de442f7b4b15d1be48717f2e688363c102d87 Signed-off-by: Kyle Nieman <kyle.nieman@fii-na.com>
2023-07-01meta-fii: meta-mori: flock during flashing processJonico Eustaquio2-19/+30
Added flock during flashing process of BIOS, CPLDs, and power sequencer instead of using flock over the whole init_once script. Removed mori.sh rst hotswap to be replaced. Change-Id: I29bd364b307178abed19b542ce4737e4ef14d06d Signed-off-by: Jonico Eustaquio <jonico.eustaquio@fii-na.com>
2023-07-01meta-fii: meta-mori: Remove unused functions and variablesVincent Chou1-10/+0
Unused functions: - rst_bios_spi Unused variables: - I2C_STBUCK - I2C_HOTSWAP_CTRL Change-Id: I869825195825faaac8a9583a7b90922e0f3c26db Signed-off-by: Vincent Chou <vincent.chou@fii-na.com>
2023-07-01meta-fii: meta-mori: Update unit power behaviorKyle Nieman3-4/+12
1) Remove unwanted dependencies for the warm reboot targets. 2) Set the power policy to always on to prevent unwanted host power off. 3) Change user reset command to use ipmitool command Change-Id: Ie87296a48349219860c79f6275133595f3501e43 Signed-off-by: Kyle Nieman <kyle.nieman@fii-na.com>
2023-07-01meta-fii: meta-mori: Add BIOS accessing library functionsKyle Nieman2-17/+49
The BMC accesses the BIOS SPI during flashing, but the BMC will potentially need to access it while the host is running. Add library functions that performs a handshake to request access to it. Update current BIOS SPI access to use the functions. Also fix shellcheck error. Tested: Flashed BMC image on unit. Ensured that BIOS flash is still successful. Change-Id: Icc91802647a6967694fca3e57bbc56f2c1db9189 Signed-off-by: Kyle Nieman <kyle.nieman@fii-na.com>
2023-06-30meta-fii: meta-mori: Add setup for firmware verificationKyle Nieman3-1/+16
Firmware of an older stage board will not be allowed on a current stage board. During the flashing process, AC cycles are prevented. Overview of Changes: 1.)mori-lib.sh -Modify to add definitions that will be used for AC power cycle delay. 2.)init_once.sh -Modify to no longer use HPM_STBY_RST_N. 3.)mori-fw-ver.service -Modify to wait until fw verification process is finished to prevent failed version retrieval. Signed-off-by: Kyle Nieman <kyle.nieman@fii-na.com> Change-Id: Idd5a9613bc3e1086dd44e2579b5cb56108d430d0
2023-06-30meta-fii: meta-mori: Add installation check for firmware utilitiesKyle Nieman2-6/+20
Check that utilities used for flashing and version retrieval are installed prior to being used to prevent unintended behavior. Change-Id: I0d4547c43d78f03462e9e05ae465162cccb21f46 Signed-off-by: Kyle Nieman <kyle.nieman@fii-na.com>
2023-06-30meta-fii: meta-mori: Fix graceful shutdown was force shutdown issueVincent Chou1-0/+1
The obmc-host-shutdown_0.target requires obmc-chassis-poweroff_0.target cause the power_off function being called, and eventually do the force off, so we remove the obmc-chassis-poweroff_0.target from obmc-host-shutdown_0.target's requires. Change-Id: I28184aafb3aac9e0b10000fb15e8817e4976465b Signed-off-by: Vincent Chou <vincent.chou@fii-na.com>
2023-06-30meta-fii: meta-mori: Get BMC version from os-releaseCharles Boyer2-9/+6
This will parse the Major, sub-Major, and Minor versions from the /etc/os-release file VERSION_ID line. The version will be presented with the pattern <Major>.<sub-Major>.<Minor>. Signed-off-by: Charles Boyer <Charles.Boyer@fii-usa.com> Change-Id: I6cfebf16b840cb88216c3b8f3aeb4c295abc3e05
2023-06-30meta-fii: meta-mori: Relocate dependency on mori-bios-verifyKyle Nieman1-2/+0
Dependency on mori-bios-verify.service was set in host-powerctrl.service. Removed dependency as it should be set from mori-bios-verify.service in case of removal. Signed-off-by: Kyle Nieman <kyle.nieman@fii-na.com> Change-Id: Ibc9fec6ef8e5912ebc137e712b1ac595997dbb0a
2023-06-30meta-fii: meta-mori: Fix error checking for fw flashKyle Nieman1-18/+33
The return values for flashing cplds were incorrect when failure occurred as it was expecting a integer value, but instead received text output. To check for error, output is now searched for error messages. Tested: I flashed an incorrect version of CPLD verify and saw that flash message correctly stated failed. For bios flash, the output would hang for an excessive amount of time the flashing status. This is due to the output being stored to the variable prior to being output. Tested: I flashed the bios, and instantly saw a counter for the erase progress. Upon failing flash verification, the script output a failure message. Signed-off-by: Kyle Nieman <kyle.nieman@fii-na.com> Change-Id: Ie84418117ab4e712b4f5b5c15190044e2118a808
2023-06-06obmc-console: Convert configs from socket-id to console-idAndrew Jeffery2-2/+2
As of 9a8f30ec5b58 ("obmc-console: Introduce console-id, deprecate socket-id") in obmc-console `console-id` is preferred over `socket-id`. Convert all in-tree configurations to `console-id` to enable removal of support for the deprecated `socket-id` configuration option. Change-Id: Ifd50603c378cfed5eb793b829b8296b7964e4194 Signed-off-by: Andrew Jeffery <andrew@aj.id.au>
2023-05-27meta-fii: meta-mori: Include obmc-debug-collectorIan Johnson1-1/+0
phosphor-debug-collector is now used in the meta-mori layer for faultlogs, so it needs to be included as part of the IMAGE_FEATURES. Change-Id: I45390feec21ce4c99c7fd19118a44fe6604f5474 Signed-off-by: Ian Johnson <ian.johnson@fii-na.com>
2023-05-12Revert "Add socket-id for the first console"Andrew Jeffery1-1/+0
This reverts commit ec7cab9378f548e94ee4af83946b2583d1fc7194. ec7cab9378f5 ("Add socket-id for the first console") was only a partial fixup of the obmc-console configurations found in the tree. For historical reasons not all platforms that support multiple consoles install a client configuration file for all consoles. Instead they relied on some default behaviour that was removed in obmc-console's 4e7186918599 ("Fixed broken dbus interface for multiple consoles"). Applying the configuration changes in the manner of ec7cab9378f5 ("Add socket-id for the first console") resulted in an asymmetric configuration between the client and server, breaking some SSH SOL instances. As of ae2460d0b8e8 ("obmc-console: Provide a default value for `console-id`.") in obmc-console the requirement to specify `socket-id`[^1] is lifted. Instead, the configuration can choose to override a default value. This restores the original behaviour and unbreaks SSH SOL. [^1]: Now an alias of the `console-id` configuration key Websocket and IPMI consoles remain broken. A fix is under development that also takes a proper approach to supporting multiple consoles in bmcweb, and the same solution pattern can be applied in ipmid. More discussion of the problems involved can be found here: https://amboar.github.io/notes/2023/05/08/happenings-in-obmc-console.html Change-Id: I274284c791758f336da6d6301dc523bac2b5dd69 Signed-off-by: Andrew Jeffery <andrew@aj.id.au>
2023-05-04meta-fii: meta-mori: Set watchdog fallback to 3 hoursKyle Nieman1-1/+1
Set fallback watchdog timer to 3 hours to guarantee host boot. Change-Id: Ieb10ff5fee309163720f9c93baea2f5491fb8af5 Signed-off-by: Kyle Nieman <kyle.nieman@fii-na.com>
2023-05-03meta-fii: meta-mori: Remove hotswap-power-cycle inclusionJonico Eustaquio1-1/+0
Remove inclusion of hotswap-power-cycle recipe since it has been removed here: https://gerrit.openbmc.org/c/openbmc/openbmc/+/62893 Change-Id: I213ea0f506f2f8490a0cd8190156dd7488fe1965 Signed-off-by: Jonico Eustaquio <jonico.eustaquio@fii-na.com>
2023-04-27meta-fii: meta-mori: Add skm backup config to binarystoreCharles Boyer1-0/+6
The backup copy will be stored in Mobo FRU EEPROM. Signed-off-by: Charles Boyer <Charles.Boyer@fii-usa.com> Change-Id: Id9a0b409f7cbe53ab91f7d5655e39f0a318ba9d1
2023-04-27meta-fii: meta-mori: Support BMC_ALIVE led with led-managerJonico Eustaquio2-3/+2
LED_BMC_ALIVE is now managed by phosphor-led-manager instead of by init_once.sh. Asserting LED_BMC_ALIVE is removed from init_once.sh since the service obmc-led-group-start@bmc_booted.service now asserts the dbus property for LED_BMC_ALIVE's led.yaml group to be used. Signed-off-by: Jonico Eustaquio <jonico.eustaquio@fii-na.com> Change-Id: Ib68be05246a2dc66458330d99721848f86a1ed50
2023-04-27meta-fii: meta-mori: Remove hotswap-power-cycleJonico Eustaquio2-31/+0
Removes the hotswap-power-cycle recipe and service Change-Id: Iee2dcf508760f57ea5faedb40eee3d8cf48103d0 Signed-off-by: Jonico Eustaquio <jonico.eustaquio@fii-na.com>
2023-04-21Add socket-id for the first consoleNinad Palsule1-0/+1
This drop adds socket-id for first console. This was left out before but with the new design this parameter is required and enforced by obmc-console code. It is decided to set "socket-id = console0" initially because that is the current path used by bmcweb but in future you can change this value to whatever is appropriate. The console information is now available through the DBUS interface. Each console server register it's object path on DBUS. The leaf node of the object path is used to create a console path. For example in the following console0 the leaf node "console0" is used to make up the console path and the GUI will use console path "/console/console0" to connect to the console. busctl tree xyz.openbmc_project.Console.console0 `-/xyz `-/xyz/openbmc_project `-/xyz/openbmc_project/console `-/xyz/openbmc_project/console/console0 Here is a discord thread where new design was discussed. https://discord.com/channels/775381525260664832/1083551792094249051 Tested: Tested on the rainier system. Related commits: 1) phosphor-dbus-interface: https://gerrit.openbmc.org/c/openbmc/phosphor-dbus-interfaces/+/61486 2) obmc-console: https://gerrit.openbmc.org/c/openbmc/obmc-console/+/62496 3) bmcweb: https://gerrit.openbmc.org/c/openbmc/bmcweb/+/62525 Change-Id: I5fd06f3aac69872a3e5032d592a9b59711795cfe Signed-off-by: Ninad Palsule <ninadpalsule@us.ibm.com>
2023-04-08meta-fii: meta-mori: Add log-alarm packageconfigJonico Eustaquio1-1/+1
The log-alarm PACKAGECONFIG is added so that sel-logger can monitor and create SEL logs when virtual and pldm sensors cross thresholds. Change-Id: Id786a26139b395d4a3a4aeed7934906a63167210 Signed-off-by: Jonico Eustaquio <jonico.eustaquio@fii-na.com>
2023-04-04meta-fii: meta-mori: Update script to retrieve BIOS versionJonico Eustaquio1-2/+3
An OpenBMC subtree update looks to have removed how dbus properties could be seen from just using busctl introspect. To get the actual value of the BIOS Version property, the script now uses busctl get-property instead. Change-Id: I3c6079026e9ea3193461fb86739892b178327fed Signed-off-by: Jonico Eustaquio <jonico.eustaquio@fii-na.com>
2023-03-29meta-fii: meta-mori: Add watchdog support with fallbackVincent Chou3-0/+38
Add watchdog service to monitor the host status and execute the expire actions when host doesn't reset the watchdog timer. Add fallback support to the watchdog with the interval set to 10 minutes. Timer is reset with changes to host boot progress. If the host fails to reset the watchdog, then the watchdog action is performed with fallback to AC cycle after 10 minutes. Signed-off-by: Vincent Chou <Vincent.Chou@fii-na.com> Change-Id: Id0905ebc72405713806bbe2d803e6ca559488495
2023-03-29meta-fii: meta-mori: Remove dependency for mori bios verifyJonico Eustaquio1-0/+6
The dependency obmc-host-reboot target has on obmc-host-shutdown and phosphor-reboot-host must be removed to allow for the mori-bios-verify service. The mori-bios-verify service will have a 60s sleep that requires the host to hold its state for the 60s duration after it is commanded to powercycle. Without these dependencies removed, the host would shutdown immediately. Signed-off-by: Jonico Eustaquio <jonico.eustaquio@fii-na.com> Change-Id: If2df43c8276626a3623bd4e796d87ea6817c32c7
2023-03-29meta-fii/meta-mori: Remove entity map configurationCharles Boyer4-46/+0
Removes the entity association map that is no longer used. Signed-off-by: Charles Boyer <Charles.Boyer@fii-usa.com> Change-Id: I4cb1dffea598bd27bc1cbbf94ef94332a04af2f6
2023-03-29meta-fii: meta-mori: Rename BIOS partition to "hnor"Charles Boyer1-1/+1
The nvparm tool expects the BIOS partition to be named "hnor". Signed-off-by: Charles Boyer <Charles.Boyer@fii-usa.com> Change-Id: I472bd32b7c70a5a8189cf16fcbf430b3d1094361
2023-03-29meta-fii: meta-mori: Reset BIOS SPI before BIOS flashCharles Boyer2-1/+11
The host verification fails because the BIOS SPI is quad mode during the flash. We must reset the BIOS SPI for the host to be able to read the SPI for its verification stage. Signed-off-by: Charles Boyer <Charles.Boyer@fii-usa.com> Change-Id: I0bf38a10ca939f7fcab338fe3f654303a4dea9f9