From 4947c8e2a30998513a4dd6326ec3cde7cc316e51 Mon Sep 17 00:00:00 2001 From: Dmytro Lytvynenko Date: Fri, 1 Jul 2022 05:56:49 -0700 Subject: [PATCH 01/11] draft upgrade to deb11 of syncd and syncd-rpc --- platform/barefoot/bfn-platform.mk | 7 ++++--- platform/barefoot/bfn-sai.mk | 7 ++++--- platform/barefoot/docker-syncd-bfn-rpc.mk | 2 +- platform/barefoot/docker-syncd-bfn-rpc/Dockerfile.j2 | 2 +- platform/barefoot/docker-syncd-bfn-rpc/ptf_nn_agent.conf | 2 +- platform/barefoot/docker-syncd-bfn.mk | 4 ++-- platform/barefoot/docker-syncd-bfn/Dockerfile.j2 | 2 +- 7 files changed, 14 insertions(+), 12 deletions(-) diff --git a/platform/barefoot/bfn-platform.mk b/platform/barefoot/bfn-platform.mk index a35795dda6c..60e43982a69 100644 --- a/platform/barefoot/bfn-platform.mk +++ b/platform/barefoot/bfn-platform.mk @@ -1,5 +1,6 @@ -BFN_PLATFORM = bfnplatform_20220512_sai_1.10.2_deb10.deb -$(BFN_PLATFORM)_URL = "https://github.com/barefootnetworks/sonic-release-pkgs/raw/dev/$(BFN_PLATFORM)" +BFN_PLATFORM = bfnplatform_1.0.0_amd64.deb +$(BFN_PLATFORM)_PATH = /sonic -SONIC_ONLINE_DEBS += $(BFN_PLATFORM) +# SONIC_ONLINE_DEBS += $(BFN_PLATFORM) +SONIC_COPY_DEBS += $(BFN_PLATFORM) $(BFN_SAI_DEV)_DEPENDS += $(BFN_PLATFORM) diff --git a/platform/barefoot/bfn-sai.mk b/platform/barefoot/bfn-sai.mk index 13f2800c0b9..12c4998b640 100644 --- a/platform/barefoot/bfn-sai.mk +++ b/platform/barefoot/bfn-sai.mk @@ -1,9 +1,10 @@ -BFN_SAI = bfnsdk_20220512_sai_1.10.2_deb10.deb -$(BFN_SAI)_URL = "https://github.com/barefootnetworks/sonic-release-pkgs/raw/dev/$(BFN_SAI)" +BFN_SAI = bfnsdk_1.0.0_amd64.deb +$(BFN_SAI)_PATH = /sonic $(BFN_SAI)_DEPENDS += $(LIBNL_GENL3_DEV) $(eval $(call add_conflict_package,$(BFN_SAI),$(LIBSAIVS_DEV))) $(BFN_SAI)_RDEPENDS += $(LIBNL_GENL3) -SONIC_ONLINE_DEBS += $(BFN_SAI) +# SONIC_ONLINE_DEBS += $(BFN_SAI) +SONIC_COPY_DEBS +=$(BFN_SAI) $(BFN_SAI_DEV)_DEPENDS += $(BFN_SAI) diff --git a/platform/barefoot/docker-syncd-bfn-rpc.mk b/platform/barefoot/docker-syncd-bfn-rpc.mk index a2a741cea1e..6e1359d59cc 100644 --- a/platform/barefoot/docker-syncd-bfn-rpc.mk +++ b/platform/barefoot/docker-syncd-bfn-rpc.mk @@ -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 diff --git a/platform/barefoot/docker-syncd-bfn-rpc/Dockerfile.j2 b/platform/barefoot/docker-syncd-bfn-rpc/Dockerfile.j2 index e520c55f9c3..2056e91b27d 100644 --- a/platform/barefoot/docker-syncd-bfn-rpc/Dockerfile.j2 +++ b/platform/barefoot/docker-syncd-bfn-rpc/Dockerfile.j2 @@ -25,7 +25,7 @@ RUN apt-get update \ cmake \ libqt5core5a \ libqt5network5 \ - libboost-atomic1.71.0 + 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(' ') -%} diff --git a/platform/barefoot/docker-syncd-bfn-rpc/ptf_nn_agent.conf b/platform/barefoot/docker-syncd-bfn-rpc/ptf_nn_agent.conf index fa1ed0eb162..fd5e9f177f2 100644 --- a/platform/barefoot/docker-syncd-bfn-rpc/ptf_nn_agent.conf +++ b/platform/barefoot/docker-syncd-bfn-rpc/ptf_nn_agent.conf @@ -1,5 +1,5 @@ [program:ptf_nn_agent] -command=/usr/bin/python /opt/ptf_nn_agent.py --device-socket 1@tcp://0.0.0.0:10900 -i 1-3@Ethernet12 --set-iface-rcv-buffer=109430400 +command=/usr/bin/python2 /opt/ptf_nn_agent.py --device-socket 1@tcp://0.0.0.0:10900 -i 1-3@Ethernet12 --set-iface-rcv-buffer=109430400 process_name=ptf_nn_agent stdout_logfile=/tmp/ptf_nn_agent.out.log stderr_logfile=/tmp/ptf_nn_agent.err.log diff --git a/platform/barefoot/docker-syncd-bfn.mk b/platform/barefoot/docker-syncd-bfn.mk index c1cda4e3bef..55303557c34 100644 --- a/platform/barefoot/docker-syncd-bfn.mk +++ b/platform/barefoot/docker-syncd-bfn.mk @@ -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) @@ -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) diff --git a/platform/barefoot/docker-syncd-bfn/Dockerfile.j2 b/platform/barefoot/docker-syncd-bfn/Dockerfile.j2 index 8fa30bc2987..9da1213f85a 100755 --- a/platform/barefoot/docker-syncd-bfn/Dockerfile.j2 +++ b/platform/barefoot/docker-syncd-bfn/Dockerfile.j2 @@ -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 From c930ea02b3a451d5c80a095da3d96b414334b24a Mon Sep 17 00:00:00 2001 From: Dmytro Lytvynenko Date: Mon, 4 Jul 2022 05:09:10 -0700 Subject: [PATCH 02/11] upgrade to python3 --- .../barefoot/docker-syncd-bfn-rpc/Dockerfile.j2 | 17 +++++++++-------- .../docker-syncd-bfn-rpc/ptf_nn_agent.conf | 2 +- .../barefoot/docker-syncd-bfn/Dockerfile.j2 | 2 +- platform/barefoot/libsaithrift-dev.mk | 1 + 4 files changed, 12 insertions(+), 10 deletions(-) diff --git a/platform/barefoot/docker-syncd-bfn-rpc/Dockerfile.j2 b/platform/barefoot/docker-syncd-bfn-rpc/Dockerfile.j2 index 2056e91b27d..17110b0c453 100644 --- a/platform/barefoot/docker-syncd-bfn-rpc/Dockerfile.j2 +++ b/platform/barefoot/docker-syncd-bfn-rpc/Dockerfile.j2 @@ -12,15 +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 \ + python3-pip \ + python3-setuptools \ + python-is-python3 \ build-essential \ libssl-dev \ libffi-dev \ - python-dev \ + python3-dev \ wget \ cmake \ libqt5core5a \ @@ -42,10 +43,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 \ diff --git a/platform/barefoot/docker-syncd-bfn-rpc/ptf_nn_agent.conf b/platform/barefoot/docker-syncd-bfn-rpc/ptf_nn_agent.conf index fd5e9f177f2..fa1ed0eb162 100644 --- a/platform/barefoot/docker-syncd-bfn-rpc/ptf_nn_agent.conf +++ b/platform/barefoot/docker-syncd-bfn-rpc/ptf_nn_agent.conf @@ -1,5 +1,5 @@ [program:ptf_nn_agent] -command=/usr/bin/python2 /opt/ptf_nn_agent.py --device-socket 1@tcp://0.0.0.0:10900 -i 1-3@Ethernet12 --set-iface-rcv-buffer=109430400 +command=/usr/bin/python /opt/ptf_nn_agent.py --device-socket 1@tcp://0.0.0.0:10900 -i 1-3@Ethernet12 --set-iface-rcv-buffer=109430400 process_name=ptf_nn_agent stdout_logfile=/tmp/ptf_nn_agent.out.log stderr_logfile=/tmp/ptf_nn_agent.err.log diff --git a/platform/barefoot/docker-syncd-bfn/Dockerfile.j2 b/platform/barefoot/docker-syncd-bfn/Dockerfile.j2 index 9da1213f85a..3b2ba2dd43f 100755 --- a/platform/barefoot/docker-syncd-bfn/Dockerfile.j2 +++ b/platform/barefoot/docker-syncd-bfn/Dockerfile.j2 @@ -20,7 +20,7 @@ RUN apt-get install -y \ libcurl4 \ libcurl4-gnutls-dev \ libunwind8-dev \ - libpython3.4 \ + libpython3-dev \ libc-ares2 \ libedit2 \ libgoogle-perftools4 diff --git a/platform/barefoot/libsaithrift-dev.mk b/platform/barefoot/libsaithrift-dev.mk index 0fb5ca0cb81..0ebc306ce6f 100644 --- a/platform/barefoot/libsaithrift-dev.mk +++ b/platform/barefoot/libsaithrift-dev.mk @@ -9,6 +9,7 @@ $(LIBSAITHRIFT_DEV)_DEPENDS += $(LIBTHRIFT_0_14_1) $(LIBTHRIFT_0_14_1_DEV) \ #$(LIBSAIVS) $(LIBSAIVS_DEV) $(LIBSAIMETADATA) $(LIBSAIMETADATA_DEV) # $(LIBSAITHRIFT_DEV)_BUILD_ENV = platform=v +$(LIBSAITHRIFT_DEV)_BUILD_ENV = SAITHRIFT_VER=v2 # Workaround to use python3 in build $(LIBSAITHRIFT_DEV)_RDEPENDS += $(LIBTHRIFT_0_14_1) $(BFN_SAI) SONIC_DPKG_DEBS += $(LIBSAITHRIFT_DEV) From fbc33b0db0d827cc343ecb48abe48dd71c94511f Mon Sep 17 00:00:00 2001 From: Dmytro Lytvynenko Date: Tue, 5 Jul 2022 10:03:59 -0700 Subject: [PATCH 03/11] revert workaround with libsaithrift --- platform/barefoot/libsaithrift-dev.mk | 6 +++++- ...ython-saithrift-installer-to-python3.patch | 19 +++++++++++++++++++ platform/barefoot/saithrift-patches/Makefile | 19 +++++++++++++++++++ platform/barefoot/saithrift-patches/series | 1 + 4 files changed, 44 insertions(+), 1 deletion(-) create mode 100644 platform/barefoot/saithrift-patches/0001-Update-python-saithrift-installer-to-python3.patch create mode 100644 platform/barefoot/saithrift-patches/Makefile create mode 100644 platform/barefoot/saithrift-patches/series diff --git a/platform/barefoot/libsaithrift-dev.mk b/platform/barefoot/libsaithrift-dev.mk index 0ebc306ce6f..40cd5554653 100644 --- a/platform/barefoot/libsaithrift-dev.mk +++ b/platform/barefoot/libsaithrift-dev.mk @@ -1,3 +1,7 @@ +SAITHRIFT_PATCHES = saithrift-patches +$(SAITHRIFT_PATCHES)_SRC_PATH = $(PLATFORM_PATH)/saithrift-patches +SONIC_MAKE_FILES += $(SAITHRIFT_PATCHES) + # libsaithrift-dev package SAI_VER = 0.9.4 LIBSAITHRIFT_DEV = libsaithrift-dev_$(SAI_VER)_$(CONFIGURED_ARCH).deb @@ -9,7 +13,7 @@ $(LIBSAITHRIFT_DEV)_DEPENDS += $(LIBTHRIFT_0_14_1) $(LIBTHRIFT_0_14_1_DEV) \ #$(LIBSAIVS) $(LIBSAIVS_DEV) $(LIBSAIMETADATA) $(LIBSAIMETADATA_DEV) # $(LIBSAITHRIFT_DEV)_BUILD_ENV = platform=v -$(LIBSAITHRIFT_DEV)_BUILD_ENV = SAITHRIFT_VER=v2 # Workaround to use python3 in build +$(LIBSAITHRIFT_DEV)_AFTER_FILES = $(SAITHRIFT_PATCHES) $(LIBSAITHRIFT_DEV)_RDEPENDS += $(LIBTHRIFT_0_14_1) $(BFN_SAI) SONIC_DPKG_DEBS += $(LIBSAITHRIFT_DEV) diff --git a/platform/barefoot/saithrift-patches/0001-Update-python-saithrift-installer-to-python3.patch b/platform/barefoot/saithrift-patches/0001-Update-python-saithrift-installer-to-python3.patch new file mode 100644 index 00000000000..505aee7a2ed --- /dev/null +++ b/platform/barefoot/saithrift-patches/0001-Update-python-saithrift-installer-to-python3.patch @@ -0,0 +1,19 @@ +From db2ef7f7861be85ccc13fddb0b324a400a57bf4c Mon Sep 17 00:00:00 2001 +From: Dmytro Lytvynenko +Date: Tue, 5 Jul 2022 08:58:39 -0700 +Subject: [PATCH] Update python-saithrift installer to python3 + +--- + debian/installerFiles/python-saithriftv1.install | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/debian/installerFiles/python-saithriftv1.install b/debian/installerFiles/python-saithriftv1.install +index b984915..e3d2e8c 100644 +--- a/debian/installerFiles/python-saithriftv1.install ++++ b/debian/installerFiles/python-saithriftv1.install +@@ -1 +1 @@ +-debian/usr/local/lib/python2.7/site-packages/* /usr/lib/python2.7/dist-packages/ ++debian/usr/local/lib/python3*/site-packages/* /usr/lib/python3/dist-packages/ +-- +2.25.1 + diff --git a/platform/barefoot/saithrift-patches/Makefile b/platform/barefoot/saithrift-patches/Makefile new file mode 100644 index 00000000000..bd660afcba8 --- /dev/null +++ b/platform/barefoot/saithrift-patches/Makefile @@ -0,0 +1,19 @@ + +SHELL = /bin/bash +.ONESHELL: +.SHELLFLAGS += -e + +MAIN_TARGET = saithrift-patches + +$(addprefix $(DEST)/, $(MAIN_TARGET)): $(DEST)/% : +# To add some BFN specific patches to SAI under sonic-sairedis while sai is not updated +SRC_DIR = ../saithrift-patches +DST_DIR = ../../../src/sonic-sairedis/SAI.patch/ + +$(addprefix $(DEST)/, $(MAIN_TARGET)): $(DEST)/% : + # copy patches to SAI + mkdir -p $(DST_DIR) + cp -f $(SRC_DIR)/* $(DST_DIR) + + touch $(DEST)/saithrift-patches + diff --git a/platform/barefoot/saithrift-patches/series b/platform/barefoot/saithrift-patches/series new file mode 100644 index 00000000000..32f924e041f --- /dev/null +++ b/platform/barefoot/saithrift-patches/series @@ -0,0 +1 @@ +0001-Update-python-saithrift-installer-to-python3.patch From 4e13fa030d86ff83e85b5bbe81df464e1a79d3d1 Mon Sep 17 00:00:00 2001 From: Dmytro Lytvynenko Date: Thu, 7 Jul 2022 07:11:41 -0700 Subject: [PATCH 04/11] Provide urls for sai and platform debs --- platform/barefoot/bfn-platform.mk | 7 +++---- platform/barefoot/bfn-sai.mk | 7 +++---- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/platform/barefoot/bfn-platform.mk b/platform/barefoot/bfn-platform.mk index 60e43982a69..55cd590da3c 100644 --- a/platform/barefoot/bfn-platform.mk +++ b/platform/barefoot/bfn-platform.mk @@ -1,6 +1,5 @@ -BFN_PLATFORM = bfnplatform_1.0.0_amd64.deb -$(BFN_PLATFORM)_PATH = /sonic +BFN_PLATFORM = bfnplatform_20220704_sai_1.10.2_deb11.deb +$(BFN_PLATFORM)_URL = "https://github.com/barefootnetworks/sonic-release-pkgs/raw/dev/$(BFN_PLATFORM)" -# SONIC_ONLINE_DEBS += $(BFN_PLATFORM) -SONIC_COPY_DEBS += $(BFN_PLATFORM) +SONIC_ONLINE_DEBS += $(BFN_PLATFORM) $(BFN_SAI_DEV)_DEPENDS += $(BFN_PLATFORM) diff --git a/platform/barefoot/bfn-sai.mk b/platform/barefoot/bfn-sai.mk index 12c4998b640..6151113a57d 100644 --- a/platform/barefoot/bfn-sai.mk +++ b/platform/barefoot/bfn-sai.mk @@ -1,10 +1,9 @@ -BFN_SAI = bfnsdk_1.0.0_amd64.deb -$(BFN_SAI)_PATH = /sonic +BFN_SAI = bfnsdk_20220704_sai_1.10.2_deb11.deb +$(BFN_SAI)_URL = "https://github.com/barefootnetworks/sonic-release-pkgs/raw/dev/$(BFN_SAI)" $(BFN_SAI)_DEPENDS += $(LIBNL_GENL3_DEV) $(eval $(call add_conflict_package,$(BFN_SAI),$(LIBSAIVS_DEV))) $(BFN_SAI)_RDEPENDS += $(LIBNL_GENL3) -# SONIC_ONLINE_DEBS += $(BFN_SAI) -SONIC_COPY_DEBS +=$(BFN_SAI) +SONIC_ONLINE_DEBS += $(BFN_SAI) $(BFN_SAI_DEV)_DEPENDS += $(BFN_SAI) From 1317091cdea61671f0c58d4c731590d08258e75e Mon Sep 17 00:00:00 2001 From: Dmytro Lytvynenko Date: Fri, 22 Jul 2022 06:06:48 -0700 Subject: [PATCH 05/11] Downgrade python3 to python2 --- .../docker-syncd-bfn-rpc/Dockerfile.j2 | 22 ++++++++++--------- .../barefoot/docker-syncd-bfn/Dockerfile.j2 | 2 +- 2 files changed, 13 insertions(+), 11 deletions(-) diff --git a/platform/barefoot/docker-syncd-bfn-rpc/Dockerfile.j2 b/platform/barefoot/docker-syncd-bfn-rpc/Dockerfile.j2 index 17110b0c453..f3403869cfc 100644 --- a/platform/barefoot/docker-syncd-bfn-rpc/Dockerfile.j2 +++ b/platform/barefoot/docker-syncd-bfn-rpc/Dockerfile.j2 @@ -12,21 +12,23 @@ 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 \ - python3-pip \ - python3-setuptools \ - python-is-python3 \ + python-setuptools \ build-essential \ libssl-dev \ libffi-dev \ - python3-dev \ + python-dev \ wget \ cmake \ libqt5core5a \ libqt5network5 \ - libboost-atomic1.74.0 + libboost-atomic1.71.0 + +# Install pip2 since it is no longer in the APT upstream +RUN curl https://bootstrap.pypa.io/pip/2.7/get-pip.py --output get-pip.py \ + && python2 get-pip.py RUN dpkg_apt() { [ -f $1 ] && { dpkg -i $1 || apt-get -y install -f; } || return 1; } ; \ {% for deb in docker_syncd_bfn_rpc_debs.split(' ') -%} @@ -43,10 +45,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 \ - && pip3 install cffi==1.7.0 \ - && pip3 install --upgrade cffi==1.7.0 \ - && pip3 install wheel \ - && pip3 install nnpy \ + && pip2 install cffi==1.7.0 \ + && pip2 install --upgrade cffi==1.7.0 \ + && pip2 install wheel \ + && pip2 install nnpy \ && mkdir -p /opt \ && cd /opt \ && wget https://raw.githubusercontent.com/p4lang/ptf/master/ptf_nn/ptf_nn_agent.py \ diff --git a/platform/barefoot/docker-syncd-bfn/Dockerfile.j2 b/platform/barefoot/docker-syncd-bfn/Dockerfile.j2 index 3b2ba2dd43f..9da1213f85a 100755 --- a/platform/barefoot/docker-syncd-bfn/Dockerfile.j2 +++ b/platform/barefoot/docker-syncd-bfn/Dockerfile.j2 @@ -20,7 +20,7 @@ RUN apt-get install -y \ libcurl4 \ libcurl4-gnutls-dev \ libunwind8-dev \ - libpython3-dev \ + libpython3.4 \ libc-ares2 \ libedit2 \ libgoogle-perftools4 From b4da10485aa8f3159a9f76a3b920826eae907595 Mon Sep 17 00:00:00 2001 From: Dmytro Lytvynenko Date: Fri, 22 Jul 2022 06:09:35 -0700 Subject: [PATCH 06/11] Remove saithrift-patches --- platform/barefoot/libsaithrift-dev.mk | 5 ----- ...ython-saithrift-installer-to-python3.patch | 19 ------------------- platform/barefoot/saithrift-patches/Makefile | 19 ------------------- platform/barefoot/saithrift-patches/series | 1 - 4 files changed, 44 deletions(-) delete mode 100644 platform/barefoot/saithrift-patches/0001-Update-python-saithrift-installer-to-python3.patch delete mode 100644 platform/barefoot/saithrift-patches/Makefile delete mode 100644 platform/barefoot/saithrift-patches/series diff --git a/platform/barefoot/libsaithrift-dev.mk b/platform/barefoot/libsaithrift-dev.mk index 40cd5554653..0fb5ca0cb81 100644 --- a/platform/barefoot/libsaithrift-dev.mk +++ b/platform/barefoot/libsaithrift-dev.mk @@ -1,7 +1,3 @@ -SAITHRIFT_PATCHES = saithrift-patches -$(SAITHRIFT_PATCHES)_SRC_PATH = $(PLATFORM_PATH)/saithrift-patches -SONIC_MAKE_FILES += $(SAITHRIFT_PATCHES) - # libsaithrift-dev package SAI_VER = 0.9.4 LIBSAITHRIFT_DEV = libsaithrift-dev_$(SAI_VER)_$(CONFIGURED_ARCH).deb @@ -13,7 +9,6 @@ $(LIBSAITHRIFT_DEV)_DEPENDS += $(LIBTHRIFT_0_14_1) $(LIBTHRIFT_0_14_1_DEV) \ #$(LIBSAIVS) $(LIBSAIVS_DEV) $(LIBSAIMETADATA) $(LIBSAIMETADATA_DEV) # $(LIBSAITHRIFT_DEV)_BUILD_ENV = platform=v -$(LIBSAITHRIFT_DEV)_AFTER_FILES = $(SAITHRIFT_PATCHES) $(LIBSAITHRIFT_DEV)_RDEPENDS += $(LIBTHRIFT_0_14_1) $(BFN_SAI) SONIC_DPKG_DEBS += $(LIBSAITHRIFT_DEV) diff --git a/platform/barefoot/saithrift-patches/0001-Update-python-saithrift-installer-to-python3.patch b/platform/barefoot/saithrift-patches/0001-Update-python-saithrift-installer-to-python3.patch deleted file mode 100644 index 505aee7a2ed..00000000000 --- a/platform/barefoot/saithrift-patches/0001-Update-python-saithrift-installer-to-python3.patch +++ /dev/null @@ -1,19 +0,0 @@ -From db2ef7f7861be85ccc13fddb0b324a400a57bf4c Mon Sep 17 00:00:00 2001 -From: Dmytro Lytvynenko -Date: Tue, 5 Jul 2022 08:58:39 -0700 -Subject: [PATCH] Update python-saithrift installer to python3 - ---- - debian/installerFiles/python-saithriftv1.install | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/debian/installerFiles/python-saithriftv1.install b/debian/installerFiles/python-saithriftv1.install -index b984915..e3d2e8c 100644 ---- a/debian/installerFiles/python-saithriftv1.install -+++ b/debian/installerFiles/python-saithriftv1.install -@@ -1 +1 @@ --debian/usr/local/lib/python2.7/site-packages/* /usr/lib/python2.7/dist-packages/ -+debian/usr/local/lib/python3*/site-packages/* /usr/lib/python3/dist-packages/ --- -2.25.1 - diff --git a/platform/barefoot/saithrift-patches/Makefile b/platform/barefoot/saithrift-patches/Makefile deleted file mode 100644 index bd660afcba8..00000000000 --- a/platform/barefoot/saithrift-patches/Makefile +++ /dev/null @@ -1,19 +0,0 @@ - -SHELL = /bin/bash -.ONESHELL: -.SHELLFLAGS += -e - -MAIN_TARGET = saithrift-patches - -$(addprefix $(DEST)/, $(MAIN_TARGET)): $(DEST)/% : -# To add some BFN specific patches to SAI under sonic-sairedis while sai is not updated -SRC_DIR = ../saithrift-patches -DST_DIR = ../../../src/sonic-sairedis/SAI.patch/ - -$(addprefix $(DEST)/, $(MAIN_TARGET)): $(DEST)/% : - # copy patches to SAI - mkdir -p $(DST_DIR) - cp -f $(SRC_DIR)/* $(DST_DIR) - - touch $(DEST)/saithrift-patches - diff --git a/platform/barefoot/saithrift-patches/series b/platform/barefoot/saithrift-patches/series deleted file mode 100644 index 32f924e041f..00000000000 --- a/platform/barefoot/saithrift-patches/series +++ /dev/null @@ -1 +0,0 @@ -0001-Update-python-saithrift-installer-to-python3.patch From fcf493ae382a9c541d7fc251efad9a34d7eb2b77 Mon Sep 17 00:00:00 2001 From: Dmytro Lytvynenko Date: Mon, 8 Aug 2022 09:25:35 -0700 Subject: [PATCH 07/11] Upgrade modules --- .../docker-syncd-bfn-rpc/Dockerfile.j2 | 20 +++++++++---------- .../barefoot/docker-syncd-bfn/Dockerfile.j2 | 2 +- 2 files changed, 10 insertions(+), 12 deletions(-) diff --git a/platform/barefoot/docker-syncd-bfn-rpc/Dockerfile.j2 b/platform/barefoot/docker-syncd-bfn-rpc/Dockerfile.j2 index f3403869cfc..c239d15b3f8 100644 --- a/platform/barefoot/docker-syncd-bfn-rpc/Dockerfile.j2 +++ b/platform/barefoot/docker-syncd-bfn-rpc/Dockerfile.j2 @@ -15,20 +15,18 @@ RUN apt-get purge -y syncd RUN apt-get update \ && apt-get -y install \ net-tools \ - python-setuptools \ + python3-setuptools \ build-essential \ libssl-dev \ libffi-dev \ - python-dev \ + python3-dev \ wget \ cmake \ libqt5core5a \ libqt5network5 \ - libboost-atomic1.71.0 - -# Install pip2 since it is no longer in the APT upstream -RUN curl https://bootstrap.pypa.io/pip/2.7/get-pip.py --output get-pip.py \ - && python2 get-pip.py + 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(' ') -%} @@ -45,10 +43,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 \ diff --git a/platform/barefoot/docker-syncd-bfn/Dockerfile.j2 b/platform/barefoot/docker-syncd-bfn/Dockerfile.j2 index 9da1213f85a..e5c7eeb2da2 100755 --- a/platform/barefoot/docker-syncd-bfn/Dockerfile.j2 +++ b/platform/barefoot/docker-syncd-bfn/Dockerfile.j2 @@ -20,7 +20,7 @@ RUN apt-get install -y \ libcurl4 \ libcurl4-gnutls-dev \ libunwind8-dev \ - libpython3.4 \ + libpython3 \ libc-ares2 \ libedit2 \ libgoogle-perftools4 From 64123fabf350e9c58cc66cb4186ba84185457c4c Mon Sep 17 00:00:00 2001 From: Dmytro Lytvynenko Date: Wed, 10 Aug 2022 06:01:04 -0700 Subject: [PATCH 08/11] remove unnecessary lib --- platform/barefoot/docker-syncd-bfn/Dockerfile.j2 | 1 - 1 file changed, 1 deletion(-) diff --git a/platform/barefoot/docker-syncd-bfn/Dockerfile.j2 b/platform/barefoot/docker-syncd-bfn/Dockerfile.j2 index e5c7eeb2da2..edabd320e38 100755 --- a/platform/barefoot/docker-syncd-bfn/Dockerfile.j2 +++ b/platform/barefoot/docker-syncd-bfn/Dockerfile.j2 @@ -20,7 +20,6 @@ RUN apt-get install -y \ libcurl4 \ libcurl4-gnutls-dev \ libunwind8-dev \ - libpython3 \ libc-ares2 \ libedit2 \ libgoogle-perftools4 From ece45e034ef612ab50eeee9053c9b4496feb5ee4 Mon Sep 17 00:00:00 2001 From: Dmytro Lytvynenko Date: Thu, 11 Aug 2022 18:03:55 -0700 Subject: [PATCH 09/11] remove more unnecessary modules --- platform/barefoot/docker-syncd-bfn-rpc/Dockerfile.j2 | 8 +++----- platform/barefoot/docker-syncd-bfn/Dockerfile.j2 | 5 ++--- 2 files changed, 5 insertions(+), 8 deletions(-) diff --git a/platform/barefoot/docker-syncd-bfn-rpc/Dockerfile.j2 b/platform/barefoot/docker-syncd-bfn-rpc/Dockerfile.j2 index c239d15b3f8..006b2cce86a 100644 --- a/platform/barefoot/docker-syncd-bfn-rpc/Dockerfile.j2 +++ b/platform/barefoot/docker-syncd-bfn-rpc/Dockerfile.j2 @@ -12,18 +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 \ - python3-setuptools \ build-essential \ - libssl-dev \ libffi-dev \ - python3-dev \ wget \ cmake \ libqt5core5a \ libqt5network5 \ + python3-setuptools \ + python3-dev \ python3-pip \ python-is-python3 \ libboost-atomic1.74.0 diff --git a/platform/barefoot/docker-syncd-bfn/Dockerfile.j2 b/platform/barefoot/docker-syncd-bfn/Dockerfile.j2 index edabd320e38..2bb6e7a9728 100755 --- a/platform/barefoot/docker-syncd-bfn/Dockerfile.j2 +++ b/platform/barefoot/docker-syncd-bfn/Dockerfile.j2 @@ -16,9 +16,8 @@ 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 \ libc-ares2 \ libedit2 \ From 5f3e2a29a8a23396158d08c338585902d23b4669 Mon Sep 17 00:00:00 2001 From: Dmytro Lytvynenko Date: Wed, 17 Aug 2022 04:39:23 -0700 Subject: [PATCH 10/11] Update sdk reference --- platform/barefoot/bfn-platform.mk | 2 +- platform/barefoot/bfn-sai.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/platform/barefoot/bfn-platform.mk b/platform/barefoot/bfn-platform.mk index 55cd590da3c..53e4ab9f807 100644 --- a/platform/barefoot/bfn-platform.mk +++ b/platform/barefoot/bfn-platform.mk @@ -1,4 +1,4 @@ -BFN_PLATFORM = bfnplatform_20220704_sai_1.10.2_deb11.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) diff --git a/platform/barefoot/bfn-sai.mk b/platform/barefoot/bfn-sai.mk index 6151113a57d..b8888b59457 100644 --- a/platform/barefoot/bfn-sai.mk +++ b/platform/barefoot/bfn-sai.mk @@ -1,4 +1,4 @@ -BFN_SAI = bfnsdk_20220704_sai_1.10.2_deb11.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) From 12003ad5f481ead3fd9786ac6561ddd9bfe07f84 Mon Sep 17 00:00:00 2001 From: Dmytro Lytvynenko Date: Thu, 18 Aug 2022 08:08:59 -0700 Subject: [PATCH 11/11] remove unnecessary packages from syncd-rpc --- platform/barefoot/docker-syncd-bfn-rpc/Dockerfile.j2 | 3 --- 1 file changed, 3 deletions(-) diff --git a/platform/barefoot/docker-syncd-bfn-rpc/Dockerfile.j2 b/platform/barefoot/docker-syncd-bfn-rpc/Dockerfile.j2 index 006b2cce86a..5e1f4511ec9 100644 --- a/platform/barefoot/docker-syncd-bfn-rpc/Dockerfile.j2 +++ b/platform/barefoot/docker-syncd-bfn-rpc/Dockerfile.j2 @@ -14,14 +14,11 @@ RUN apt-get purge -y syncd ## Pre-install the fundamental packages RUN apt-get update \ && apt-get -y install \ - build-essential \ - libffi-dev \ wget \ cmake \ libqt5core5a \ libqt5network5 \ python3-setuptools \ - python3-dev \ python3-pip \ python-is-python3 \ libboost-atomic1.74.0