[201811][platform/nephos]fix the compile error about syncd (sonic-ne…

…t#3373)

Fixed errors in the following files to resolve build failures
- docker-ptf-nephos.mk\docker-syncd-nephos.mk\libsaithrift-dev.mk\rules.mk
- Upgrade sai.mk for support sai_1.4.1 and upgrade sdk version to 3.0.0

platform/nephos/docker-ptf-nephos.mk

@@ -2,6 +2,6 @@
 
 DOCKER_PTF_NEPHOS = docker-ptf-nephos.gz
 $(DOCKER_PTF_NEPHOS)_PATH = $(DOCKERS_PATH)/docker-ptf-saithrift
-$(DOCKER_PTF_NEPHOS)_DEPENDS += $(PYTHON_SAITHRIFT_NEPHOS)
+$(DOCKER_PTF_NEPHOS)_DEPENDS += $(PYTHON_SAITHRIFT)
 $(DOCKER_PTF_NEPHOS)_LOAD_DOCKERS += $(DOCKER_PTF)
 SONIC_DOCKER_IMAGES += $(DOCKER_PTF_NEPHOS)

platform/nephos/docker-syncd-nephos.mk

@@ -1,17 +1,17 @@
 # docker image for nephos syncd
 
-DOCKER_SYNCD_PLATFORM_CODE = bfn
+DOCKER_SYNCD_PLATFORM_CODE = nephos
 include $(PLATFORM_PATH)/../template/docker-syncd-base.mk
 
 $(DOCKER_SYNCD_BASE)_DEPENDS += $(SYNCD)
+$(DOCKER_SYNCD_BASE)_FILES += $(DSSERVE) $(NPX_DIAG)
 
 $(DOCKER_SYNCD_BASE)_DBG_DEPENDS += $(SYNCD_DBG) \
-									$(LIBSWSSCOMMON_DBG) \
-									$(LIBSAIMETADATA_DBG) \
-									$(LIBSAIREDIS_DBG)
-
-$(DOCKER_SYNCD_BASE)_FILES += $(DSSERVE) $(NPX_DIAG)
+				    $(LIBSWSSCOMMON_DBG) \
+				    $(LIBSAIMETADATA_DBG) \
+				    $(LIBSAIREDIS_DBG)
 
 $(DOCKER_SYNCD_BASE)_RUN_OPT += -v /var/run/docker-syncd:/var/run/sswsyncd
+$(DOCKER_SYNCD_BASE)_RUN_OPT += -v /host/warmboot:/var/warmboot
 
 $(DOCKER_SYNCD_BASE)_BASE_IMAGE_FILES += npx_diag:/usr/bin/npx_diag

platform/nephos/libsaithrift-dev.mk

@@ -4,15 +4,15 @@ SAI_VER = 0.9.4
 
 LIBSAITHRIFT_DEV = libsaithrift-dev_$(SAI_VER)_amd64.deb
 $(LIBSAITHRIFT_DEV)_SRC_PATH = $(SRC_PATH)/sonic-sairedis/SAI
-$(LIBSAITHRIFT_DEV)_DEPENDS += $(LIBTHRIFT) $(LIBTHRIFT_DEV) $(THRIFT_COMPILER) $(NEPHOS_SAI) $(NEPHOS_SAI_DEV)
+$(LIBSAITHRIFT_DEV)_DEPENDS += $(LIBTHRIFT) $(LIBTHRIFT_DEV) $(PYTHON_THRIFT) $(THRIFT_COMPILER) $(NEPHOS_SAI) $(NEPHOS_SAI_DEV)
 $(LIBSAITHRIFT_DEV)_RDEPENDS += $(LIBTHRIFT) $(NEPHOS_SAI)
 SONIC_DPKG_DEBS += $(LIBSAITHRIFT_DEV)
 
 PYTHON_SAITHRIFT = python-saithrift_$(SAI_VER)_amd64.deb
 $(eval $(call add_extra_package,$(LIBSAITHRIFT_DEV),$(PYTHON_SAITHRIFT)))
 
 SAISERVER = saiserver_$(SAI_VER)_amd64.deb
-$(SAISERVER)_RDEPENDS += $(LIBTHRIFT) $(BRCM_SAI)
+$(SAISERVER)_RDEPENDS += $(LIBTHRIFT) $(NEPHOS_SAI)
 $(eval $(call add_extra_package,$(LIBSAITHRIFT_DEV),$(SAISERVER)))
 
 SAISERVER_DBG = saiserver-dbg_$(SAI_VER)_amd64.deb

platform/nephos/rules.mk

@@ -8,21 +8,20 @@ include $(PLATFORM_PATH)/docker-syncd-nephos.mk
 include $(PLATFORM_PATH)/docker-syncd-nephos-rpc.mk
 include $(PLATFORM_PATH)/one-image.mk
 include $(PLATFORM_PATH)/libsaithrift-dev.mk
-include $(PLATFORM_PATH)/python-saithrift.mk
 include $(PLATFORM_PATH)/docker-ptf-nephos.mk
 
 NPX_DIAG = npx_diag
 $(NPX_DIAG)_URL = "https://github.com/NephosInc/SONiC/raw/master/sdk/npx_diag"
 
 DSSERVE = dsserve
-$(DSSERVE)_URL = "https://sonicstorage.blob.core.windows.net/packages/20170518/dsserve?sv=2015-04-05&sr=b&sig=gyNbgSL%2FvpMXDdpboVkIJcTKMRdGgEaOR9OukHhEsu8%3D&se=2030-03-31T23%3A06%3A35Z&sp=r"
+$(DSSERVE)_URL = "https://sonicstorage.blob.core.windows.net/packages/20190307/dsserve?sv=2015-04-05&sr=b&sig=lk7BH3DtW%2F5ehc0Rkqfga%2BUCABI0UzQmDamBsZH9K6w%3D&se=2038-05-06T22%3A34%3A45Z&sp=r"
 
 SONIC_ONLINE_FILES += $(NPX_DIAG) $(DSSERVE)
 
 SONIC_ALL += $(SONIC_ONE_IMAGE) $(DOCKER_FPM)
 
 # Inject nephos sai into sairedis
-$(LIBSAIREDIS)_DEPENDS += $(NEPHOS_SAI) $(NEPHOS_SAI_DEV) $(LIBSAITHRIFT_DEV_NEPHOS)
+$(LIBSAIREDIS)_DEPENDS += $(NEPHOS_SAI) $(NEPHOS_SAI_DEV) $(LIBSAITHRIFT_DEV)
 
 # Runtime dependency on nephos sai is set only for syncd
 $(SYNCD)_RDEPENDS += $(NEPHOS_SAI)

platform/nephos/sai.mk

@@ -1,6 +1,6 @@
-SDK_VERSION = 2.0.7
-SAI_VERSION = 1.3.6
-SAI_COMMIT_ID = 2016d4
+SDK_VERSION = 3.0.0
+SAI_VERSION = 1.4.1
+SAI_COMMIT_ID = 3824ca
 NEPHOS_SAI = libsainps_$(SDK_VERSION)_sai_$(SAI_VERSION)_$(SAI_COMMIT_ID)_amd64.deb
 $(NEPHOS_SAI)_URL = "https://github.com/NephosInc/SONiC/raw/master/sai/libsainps_$(SDK_VERSION)_sai_$(SAI_VERSION)_$(SAI_COMMIT_ID)_amd64.deb"
 

platform/nephos/sdk.mk

@@ -1,6 +1,6 @@
-SDK_VERSION = 2.0.7
+SDK_VERSION = 3.0.0
 LINUX_VER = 4.9.0-9
-SDK_COMMIT_ID = 4ce00c
+SDK_COMMIT_ID = f0eac8
 NEPHOS_NPS_KERNEL = nps-modules-$(LINUX_VER)_$(SDK_VERSION)_$(SDK_COMMIT_ID)_amd64.deb
 $(NEPHOS_NPS_KERNEL)_URL = "https://github.com/NephosInc/SONiC/raw/master/sdk/nps-modules-$(LINUX_VER)_$(SDK_VERSION)_$(SDK_COMMIT_ID)_amd64.deb"