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

Innovium: update 202012 build files (#8524)

Browse Source 
*Update makefiles for Innovium 202012 support
This commit is contained in:
Tony Titus 2021-09-14 19:17:01 -07:00 committed by GitHub
parent ad8a332b78
commit 792b42b96f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 34 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
platform/innovium/docker-syncd-invm-rpc/Dockerfile.j2
View File

@ -9,19 +9,20 @@ debs/{{ deb }}{{' '}}
{%- endfor -%} {%- endfor -%}
debs/ debs/
RUN dpkg -P syncd 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 \ net-tools \
python-pip \ python-pip \
python-setuptools \
build-essential \ build-essential \
libssl-dev \ libssl-dev \
libffi-dev \ libffi-dev \
python-dev \ python-dev \
libpython2.7 \
libjansson4 \ libjansson4 \
libyaml-dev \
wget \ wget \
cmake \ cmake \
libqt5core5a \ libqt5core5a \
@ -43,9 +44,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 \
&& pip install cffi==1.7.0 \ && pip2 install cffi==1.7.0 \
&& pip install --upgrade cffi==1.7.0 \ && pip2 install --upgrade cffi==1.7.0 \
&& pip install nnpy \ && pip2 install wheel \
&& pip2 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 \

3
platform/innovium/docker-syncd-invm.mk
View File

@ -10,7 +10,4 @@ $(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)_RUN_OPT += -v /host/warmboot:/var/warmboot $(DOCKER_SYNCD_BASE)_RUN_OPT += -v /host/warmboot:/var/warmboot

4
platform/innovium/docker-syncd-invm/Dockerfile.j2
View File

@ -1,4 +1,4 @@
FROM docker-config-engine-stretch FROM docker-config-engine-buster
ARG docker_container_name ARG docker_container_name
RUN [ -f /etc/rsyslog.conf ] && sed -ri "s/%syslogtag%/$docker_container_name#%syslogtag%/;" /etc/rsyslog.conf RUN [ -f /etc/rsyslog.conf ] && sed -ri "s/%syslogtag%/$docker_container_name#%syslogtag%/;" /etc/rsyslog.conf
@ -16,8 +16,8 @@ debs/
# Needed for Innovium Debug Shell # Needed for Innovium Debug Shell
RUN apt-get install -y net-tools RUN apt-get install -y net-tools
RUN apt-get install -y libpython2.7
RUN apt-get install -y libjansson4 RUN apt-get install -y libjansson4
RUN apt-get install -y libyaml-dev
RUN dpkg -i \ RUN dpkg -i \
{% for deb in docker_syncd_invm_debs.split(' ') -%} {% for deb in docker_syncd_invm_debs.split(' ') -%}

6
platform/innovium/docker-syncd-invm/start.sh Executable file
View File

@ -0,0 +1,6 @@
#!/usr/bin/env bash
if [ -f /usr/bin/ivm_start.sh ];
then
/usr/bin/ivm_start.sh
fi

13
platform/innovium/docker-syncd-invm/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
@ -21,6 +21,17 @@ stdout_logfile=syslog
stderr_logfile=syslog stderr_logfile=syslog
dependent_startup=true dependent_startup=true
[program:start]
command=/usr/bin/start.sh
priority=1
autostart=false
autorestart=false
startsecs=0
stdout_logfile=syslog
stderr_logfile=syslog
dependent_startup=true
dependent_startup_wait_for=rsyslogd:running
[program:syncd] [program:syncd]
command=/usr/bin/syncd_start.sh command=/usr/bin/syncd_start.sh
priority=2 priority=2

2
platform/innovium/invm-sai.mk
View File

@ -1,6 +1,6 @@
# INVM SAI # INVM SAI
INVM_SAI_ONLINE = https://github.com/Innovium/SONiC/raw/master/debian/master INVM_SAI_ONLINE = https://github.com/Innovium/SONiC/raw/master/debian/202012
INVM_LIBSAI = isai.deb INVM_LIBSAI = isai.deb
INVM_HSAI = saihdr.deb INVM_HSAI = saihdr.deb

7
platform/innovium/one-image.mk
View File

@ -7,5 +7,10 @@ $(SONIC_ONE_IMAGE)_IMAGE_TYPE = onie
$(SONIC_ONE_IMAGE)_LAZY_INSTALLS += $(CEL_MIDSTONE_200I_PLATFORM_MODULE) $(SONIC_ONE_IMAGE)_LAZY_INSTALLS += $(CEL_MIDSTONE_200I_PLATFORM_MODULE)
$(SONIC_ONE_IMAGE)_LAZY_INSTALLS += $(DELTA_PLATFORM_MODULE) $(SONIC_ONE_IMAGE)_LAZY_INSTALLS += $(DELTA_PLATFORM_MODULE)
$(SONIC_ONE_IMAGE)_INSTALLS += $(INVM_DRV) $(SONIC_ONE_IMAGE)_INSTALLS += $(INVM_DRV)
$(SONIC_ONE_IMAGE)_DOCKERS += $(SONIC_INSTALL_DOCKER_IMAGES) ifeq ($(INSTALL_DEBUG_TOOLS),y)
$(SONIC_ONE_IMAGE)_DOCKERS += $(SONIC_INSTALL_DOCKER_DBG_IMAGES)
$(SONIC_ONE_IMAGE)_DOCKERS += $(filter-out $(patsubst %-$(DBG_IMAGE_MARK).gz,%.gz, $(SONIC_INSTALL_DOCKER_DBG_IMAGES)), $(SONIC_INSTALL_DOCKER_IMAGES))
else
$(SONIC_ONE_IMAGE)_DOCKERS = $(SONIC_INSTALL_DOCKER_IMAGES)
endif
SONIC_INSTALLERS += $(SONIC_ONE_IMAGE) SONIC_INSTALLERS += $(SONIC_ONE_IMAGE)