[Innovium] Innovium build changes for master branch (#13512)

To Fix innovium build issue

Signed-off-by: Keshav Gupta <keshavg@marvell.com>

platform/innovium/docker-syncd-invm-rpc.mk

@@ -5,6 +5,7 @@ $(DOCKER_SYNCD_INVM_RPC)_PATH = $(PLATFORM_PATH)/docker-syncd-invm-rpc
 $(DOCKER_SYNCD_INVM_RPC)_DEPENDS += $(SYNCD_RPC) $(LIBTHRIFT) $(INVM_LIBSAI) $(PTF)
 $(DOCKER_SYNCD_INVM_RPC)_LOAD_DOCKERS += $(DOCKER_SYNCD_BASE)
 SONIC_DOCKER_IMAGES += $(DOCKER_SYNCD_INVM_RPC)
+SONIC_BUSTER_DOCKERS += $(DOCKER_SYNCD_INVM_RPC)
 ifeq ($(ENABLE_SYNCD_RPC),y)
 SONIC_INSTALL_DOCKER_IMAGES += $(DOCKER_SYNCD_INVM_RPC)
 endif

platform/innovium/docker-syncd-invm-rpc/Dockerfile.j2

@@ -9,19 +9,20 @@ debs/{{ deb }}{{' '}}
 {%- endfor -%}
 debs/
 
-RUN dpkg -P syncd
+RUN apt-get purge -y syncd
 
 ## Pre-install the fundamental packages
 RUN apt-get update \
  && apt-get -y install  \
     net-tools           \
     python-pip          \
+    python-setuptools   \
     build-essential     \
     libssl-dev          \
     libffi-dev          \
     python-dev          \
-    libpython2.7        \
     libjansson4         \
+    libyaml-dev         \
     wget                \
     cmake               \
     libqt5core5a        \
@@ -43,9 +44,6 @@ 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  \
- && pip install cffi==1.7.0    \
- && pip install --upgrade cffi==1.7.0 \
- && pip install nnpy    \
  && pip install numpy   \
  && pip install scipy   \
  && pip install setuptools   \

platform/innovium/docker-syncd-invm.mk

@@ -10,10 +10,12 @@ $(DOCKER_SYNCD_BASE)_DBG_DEPENDS += $(SYNCD_DBG) \
                                 $(LIBSAIMETADATA_DBG) \
                                 $(LIBSAIREDIS_DBG)
 
-SONIC_STRETCH_DOCKERS += $(DOCKER_SYNCD_BASE)
-SONIC_STRETCH_DBG_DOCKERS += $(DOCKER_SYNCD_BASE_DBG)
+SONIC_BUSTER_DOCKERS += $(DOCKER_SYNCD_BASE)
+SONIC_BUSTER_DBG_DOCKERS += $(DOCKER_SYNCD_BASE_DBG)
+
 
 $(DOCKER_SYNCD_BASE)_VERSION = 1.0.0
 $(DOCKER_SYNCD_BASE)_PACKAGE_NAME = syncd
+$(DOCKER_SYNCD_BASE)_MACHINE = innovium
 
 $(DOCKER_SYNCD_BASE)_RUN_OPT += -v /host/warmboot:/var/warmboot

platform/innovium/docker-syncd-invm/Dockerfile.j2

@@ -1,4 +1,4 @@
-FROM docker-config-engine-stretch-{{DOCKER_USERNAME}}:{{DOCKER_USERTAG}}
+FROM docker-config-engine-buster-{{DOCKER_USERNAME}}:{{DOCKER_USERTAG}}
 
 ARG docker_container_name
 
@@ -15,8 +15,8 @@ debs/
 
 # Needed for Innovium Debug Shell
 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 libyaml-dev
 
 RUN dpkg -i \
 {% for deb in docker_syncd_invm_debs.split(' ') -%}

platform/innovium/rules.mk

@@ -1,8 +1,8 @@
 include $(PLATFORM_PATH)/invm-sai.mk
 include $(PLATFORM_PATH)/platform-modules-cel.mk
-include $(PLATFORM_PATH)/platform-modules-delta.mk
+#include $(PLATFORM_PATH)/platform-modules-delta.mk
 include $(PLATFORM_PATH)/platform-modules-wistron.mk
-include $(PLATFORM_PATH)/platform-modules-netberg.mk
+#include $(PLATFORM_PATH)/platform-modules-netberg.mk
 include $(PLATFORM_PATH)/docker-syncd-invm.mk
 include $(PLATFORM_PATH)/docker-syncd-invm-rpc.mk
 include $(PLATFORM_PATH)/one-image.mk