[Centec] Upgrade Centec platform containers(syncd/saiserver/syncd-rpc) to bullseye (#13375)

Why I did it Upgrade both Centec X86 and ARM64 platform containers(syncd/saiserver/syncd-rpc) to bullseye Optimize Centec X86 platform makefile, change sdk.mk to sai.mk How I did it Modify Makefile and Dockerfile to use bullseye Change filename form sdk.mk to sai.mk, optimize and modify related files How to verify it For Centec X86 platform, compile the code with : a) make configure PLATFORM=centec; b) make all For Centec ARM64 platform, cmpile the code with: a) make configure PLATFORM=centec-arm64 PLATFORM_ARCH=arm64; b) make all Verifiy the sonic-centec.bin and sonic-centec-arm64.bin on Centec chip based board.
2023-02-07 01:26:35 +08:00 · 2023-02-07 01:26:35 +08:00 · 35e41687b4
commit 35e41687b4
parent eea54717b8
16 changed files with 37 additions and 42 deletions
--- a/platform/centec-arm64/docker-saiserver-centec.mk
+++ b/platform/centec-arm64/docker-saiserver-centec.mk
@ -3,7 +3,7 @@
 DOCKER_SAISERVER_CENTEC = docker-saiserver-centec.gz
 $(DOCKER_SAISERVER_CENTEC)_PATH = $(PLATFORM_PATH)/docker-saiserver-centec
 $(DOCKER_SAISERVER_CENTEC)_DEPENDS += $(SAISERVER)
-$(DOCKER_SAISERVER_CENTEC)_LOAD_DOCKERS += $(DOCKER_CONFIG_ENGINE_BUSTER)
+$(DOCKER_SAISERVER_CENTEC)_LOAD_DOCKERS += $(DOCKER_CONFIG_ENGINE_BULLSEYE)
 SONIC_DOCKER_IMAGES += $(DOCKER_SAISERVER_CENTEC)

 $(DOCKER_SAISERVER_CENTEC)_CONTAINER_NAME = saiserver
@ -13,4 +13,4 @@ $(DOCKER_SAISERVER_CENTEC)_RUN_OPT += -v /var/run/docker-saiserver:/var/run/ssws
 $(DOCKER_SAISERVER_CENTEC)_RUN_OPT += -v /etc/sonic:/etc/sonic:ro
 $(DOCKER_SAISERVER_CENTEC)_RUN_OPT += -v /host/warmboot:/var/warmboot

-SONIC_BUSTER_DOCKERS += $(DOCKER_SAISERVER_CENTEC)
+SONIC_BULLSEYE_DOCKERS += $(DOCKER_SAISERVER_CENTEC)
--- a/platform/centec-arm64/docker-saiserver-centec/Dockerfile.j2
+++ b/platform/centec-arm64/docker-saiserver-centec/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

@ -7,7 +7,7 @@ ENV DEBIAN_FRONTEND=noninteractive

 RUN apt-get update              \
 && apt-get -y install          \
-      libboost-atomic1.71-dev   \
+      libboost-atomic1.74.0     \
      libqt5core5a              \
      libqt5network5

--- a/platform/centec-arm64/docker-syncd-centec-rpc.mk
+++ b/platform/centec-arm64/docker-syncd-centec-rpc.mk
@ -24,4 +24,4 @@ $(DOCKER_SYNCD_CENTEC_RPC)_RUN_OPT += -v /host/machine.conf:/etc/machine.conf
 $(DOCKER_SYNCD_CENTEC_RPC)_RUN_OPT += -v /var/run/docker-syncd:/var/run/sswsyncd
 $(DOCKER_SYNCD_CENTEC_RPC)_RUN_OPT += -v /etc/sonic:/etc/sonic:ro

-SONIC_BUSTER_DOCKERS += $(DOCKER_SYNCD_CENTEC_RPC)
+SONIC_BULLSEYE_DOCKERS += $(DOCKER_SYNCD_CENTEC_RPC)
--- a/platform/centec-arm64/docker-syncd-centec-rpc/Dockerfile.j2
+++ b/platform/centec-arm64/docker-syncd-centec-rpc/Dockerfile.j2
@ -2,11 +2,6 @@ FROM docker-syncd-centec-{{DOCKER_USERNAME}}:{{DOCKER_USERTAG}}

 ## Make apt-get non-interactive
 ENV DEBIAN_FRONTEND=noninteractive
-RUN apt-get update \
-  && apt-get -y install \
-  libboost-atomic1.71-dev \
-  libqt5core5a   \
-  libqt5network5

 COPY \
 {% for deb in docker_syncd_centec_rpc_debs.split(' ') -%}
@ -20,7 +15,7 @@ RUN apt-get purge -y syncd
 RUN apt-get update \
 && apt-get -y install  \
    net-tools           \
-    python-pip          \
+    python3-pip          \
    python-setuptools   \
    build-essential     \
    libssl-dev          \
