Skip to content

draft upgrade to deb11 of syncd and syncd-rpc #2

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

Open
dmytroxIntel wants to merge 13 commits into
base: master
Choose a base branch
from
Open

draft upgrade to deb11 of syncd and syncd-rpc #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
4947c8e
draft upgrade to deb11 of syncd and syncd-rpc
dmytroxIntel Jul 1, 2022
c930ea0
upgrade to python3
dmytroxIntel Jul 4, 2022
fbc33b0
revert workaround with libsaithrift
dmytroxIntel Jul 5, 2022
4e13fa0
Provide urls for sai and platform debs
dmytroxIntel Jul 7, 2022
1317091
Downgrade python3 to python2
dmytroxIntel Jul 22, 2022
b4da104
Remove saithrift-patches
dmytroxIntel Jul 22, 2022
fcf493a
Upgrade modules
dmytroxIntel Aug 8, 2022
64123fa
remove unnecessary lib
dmytroxIntel Aug 10, 2022
ece45e0
remove more unnecessary modules
dmytroxIntel Aug 12, 2022
5f3e2a2
Update sdk reference
dmytroxIntel Aug 17, 2022
026166f
Merge branch 'master' into upgrade_to_deb11
dmytroxIntel Aug 17, 2022
12003ad
remove unnecessary packages from syncd-rpc
dmytroxIntel Aug 18, 2022
027614b
Merge branch 'sonic-net:master' into upgrade_to_deb11
dmytroxIntel Aug 19, 2022
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
2 changes: 1 addition & 1 deletion platform/barefoot/bfn-platform.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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)"

SONIC_ONLINE_DEBS += $(BFN_PLATFORM)
Expand Down
2 changes: 1 addition & 1 deletion platform/barefoot/bfn-sai.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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)_DEPENDS += $(LIBNL_GENL3_DEV)
Expand Down
2 changes: 1 addition & 1 deletion platform/barefoot/docker-syncd-bfn-rpc.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ $(DOCKER_SYNCD_BFN_RPC)_DEPENDS += $(SYNCD_RPC_DBG) \
endif
$(DOCKER_SYNCD_BFN_RPC)_LOAD_DOCKERS += $(DOCKER_SYNCD_BASE)
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)
SONIC_INSTALL_DOCKER_IMAGES += $(DOCKER_SYNCD_BFN_RPC)
endif
Expand Down
22 changes: 9 additions & 13 deletions platform/barefoot/docker-syncd-bfn-rpc/Dockerfile.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,20 +12,16 @@ debs/
RUN apt-get purge -y syncd

## Pre-install the fundamental packages
RUN apt-get update \
RUN apt-get update \
&& apt-get -y install \
net-tools \
python-pip \
python-setuptools \
build-essential \
libssl-dev \
libffi-dev \
python-dev \
wget \
cmake \
libqt5core5a \
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; } ; \
{% for deb in docker_syncd_bfn_rpc_debs.split(' ') -%}
Expand All @@ -42,10 +38,10 @@ RUN wget https://github.com/nanomsg/nanomsg/archive/1.0.0.tar.gz \
&& cd .. \
&& rm -fr nanomsg-1.0.0 \
&& rm -f 1.0.0.tar.gz \
&& pip2 install cffi==1.7.0 \
&& pip2 install --upgrade cffi==1.7.0 \
&& pip2 install wheel \
&& pip2 install nnpy \
&& pip3 install cffi==1.7.0 \
&& pip3 install --upgrade cffi==1.7.0 \
&& pip3 install wheel \
&& pip3 install nnpy \
&& mkdir -p /opt \
&& cd /opt \
&& wget https://raw.githubusercontent.com/p4lang/ptf/master/ptf_nn/ptf_nn_agent.py \
Expand Down
4 changes: 2 additions & 2 deletions platform/barefoot/docker-syncd-bfn.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# docker image for syncd

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)

Expand All @@ -16,4 +16,4 @@ $(DOCKER_SYNCD_BASE)_PACKAGE_NAME = syncd

$(DOCKER_SYNCD_BASE)_RUN_OPT += -v /host/warmboot:/var/warmboot

SONIC_BUSTER_DOCKERS += $(DOCKER_SYNCD_BASE)
SONIC_BULLSEYE_DOCKERS += $(DOCKER_SYNCD_BASE)
8 changes: 3 additions & 5 deletions platform/barefoot/docker-syncd-bfn/Dockerfile.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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

Expand All @@ -16,11 +16,9 @@ debs/
RUN apt-get install -y \
libxml2 \
libpcap-dev \
libusb-1.0-0-dev \
libcurl4 \
libcurl4-gnutls-dev \
libusb-1.0-0 \
libcurl3-gnutls \
libunwind8-dev \
libpython3.4 \
libc-ares2 \
libedit2 \
libgoogle-perftools4
Expand Down