Skip to content

Fix ffi #14988

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
liushilongbuaa wants to merge 6 commits into from
Closed

Fix ffi #14988

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
f7a31be
draft
liushilongbuaa May 9, 2023
d93c9e4
fix
liushilongbuaa May 9, 2023
cdfadf3
install bcrypt version 3.2.2
arlakshm May 17, 2023
fe6315e
Fix compilation
arlakshm May 17, 2023
712784c
fix arm compilation
arlakshm May 18, 2023
75a23d6
install version of cryptography with dependency to rust
arlakshm May 23, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 9 additions & 1 deletion files/build_templates/sonic_debian_extension.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -128,6 +128,7 @@ sudo https_proxy=$https_proxy LANG=C chroot $FILESYSTEM_ROOT pip3 install psutil
# Install Python module for ipaddr
sudo https_proxy=$https_proxy LANG=C chroot $FILESYSTEM_ROOT pip3 install ipaddr


# Install Python module for grpcio and grpcio-toole
if [[ $CONFIGURED_ARCH == amd64 ]]; then
sudo https_proxy=$https_proxy LANG=C chroot $FILESYSTEM_ROOT pip3 install "grpcio==1.39.0"
Expand Down Expand Up @@ -207,6 +208,13 @@ sudo LANG=C DEBIAN_FRONTEND=noninteractive chroot $FILESYSTEM_ROOT apt-get -y in
# Install prerequisites needed for using the Python m2crypto package, used by sonic-utilities
sudo LANG=C DEBIAN_FRONTEND=noninteractive chroot $FILESYSTEM_ROOT apt-get -y install openssl


# install libffi-dev to match utilities' dependency.
sudo LANG=C DEBIAN_FRONTEND=noninteractive chroot $FILESYSTEM_ROOT apt-get -y install libffi-dev
# Install Python module for bcrypt
sudo https_proxy=$https_proxy LANG=C chroot $FILESYSTEM_ROOT pip3 install bcrypt==3.2.2
sudo https_proxy=$https_proxy LANG=C chroot $FILESYSTEM_ROOT pip3 install cryptography==3.3.2

# Install SONiC Utilities Python package
SONIC_UTILITIES_PY3_WHEEL_NAME=$(basename {{sonic_utilities_py3_wheel_path}})
sudo cp {{sonic_utilities_py3_wheel_path}} $FILESYSTEM_ROOT/$SONIC_UTILITIES_PY3_WHEEL_NAME
Expand Down Expand Up @@ -446,7 +454,7 @@ sudo cp $IMAGE_CONFIGS/rasdaemon/rasdaemon.timer $FILESYSTEM_ROOT_USR_LIB_SYSTEM
sudo LANG=C DEBIAN_FRONTEND=noninteractive chroot $FILESYSTEM_ROOT systemctl disable rasdaemon.service
sudo LANG=C DEBIAN_FRONTEND=noninteractive chroot $FILESYSTEM_ROOT systemctl enable rasdaemon.timer

sudo LANG=C DEBIAN_FRONTEND=noninteractive chroot $FILESYSTEM_ROOT apt-get -y install libffi-dev libssl-dev
sudo LANG=C DEBIAN_FRONTEND=noninteractive chroot $FILESYSTEM_ROOT apt-get -y install libssl-dev

{% if include_bootchart == 'y' %}
sudo LANG=C DEBIAN_FRONTEND=noninteractive chroot $FILESYSTEM_ROOT apt-get -y install systemd-bootchart
Expand Down
2 changes: 1 addition & 1 deletion src/sonic-utilities
Open in desktop
Submodule sonic-utilities updated 43 files
+6 −3 acl_loader/main.py
+26 −2 config/main.py
+22 −2 config/vlan.py
+1 −17 generic_config_updater/field_operation_validators.py
+0 −0 rcli/__init__.py
+151 −0 rcli/linecard.py
+44 −0 rcli/rexec.py
+38 −0 rcli/rshell.py
+149 −0 rcli/utils.py
+8 −0 scripts/fast-reboot
+102 −0 scripts/lag_keepalive.py
+1 −1 scripts/route_check.py
+6 −0 setup.py
+7 −6 sfputil/main.py
+7 −0 show/interfaces/__init__.py
+15 −14 show/muxcable.py
+10 −7 show/plugins/barefoot.py
+21 −0 sonic-utilities-data/bash_completion.d/rexec
+21 −0 sonic-utilities-data/bash_completion.d/rshell
+14 −11 sonic_package_manager/manager.py
+25 −3 sonic_package_manager/manifest.py
+15 −4 sonic_package_manager/metadata.py
+51 −31 sonic_package_manager/service_creator/creator.py
+57 −0 tests/acl_input/acl1.json
+12 −2 tests/acl_loader_test.py
+1 −1 tests/aclshow_test.py
+6 −6 tests/chassis_modules_test.py
+3 −3 tests/config_dpb_test.py
+113 −1 tests/config_test.py
+4 −0 tests/load_minigraph_input/platform/plugins/platform_mg_post_check
+4 −0 tests/load_minigraph_input/platform_false/plugins/platform_mg_post_check
+12 −0 tests/mock_tables/asic0/state_db.json
+9 −0 tests/mock_tables/chassis_state_db.json
+28 −0 tests/mock_tables/config_db.json
+5 −0 tests/mock_tables/database_config.json
+2 −2 tests/mock_tables/state_db.json
+260 −0 tests/remote_cli_test.py
+63 −48 tests/sfputil_test.py
+53 −0 tests/show_barefoot_test.py
+33 −4 tests/sonic_package_manager/test_manager.py
+52 −0 tests/sonic_package_manager/test_metadata.py
+114 −4 tests/sonic_package_manager/test_service_creator.py
+40 −9 tests/vlan_test.py