@ -30,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_centec_rpc_debs.split(' ') -%}
--- a/platform/centec-arm64/docker-syncd-centec.mk
+++ b/platform/centec-arm64/docker-syncd-centec.mk
@ -1,7 +1,7 @@
 # docker image for centec syncd

 DOCKER_SYNCD_PLATFORM_CODE = centec
-include $(PLATFORM_PATH)/../template/docker-syncd-base.mk
+include $(PLATFORM_PATH)/../template/docker-syncd-bullseye.mk

 $(DOCKER_SYNCD_BASE)_DEPENDS += $(SYNCD) $(PYTHON_SDK_API)
 $(DOCKER_SYNCD_CENTEC)_FILES += $(SUPERVISOR_PROC_EXIT_LISTENER_SCRIPT)
--- a/platform/centec-arm64/docker-syncd-centec/Dockerfile.j2
+++ b/platform/centec-arm64/docker-syncd-centec/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

--- a/platform/centec-arm64/sai.mk
+++ b/platform/centec-arm64/sai.mk
@ -3,11 +3,12 @@
 export CENTEC_SAI_VERSION = 1.11.0-1
 export CENTEC_SAI = libsai_$(CENTEC_SAI_VERSION)_$(PLATFORM_ARCH).deb
 export CENTEC_SAI_DEV = libsai-dev_$(CENTEC_SAI_VERSION)_$(PLATFORM_ARCH).deb
+export CENTEC_SAI_URL_PREFIX = "https://github.com/CentecNetworks/sonic-binaries/raw/master/$(PLATFORM_ARCH)/sai"

-$(CENTEC_SAI)_URL = https://github.com/CentecNetworks/sonic-binaries/raw/master/$(PLATFORM_ARCH)/sai/$(CENTEC_SAI)
-$(CENTEC_SAI_DEV)_URL = https://github.com/CentecNetworks/sonic-binaries/raw/master/$(PLATFORM_ARCH)/sai/$(CENTEC_SAI_DEV)
+$(CENTEC_SAI)_URL = $(CENTEC_SAI_URL_PREFIX)/$(CENTEC_SAI)
+$(CENTEC_SAI_DEV)_URL = $(CENTEC_SAI_URL_PREFIX)/$(CENTEC_SAI_DEV)
 $(eval $(call add_conflict_package,$(CENTEC_SAI_DEV),$(LIBSAIVS_DEV)))

 SONIC_ONLINE_DEBS += $(CENTEC_SAI)
 SONIC_ONLINE_DEBS += $(CENTEC_SAI_DEV)
-
+$(CENTEC_SAI_DEV)_DEPENDS += $(CENTEC_SAI)
--- a/platform/centec/docker-saiserver-centec.mk
+++ b/platform/centec/docker-saiserver-centec.mk
@ -3,7 +3,7 @@
 DOCKER_SAISERVER_CENTEC = docker-saiserver-centec.gz
 $(DOCKER_SAISERVER_CENTEC)_PATH = $(PLATFORM_PATH)/docker-saiserver-centec
 $(DOCKER_SAISERVER_CENTEC)_DEPENDS += $(SAISERVER)
-$(DOCKER_SAISERVER_CENTEC)_LOAD_DOCKERS += $(DOCKER_CONFIG_ENGINE_BUSTER)
+$(DOCKER_SAISERVER_CENTEC)_LOAD_DOCKERS += $(DOCKER_CONFIG_ENGINE_BULLSEYE)
 SONIC_DOCKER_IMAGES += $(DOCKER_SAISERVER_CENTEC)

 $(DOCKER_SAISERVER_CENTEC)_CONTAINER_NAME = saiserver
@ -13,4 +13,4 @@ $(DOCKER_SAISERVER_CENTEC)_RUN_OPT += -v /var/run/docker-saiserver:/var/run/ssws
 $(DOCKER_SAISERVER_CENTEC)_RUN_OPT += -v /etc/sonic:/etc/sonic:ro
 $(DOCKER_SAISERVER_CENTEC)_RUN_OPT += -v /host/warmboot:/var/warmboot

-SONIC_BUSTER_DOCKERS += $(DOCKER_SAISERVER_CENTEC)
+SONIC_BULLSEYE_DOCKERS += $(DOCKER_SAISERVER_CENTEC)
--- a/platform/centec/docker-saiserver-centec/Dockerfile.j2
+++ b/platform/centec/docker-saiserver-centec/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

@ -7,7 +7,7 @@ ENV DEBIAN_FRONTEND=noninteractive

 RUN apt-get update              \
 && apt-get -y install          \
-      libboost-atomic1.71-dev   \
+      libboost-atomic1.74.0     \
      libqt5core5a              \
      libqt5network5

--- a/platform/centec/docker-syncd-centec-rpc.mk
+++ b/platform/centec/docker-syncd-centec-rpc.mk
@ -24,4 +24,4 @@ $(DOCKER_SYNCD_CENTEC_RPC)_RUN_OPT += -v /host/machine.conf:/etc/machine.conf
 $(DOCKER_SYNCD_CENTEC_RPC)_RUN_OPT += -v /var/run/docker-syncd:/var/run/sswsyncd
 $(DOCKER_SYNCD_CENTEC_RPC)_RUN_OPT += -v /etc/sonic:/etc/sonic:ro

