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

[Marvell] Move amd64 & arm64 syncd to buster (#8869)

Browse Source 
Signed-off-by: Rajkumar Pennadam Ramamoorthy <rpennadamram@marvell.com>
This commit is contained in:
Rajkumar-Marvell 2021-11-04 20:14:33 +05:30 committed by GitHub
parent ea91a72b79
commit 56049830fb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
10 changed files with 13 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
platform/marvell-arm64/docker-saiserver-mrvl.mk
View File

@ -3,9 +3,8 @@
DOCKER_SAISERVER_MRVL = docker-saiserver-mrvl.gz DOCKER_SAISERVER_MRVL = docker-saiserver-mrvl.gz
$(DOCKER_SAISERVER_MRVL)_PATH = $(PLATFORM_PATH)/docker-saiserver-mrvl $(DOCKER_SAISERVER_MRVL)_PATH = $(PLATFORM_PATH)/docker-saiserver-mrvl
$(DOCKER_SAISERVER_MRVL)_DEPENDS += $(SAISERVER) $(DOCKER_SAISERVER_MRVL)_DEPENDS += $(SAISERVER)
$(DOCKER_SAISERVER_MRVL)_LOAD_DOCKERS += $(DOCKER_CONFIG_ENGINE_STRETCH) $(DOCKER_SAISERVER_MRVL)_LOAD_DOCKERS += $(DOCKER_CONFIG_ENGINE_BUSTER)
SONIC_DOCKER_IMAGES += $(DOCKER_SAISERVER_MRVL) SONIC_DOCKER_IMAGES += $(DOCKER_SAISERVER_MRVL)
SONIC_STRETCH_DOCKERS += $(DOCKER_SAISERVER_MRVL)
$(DOCKER_SAISERVER_MRVL)_CONTAINER_NAME = saiserver $(DOCKER_SAISERVER_MRVL)_CONTAINER_NAME = saiserver
$(DOCKER_SAISERVER_MRVL)_RUN_OPT += --privileged -t $(DOCKER_SAISERVER_MRVL)_RUN_OPT += --privileged -t

1
platform/marvell-arm64/docker-syncd-mrvl-rpc.mk
View File

@ -12,7 +12,6 @@ $(DOCKER_SYNCD_MRVL_RPC)_DEPENDS += $(SYNCD_RPC_DBG) \
endif endif
$(DOCKER_SYNCD_MRVL_RPC)_LOAD_DOCKERS += $(DOCKER_SYNCD_BASE) $(DOCKER_SYNCD_MRVL_RPC)_LOAD_DOCKERS += $(DOCKER_SYNCD_BASE)
SONIC_DOCKER_IMAGES += $(DOCKER_SYNCD_MRVL_RPC) SONIC_DOCKER_IMAGES += $(DOCKER_SYNCD_MRVL_RPC)
SONIC_STRETCH_DOCKERS += $(DOCKER_SYNCD_MRVL_RPC)
ifeq ($(ENABLE_SYNCD_RPC),y) ifeq ($(ENABLE_SYNCD_RPC),y)
SONIC_INSTALL_DOCKER_IMAGES += $(DOCKER_SYNCD_MRVL_RPC) SONIC_INSTALL_DOCKER_IMAGES += $(DOCKER_SYNCD_MRVL_RPC)
endif endif

7
platform/marvell-arm64/docker-syncd-mrvl.mk
View File

@ -3,17 +3,14 @@
DOCKER_SYNCD_PLATFORM_CODE = mrvl DOCKER_SYNCD_PLATFORM_CODE = mrvl
include $(PLATFORM_PATH)/../template/docker-syncd-base.mk include $(PLATFORM_PATH)/../template/docker-syncd-base.mk
$(DOCKER_SYNCD_BASE)_DEPENDS += $(SYNCD) $(PYTHON_SDK_API) $(DOCKER_SYNCD_BASE)_DEPENDS += $(SYNCD)
$(DOCKER_SYNCD_BASE)_DBG_DEPENDS += $(SYNCD_DBG) \ $(DOCKER_SYNCD_BASE)_DBG_DEPENDS += $(SYNCD_DBG) \
$(LIBSWSSCOMMON_DBG) \ $(LIBSWSSCOMMON_DBG) \
$(LIBSAIMETADATA_DBG) \ $(LIBSAIMETADATA_DBG) \
$(LIBSAIREDIS_DBG) $(LIBSAIREDIS_DBG)
SONIC_STRETCH_DOCKERS += $(DOCKER_SYNCD_BASE)
SONIC_STRETCH_DBG_DOCKERS += $(DOCKER_SYNCD_BASE_DBG)
$(DOCKER_SYNCD_BASE)_VERSION = 1.0.0 $(DOCKER_SYNCD_BASE)_VERSION = 1.0.0
$(DOCKER_SYNCD_BASE)_PACKAGE_NAME = syncd $(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

5
platform/marvell-arm64/docker-syncd-mrvl/Dockerfile.j2
View File

@ -1,4 +1,5 @@
FROM docker-config-engine-stretch {% from "dockers/dockerfile-macros.j2" import install_debian_packages %}
FROM docker-config-engine-buster
ARG docker_container_name ARG docker_container_name
@ -20,7 +21,7 @@ RUN apt-get update \
net-tools \ net-tools \
iputils-ping iputils-ping
RUN apt-get -y install libpcap-dev libxml2-dev python-dev swig libsensors4-dev libjemalloc1 nfs-common RUN apt-get -y install libpcap-dev libxml2-dev python-dev swig libsensors4-dev nfs-common
RUN dpkg -i \ RUN dpkg -i \
{% for deb in docker_syncd_mrvl_debs.split(' ') -%} {% for deb in docker_syncd_mrvl_debs.split(' ') -%}

4
platform/marvell-arm64/docker-syncd-mrvl/supervisord.conf
View File

@ -4,7 +4,7 @@ logfile_backups=2
nodaemon=true nodaemon=true
[eventlistener:dependent-startup] [eventlistener:dependent-startup]
command=python2 -m supervisord_dependent_startup command=python3 -m supervisord_dependent_startup
autostart=true autostart=true
autorestart=unexpected autorestart=unexpected
startretries=0 startretries=0
@ -13,7 +13,7 @@ events=PROCESS_STATE
buffer_size=1024 buffer_size=1024
[eventlistener:supervisor-proc-exit-listener] [eventlistener:supervisor-proc-exit-listener]
command=python2 /usr/bin/supervisor-proc-exit-listener --container-name syncd command=python3 /usr/bin/supervisor-proc-exit-listener --container-name syncd
events=PROCESS_STATE_EXITED,PROCESS_STATE_RUNNING events=PROCESS_STATE_EXITED,PROCESS_STATE_RUNNING
autostart=true autostart=true
autorestart=unexpected autorestart=unexpected

2
platform/marvell-arm64/rules.mk
View File

@ -6,8 +6,6 @@ include $(PLATFORM_PATH)/docker-saiserver-mrvl.mk
include $(PLATFORM_PATH)/libsaithrift-dev.mk include $(PLATFORM_PATH)/libsaithrift-dev.mk
include $(PLATFORM_PATH)/one-image.mk include $(PLATFORM_PATH)/one-image.mk
include $(PLATFORM_PATH)/linux-kernel-arm64.mk include $(PLATFORM_PATH)/linux-kernel-arm64.mk
INCLUDE_SYSTEM_TELEMETRY = ""
SONIC_ALL += $(SONIC_ONE_IMAGE) \ SONIC_ALL += $(SONIC_ONE_IMAGE) \
$(DOCKER_FPM) \ $(DOCKER_FPM) \

1
platform/marvell/docker-syncd-mrvl-rpc.mk
View File

@ -12,7 +12,6 @@ $(DOCKER_SYNCD_MRVL_RPC)_DEPENDS += $(SYNCD_RPC_DBG) \
endif endif
$(DOCKER_SYNCD_MRVL_RPC)_LOAD_DOCKERS += $(DOCKER_SYNCD_BASE) $(DOCKER_SYNCD_MRVL_RPC)_LOAD_DOCKERS += $(DOCKER_SYNCD_BASE)
SONIC_DOCKER_IMAGES += $(DOCKER_SYNCD_MRVL_RPC) SONIC_DOCKER_IMAGES += $(DOCKER_SYNCD_MRVL_RPC)
SONIC_STRETCH_DOCKERS += $(DOCKER_SYNCD_MRVL_RPC)
ifeq ($(ENABLE_SYNCD_RPC),y) ifeq ($(ENABLE_SYNCD_RPC),y)
SONIC_INSTALL_DOCKER_IMAGES += $(DOCKER_SYNCD_MRVL_RPC) SONIC_INSTALL_DOCKER_IMAGES += $(DOCKER_SYNCD_MRVL_RPC)
endif endif

3
platform/marvell/docker-syncd-mrvl.mk
View File

@ -10,9 +10,6 @@ $(DOCKER_SYNCD_BASE)_DBG_DEPENDS += $(SYNCD_DBG) \
$(LIBSAIMETADATA_DBG) \ $(LIBSAIMETADATA_DBG) \
$(LIBSAIREDIS_DBG) $(LIBSAIREDIS_DBG)
SONIC_STRETCH_DOCKERS += $(DOCKER_SYNCD_BASE)
SONIC_STRETCH_DBG_DOCKERS += $(DOCKER_SYNCD_BASE_DBG)
$(DOCKER_SYNCD_BASE)_VERSION = 1.0.0 $(DOCKER_SYNCD_BASE)_VERSION = 1.0.0
$(DOCKER_SYNCD_BASE)_PACKAGE_NAME = syncd $(DOCKER_SYNCD_BASE)_PACKAGE_NAME = syncd

5
platform/marvell/docker-syncd-mrvl/Dockerfile.j2
View File

@ -1,4 +1,5 @@
FROM docker-config-engine-stretch {% from "dockers/dockerfile-macros.j2" import install_debian_packages %}
FROM docker-config-engine-buster
ARG docker_container_name ARG docker_container_name
@ -15,7 +16,7 @@ debs/{{ deb }}{{' '}}
{%- endfor -%} {%- endfor -%}
debs/ debs/
RUN apt-get -y install libpcap-dev libxml2-dev python-dev swig libsensors4-dev libatomic1 libjemalloc1 liblua5.1-0 lua-bitop lua-cjson nfs-common RUN apt-get -y install libpcap-dev libxml2-dev python-dev swig libsensors4-dev libatomic1 liblua5.1-0 lua-bitop lua-cjson nfs-common
RUN dpkg -i \ RUN dpkg -i \
{% for deb in docker_syncd_mrvl_debs.split(' ') -%} {% for deb in docker_syncd_mrvl_debs.split(' ') -%}

4
platform/marvell/docker-syncd-mrvl/supervisord.conf
View File

@ -4,7 +4,7 @@ logfile_backups=2
nodaemon=true nodaemon=true
[eventlistener:dependent-startup] [eventlistener:dependent-startup]
command=python2 -m supervisord_dependent_startup command=python3 -m supervisord_dependent_startup
autostart=true autostart=true
autorestart=unexpected autorestart=unexpected
startretries=0 startretries=0
@ -13,7 +13,7 @@ events=PROCESS_STATE
buffer_size=1024 buffer_size=1024
[eventlistener:supervisor-proc-exit-listener] [eventlistener:supervisor-proc-exit-listener]
command=python2 /usr/bin/supervisor-proc-exit-listener --container-name syncd command=python3 /usr/bin/supervisor-proc-exit-listener --container-name syncd
events=PROCESS_STATE_EXITED,PROCESS_STATE_RUNNING events=PROCESS_STATE_EXITED,PROCESS_STATE_RUNNING
autostart=true autostart=true
autorestart=unexpected autorestart=unexpected