matthew/sonic-buildimage
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[BFN] Upgrade syncd container to deb11 (#11374)

Browse Source 
* draft upgrade to deb11 of syncd and syncd-rpc

* upgrade to python3

* revert workaround with libsaithrift

* Provide urls for sai and platform debs

* Downgrade python3 to python2

* Remove saithrift-patches

* Upgrade modules

* remove unnecessary lib

* remove more unnecessary modules

* Update sdk reference

* remove unnecessary packages from syncd-rpc
This commit is contained in:
Dmytro Lytvynenko 2022-08-20 02:02:01 +03:00 committed by GitHub
parent 9753f28d17
commit 0f50835c11
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 17 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
platform/barefoot/bfn-platform.mk
View File

@ -1,4 +1,4 @@
BFN_PLATFORM = bfnplatform_20220512_sai_1.10.2_deb10.deb BFN_PLATFORM = bfnplatform_20220815_sai_1.10_deb11.deb
$(BFN_PLATFORM)_URL = "https://github.com/barefootnetworks/sonic-release-pkgs/raw/dev/$(BFN_PLATFORM)" $(BFN_PLATFORM)_URL = "https://github.com/barefootnetworks/sonic-release-pkgs/raw/dev/$(BFN_PLATFORM)"
SONIC_ONLINE_DEBS += $(BFN_PLATFORM) SONIC_ONLINE_DEBS += $(BFN_PLATFORM)

2
platform/barefoot/bfn-sai.mk
View File

@ -1,4 +1,4 @@
BFN_SAI = bfnsdk_20220512_sai_1.10.2_deb10.deb BFN_SAI = bfnsdk_20220815_sai_1.10_deb11.deb
$(BFN_SAI)_URL = "https://github.com/barefootnetworks/sonic-release-pkgs/raw/dev/$(BFN_SAI)" $(BFN_SAI)_URL = "https://github.com/barefootnetworks/sonic-release-pkgs/raw/dev/$(BFN_SAI)"
$(BFN_SAI)_DEPENDS += $(LIBNL_GENL3_DEV) $(BFN_SAI)_DEPENDS += $(LIBNL_GENL3_DEV)

2
platform/barefoot/docker-syncd-bfn-rpc.mk
View File

@ -12,7 +12,7 @@ $(DOCKER_SYNCD_BFN_RPC)_DEPENDS += $(SYNCD_RPC_DBG) \
endif endif
$(DOCKER_SYNCD_BFN_RPC)_LOAD_DOCKERS += $(DOCKER_SYNCD_BASE) $(DOCKER_SYNCD_BFN_RPC)_LOAD_DOCKERS += $(DOCKER_SYNCD_BASE)
SONIC_DOCKER_IMAGES += $(DOCKER_SYNCD_BFN_RPC) SONIC_DOCKER_IMAGES += $(DOCKER_SYNCD_BFN_RPC)
SONIC_BUSTER_DOCKERS += $(DOCKER_SYNCD_BFN_RPC) SONIC_BULLSEYE_DOCKERS += $(DOCKER_SYNCD_BFN_RPC)
ifeq ($(ENABLE_SYNCD_RPC),y) ifeq ($(ENABLE_SYNCD_RPC),y)
SONIC_INSTALL_DOCKER_IMAGES += $(DOCKER_SYNCD_BFN_RPC) SONIC_INSTALL_DOCKER_IMAGES += $(DOCKER_SYNCD_BFN_RPC)
endif endif

20
platform/barefoot/docker-syncd-bfn-rpc/Dockerfile.j2
View File

@ -14,18 +14,14 @@ RUN apt-get purge -y syncd
## Pre-install the fundamental packages ## Pre-install the fundamental packages
RUN apt-get update \ RUN apt-get update \
&& apt-get -y install \ && apt-get -y install \
net-tools \
python-pip \
python-setuptools \
build-essential \
libssl-dev \
libffi-dev \
python-dev \
wget \ wget \
cmake \ cmake \
libqt5core5a \ libqt5core5a \
libqt5network5 \ libqt5network5 \
libboost-atomic1.71.0 python3-setuptools \
python3-pip \
python-is-python3 \
libboost-atomic1.74.0
RUN dpkg_apt() { [ -f $1 ] && { dpkg -i $1 || apt-get -y install -f; } || return 1; } ; \ RUN dpkg_apt() { [ -f $1 ] && { dpkg -i $1 || apt-get -y install -f; } || return 1; } ; \
{% for deb in docker_syncd_bfn_rpc_debs.split(' ') -%} {% for deb in docker_syncd_bfn_rpc_debs.split(' ') -%}
@ -42,10 +38,10 @@ RUN wget https://github.com/nanomsg/nanomsg/archive/1.0.0.tar.gz \
&& cd .. \ && cd .. \
&& rm -fr nanomsg-1.0.0 \ && rm -fr nanomsg-1.0.0 \
&& rm -f 1.0.0.tar.gz \ && rm -f 1.0.0.tar.gz \
&& pip2 install cffi==1.7.0 \ && pip3 install cffi==1.7.0 \
&& pip2 install --upgrade cffi==1.7.0 \ && pip3 install --upgrade cffi==1.7.0 \
&& pip2 install wheel \ && pip3 install wheel \
&& pip2 install nnpy \ && pip3 install nnpy \
&& mkdir -p /opt \ && mkdir -p /opt \
&& cd /opt \ && cd /opt \
&& wget https://raw.githubusercontent.com/p4lang/ptf/master/ptf_nn/ptf_nn_agent.py \ && wget https://raw.githubusercontent.com/p4lang/ptf/master/ptf_nn/ptf_nn_agent.py \

4
platform/barefoot/docker-syncd-bfn.mk
View File

@ -1,7 +1,7 @@
# docker image for syncd # docker image for syncd
DOCKER_SYNCD_PLATFORM_CODE = bfn DOCKER_SYNCD_PLATFORM_CODE = bfn
include $(PLATFORM_PATH)/../template/docker-syncd-base.mk include $(PLATFORM_PATH)/../template/docker-syncd-bullseye.mk
$(DOCKER_SYNCD_BASE)_DEPENDS += $(SYNCD) $(DOCKER_SYNCD_BASE)_DEPENDS += $(SYNCD)
@ -16,4 +16,4 @@ $(DOCKER_SYNCD_BASE)_PACKAGE_NAME = syncd
$(DOCKER_SYNCD_BASE)_RUN_OPT += -v /host/warmboot:/var/warmboot $(DOCKER_SYNCD_BASE)_RUN_OPT += -v /host/warmboot:/var/warmboot
SONIC_BUSTER_DOCKERS += $(DOCKER_SYNCD_BASE) SONIC_BULLSEYE_DOCKERS += $(DOCKER_SYNCD_BASE)

8
platform/barefoot/docker-syncd-bfn/Dockerfile.j2
View File

@ -1,4 +1,4 @@
FROM docker-config-engine-buster-{{DOCKER_USERNAME}}:{{DOCKER_USERTAG}} FROM docker-config-engine-bullseye-{{DOCKER_USERNAME}}:{{DOCKER_USERTAG}}
ARG docker_container_name ARG docker_container_name
@ -16,11 +16,9 @@ debs/
RUN apt-get install -y \ RUN apt-get install -y \
libxml2 \ libxml2 \
libpcap-dev \ libpcap-dev \
libusb-1.0-0-dev \ libusb-1.0-0 \
libcurl4 \ libcurl3-gnutls \
libcurl4-gnutls-dev \
libunwind8-dev \ libunwind8-dev \
libpython3.4 \
libc-ares2 \ libc-ares2 \
libedit2 \ libedit2 \
libgoogle-perftools4 libgoogle-perftools4