-SONIC_BUSTER_DOCKERS += $(DOCKER_SYNCD_CENTEC_RPC)
+SONIC_BULLSEYE_DOCKERS += $(DOCKER_SYNCD_CENTEC_RPC)
--- a/platform/centec/docker-syncd-centec-rpc/Dockerfile.j2
+++ b/platform/centec/docker-syncd-centec-rpc/Dockerfile.j2
@ -2,11 +2,6 @@ FROM docker-syncd-centec-{{DOCKER_USERNAME}}:{{DOCKER_USERTAG}}

 ## Make apt-get non-interactive
 ENV DEBIAN_FRONTEND=noninteractive
-RUN apt-get update \
-  && apt-get -y install \
-  libboost-atomic1.71-dev \
-  libqt5core5a   \
-  libqt5network5

 COPY \
 {% for deb in docker_syncd_centec_rpc_debs.split(' ') -%}
@ -20,7 +15,7 @@ RUN apt-get purge -y syncd
 RUN apt-get update \
 && apt-get -y install  \
    net-tools           \
-    python-pip          \
+    python3-pip          \
    python-setuptools   \
    build-essential     \
    libssl-dev          \
@ -30,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_centec_rpc_debs.split(' ') -%}
--- a/platform/centec/docker-syncd-centec.mk
+++ b/platform/centec/docker-syncd-centec.mk
@ -1,7 +1,7 @@
 # docker image for centec syncd

 DOCKER_SYNCD_PLATFORM_CODE = centec
-include $(PLATFORM_PATH)/../template/docker-syncd-base.mk
+include $(PLATFORM_PATH)/../template/docker-syncd-bullseye.mk

 $(DOCKER_SYNCD_BASE)_DEPENDS += $(SYNCD)

--- a/platform/centec/docker-syncd-centec/Dockerfile.j2
+++ b/platform/centec/docker-syncd-centec/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

--- a/platform/centec/rules.mk
+++ b/platform/centec/rules.mk
@ -1,7 +1,7 @@
 include $(PLATFORM_PATH)/platform-modules-centec-e582.mk
 include $(PLATFORM_PATH)/platform-modules-embedway.mk
 include $(PLATFORM_PATH)/platform-modules-centec-v682.mk
-include $(PLATFORM_PATH)/sdk.mk
+include $(PLATFORM_PATH)/sai.mk
 include $(PLATFORM_PATH)/docker-syncd-centec.mk
 include $(PLATFORM_PATH)/docker-syncd-centec-rpc.mk
 include $(PLATFORM_PATH)/docker-saiserver-centec.mk
--- a/platform/centec/sai.mk
+++ b/platform/centec/sai.mk
@ -0,0 +1,14 @@
+# Centec SAI
+
+export CENTEC_SAI_VERSION = 1.11.0-1
+export CENTEC_SAI = libsai_$(CENTEC_SAI_VERSION)_$(PLATFORM_ARCH).deb
+export CENTEC_SAI_DEV = libsai-dev_$(CENTEC_SAI_VERSION)_$(PLATFORM_ARCH).deb
+export CENTEC_SAI_URL_PREFIX = "https://github.com/CentecNetworks/sonic-binaries/raw/master/$(PLATFORM_ARCH)/sai"
+
+$(CENTEC_SAI)_URL = $(CENTEC_SAI_URL_PREFIX)/$(CENTEC_SAI)
+$(CENTEC_SAI_DEV)_URL = $(CENTEC_SAI_URL_PREFIX)/$(CENTEC_SAI_DEV)
+$(eval $(call add_conflict_package,$(CENTEC_SAI_DEV),$(LIBSAIVS_DEV)))
+
+SONIC_ONLINE_DEBS += $(CENTEC_SAI)
+SONIC_ONLINE_DEBS += $(CENTEC_SAI_DEV)
+$(CENTEC_SAI_DEV)_DEPENDS += $(CENTEC_SAI)
--- a/platform/centec/sdk.mk
+++ b/platform/centec/sdk.mk
@ -1,10 +0,0 @@
-# Centec SAI
-CENTEC_SAI = libsai_1.11.0-1_amd64.deb
-$(CENTEC_SAI)_URL = https://github.com/CentecNetworks/sonic-binaries/raw/master/amd64/sai/$(CENTEC_SAI)
-
-CENTEC_SAI_DEV = libsai-dev_1.11.0-1_amd64.deb
-$(CENTEC_SAI_DEV)_URL = https://github.com/CentecNetworks/sonic-binaries/raw/master/amd64/sai/$(CENTEC_SAI_DEV)
-$(eval $(call add_conflict_package,$(CENTEC_SAI_DEV),$(LIBSAIVS_DEV)))
-
-SONIC_ONLINE_DEBS += $(CENTEC_SAI)
-SONIC_ONLINE_DEBS += $(CENTEC_SAI_DEV)