Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[Submodule update]: Update sairedis to the latest version #1309

Closed
wants to merge 6 commits into from
Closed

[Submodule update]: Update sairedis to the latest version #1309

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
16c34a5
Fix build of libsaithrift for broadcom
pavel-shirshov Jan 10, 2018
acf3d05
Restore libsaithrift-dev building
pavel-shirshov Jan 10, 2018
4d338f6
Comment out libsaithrift library on cavium and marvell. Both of them …
pavel-shirshov Jan 11, 2018
160e9ca
Revert back unintentional acton changes
pavel-shirshov Jan 11, 2018
e9a91b7
Merge branch 'master' of https://github.com/Azure/sonic-buildimage in…
pavel-shirshov Jan 16, 2018
0ab34b8
Update sairedis
pavel-shirshov Jan 16, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion platform/cavium/rules.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ SONIC_ALL += $(SONIC_ONE_IMAGE) \
$(DOCKER_SYNCD_CAVM_RPC)

# Inject cavium sai into sairedis
$(LIBSAIREDIS)_DEPENDS += $(CAVM_SAI) $(CAVM_LIBSAI) $(LIBSAITHRIFT_DEV_CAVM)
$(LIBSAIREDIS)_DEPENDS += $(CAVM_SAI) $(CAVM_LIBSAI) #$(LIBSAITHRIFT_DEV_CAVM)

# Runtime dependency on cavium sai is set only for syncd
$(SYNCD)_RDEPENDS += $(CAVM_SAI)
2 changes: 1 addition & 1 deletion platform/marvell/rules.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ SONIC_ALL += $(SONIC_ONE_IMAGE) \
$(DOCKER_SYNCD_MRVL_RPC)

# Inject mrvl sai into sairedis
$(LIBSAIREDIS)_DEPENDS += $(MRVL_FPA) $(MRVL_SAI) $(LIBSAITHRIFT_DEV_MRVL)
$(LIBSAIREDIS)_DEPENDS += $(MRVL_FPA) $(MRVL_SAI) #$(LIBSAITHRIFT_DEV_MRVL)

# Runtime dependency on mrvl sai is set only for syncd
$(SYNCD)_RDEPENDS += $(MRVL_SAI)
2 changes: 1 addition & 1 deletion src/sonic-sairedis
Open in desktop
Submodule sonic-sairedis updated from 9364b7 to 36752e