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

Merge branch 'rel_7_0' into rel_7_0

Browse Source
This commit is contained in:
krambn 2018-02-08 09:23:59 -08:00 committed by GitHub
commit 8f8935103b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
platform/barefoot/bfn-sai.mk
View File

@ -1,7 +1,5 @@
BFN_SAI = bfnsdk_1.0.0_amd64.deb
#$(BFN_SAI)_URL = "https://github.com/barefootnetworks/sonic-release-pkgs/raw/rel_7_0/bfnsdk_1.0.0_amd64.deb"
$(BFN_SAI)_URL = "https://github.com/YaoTien/download/raw/master/sonic/sde/7_0_0_18/bfnsdk_1.0.0_amd64.deb"
# $(BFN_SAI_DEV)_URL = "https://www.dropbox.com/s/4ljk6hzw82rudsr/bfnsdk_1.0.0_amd64.deb?dl=0"
$(BFN_SAI)_URL = "https://github.com/barefootnetworks/sonic-release-pkgs/raw/rel_7_0/bfnsdk_1.0.0_amd64.deb"
SONIC_ONLINE_DEBS += $(BFN_SAI) # $(BFN_SAI_DEV)
$(BFN_SAI_DEV)_DEPENDS += $(BFN_SAI)

4
platform/barefoot/rules.mk
View File

@ -16,7 +16,7 @@ SONIC_ALL += $(SONIC_ONE_IMAGE) \
$(DOCKER_FPM)
# Inject sai into sairedis
$(LIBSAIREDIS)_DEPENDS += $(BFN_SAI) $(BFN_PLATFORM) $(WNC_OSW1800_PLATFORM)#$(LIBSAITHRIFT_DEV_BFN)
$(LIBSAIREDIS)_DEPENDS += $(BFN_SAI) $(WNC_OSW1800_PLATFORM) $(BFN_PLATFORM) #$(LIBSAITHRIFT_DEV_BFN)
# Runtime dependency on sai is set only for syncd
$(SYNCD)_RDEPENDS += $(BFN_SAI) $(BFN_PLATFORM) $(WNC_OSW1800_PLATFORM)
$(SYNCD)_RDEPENDS += $(BFN_SAI) $(WNC_OSW1800_PLATFORM) $(BFN_PLATFORM)

1
slave.mk
View File

@ -31,6 +31,7 @@ PROJECT_ROOT = $(shell pwd)
CONFIGURED_PLATFORM := $(shell [ -f .platform ] && cat .platform || echo generic)
PLATFORM_PATH = platform/$(CONFIGURED_PLATFORM)
export BUILD_NUMBER
export CONFIGURED_PLATFORM
###############################################################################
## Utility rules

2
src/sonic-sairedis

@ -1 +1 @@
Subproject commit 2da73f89ee857dc337d18cdc92ed2042623cbed2
Subproject commit fb55ef78e5ec624d54bebe5f60ccdea94e5940b0