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

[nephos]: upgrade Nephos SAI version to c749df (#4814)

Browse Source 
Verified with Nephos nps8365 based platform Accton AS7116-54x.
This commit is contained in:
gracelicd 2020-07-08 21:55:57 +08:00 committed by GitHub
parent 43bb028ed6
commit 3f05e4a15e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
platform/nephos/rules.mk
View File

@ -23,7 +23,7 @@ SONIC_ONLINE_FILES += $(NPX_DIAG) $(WARM_VERIFIER) $(DSSERVE)
SONIC_ALL += $(SONIC_ONE_IMAGE) $(DOCKER_FPM) SONIC_ALL += $(SONIC_ONE_IMAGE) $(DOCKER_FPM)
# Inject nephos sai into sairedis # Inject nephos sai into sairedis
$(LIBSAIREDIS)_DEPENDS += $(NEPHOS_SAI) $(NEPHOS_SAI_DEV) $(LIBSAIREDIS)_DEPENDS += $(NEPHOS_SAI)
ifeq ($(ENABLE_SYNCD_RPC),y) ifeq ($(ENABLE_SYNCD_RPC),y)
$(LIBSAIREDIS)_DEPENDS += $(LIBSAITHRIFT_DEV) $(LIBSAIREDIS)_DEPENDS += $(LIBSAITHRIFT_DEV)
endif endif

15
platform/nephos/sai.mk
View File

@ -1,6 +1,6 @@
SDK_VERSION = 3.0.0 SDK_VERSION = 3.0.0
SAI_VERSION = 1.5.0 SAI_VERSION = 1.5.1
SAI_COMMIT_ID = 06a67d SAI_COMMIT_ID = c749df
# Place here URL where SAI deb exist # Place here URL where SAI deb exist
NEPHOS_SAI_DEB_LOCAL_URL = NEPHOS_SAI_DEB_LOCAL_URL =
@ -19,17 +19,10 @@ else
$(NEPHOS_SAI)_URL = "https://github.com/NephosInc/SONiC/raw/master/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"
endif endif
NEPHOS_SAI_DEV = libsainps-dev_$(SDK_VERSION)_sai_$(SAI_VERSION)_$(SAI_COMMIT_ID)_amd64.deb
$(eval $(call add_derived_package,$(NEPHOS_SAI),$(NEPHOS_SAI_DEV)))
ifeq ($(SAI_FROM_LOCAL), y)
$(NEPHOS_SAI_DEV)_PATH = $(NEPHOS_SAI_DEB_LOCAL_URL)
else
$(NEPHOS_SAI_DEV)_URL = "https://github.com/NephosInc/SONiC/raw/master/sai/libsainps-dev_$(SDK_VERSION)_sai_$(SAI_VERSION)_$(SAI_COMMIT_ID)_amd64.deb"
endif
ifeq ($(SAI_FROM_LOCAL), y) ifeq ($(SAI_FROM_LOCAL), y)
SONIC_COPY_DEBS += $(NEPHOS_SAI) $(NEPHOS_SAI_DEV) SONIC_COPY_DEBS += $(NEPHOS_SAI)
else else
SONIC_ONLINE_DEBS += $(NEPHOS_SAI) $(NEPHOS_SAI_DEV) SONIC_ONLINE_DEBS += $(NEPHOS_SAI)
endif endif
$(NEPHOS_SAI_DEV)_DEPENDS += $(NEPHOS_SAI) $(NEPHOS_SAI_DEV)_DEPENDS += $(NEPHOS_SAI)