Added rules to build syncd and orchagent containers for Cavium target #152
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,12 @@ | ||
| # Cavium SAI | ||
|
|
||
| CAVM_LIBSAI = libsai.deb | ||
| $(CAVM_LIBSAI)_PATH = $(PLATFORM_PATH)/cavm_sdk | ||
| CAVM_SAI = sai.deb | ||
| $(CAVM_SAI)_PATH = $(PLATFORM_PATH)/cavm_sdk | ||
| XP_TOOLS = xp-tools.deb | ||
| $(XP_TOOLS)_PATH = $(PLATFORM_PATH)/cavm_sdk | ||
| XPSHELL = xpshell.deb | ||
| $(XPSHELL)_PATH = $(PLATFORM_PATH)/cavm_sdk | ||
|
|
||
| SONIC_COPY_DEBS += $(CAVM_LIBSAI) $(CAVM_SAI) $(XP_TOOLS) $(XPSHELL) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,7 @@ | ||
| ## Get vendor SAI SDK | ||
| ## https://github.com/Azure/sonic-buildimage/blob/master/README.md#3-get-vendor-sai-sdk | ||
|
|
||
| libsai.deb | ||
| sai.deb | ||
| xp-tools.deb | ||
| xpshell.deb |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,7 @@ | ||
| # docker image for orchagent | ||
|
|
||
| DOCKER_ORCHAGENT_CAVM = docker-orchagent-cavm.gz | ||
| $(DOCKER_ORCHAGENT_CAVM)_PATH = $(DOCKERS_PATH)/docker-orchagent | ||
| $(DOCKER_ORCHAGENT_CAVM)_DEPENDS += $(SWSS) $(REDIS_TOOLS) | ||
| $(DOCKER_ORCHAGENT_CAVM)_LOAD_DOCKERS += $(DOCKER_BASE) | ||
| SONIC_DOCKER_IMAGES += $(DOCKER_ORCHAGENT_CAVM) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,7 @@ | ||
| # docker image for cavium syncd | ||
|
|
||
| DOCKER_SYNCD_CAVM = docker-syncd-cavm.gz | ||
| $(DOCKER_SYNCD_CAVM)_PATH = $(PLATFORM_PATH)/docker-syncd-cavm | ||
| $(DOCKER_SYNCD_CAVM)_DEPENDS += $(SYNCD) $(CAVM_LIBSAI) $(XP_TOOLS) $(XPSHELL) $(REDIS_TOOLS) | ||
| $(DOCKER_SYNCD_CAVM)_LOAD_DOCKERS += $(DOCKER_BASE) | ||
| SONIC_DOCKER_IMAGES += $(DOCKER_SYNCD_CAVM) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,18 @@ | ||
| FROM docker-base | ||
|
|
||
| RUN apt-get update | ||
|
|
||
| COPY deps /deps | ||
|
|
||
| RUN apt-get -y install libpcap-dev libxml2-dev python-dev swig libsensors4-dev | ||
|
|
||
| SED_DPKG | ||
|
|
||
| COPY ["start.sh", "/usr/bin/"] | ||
|
|
||
| ## Clean up | ||
| RUN apt-get clean -y; apt-get autoclean -y; apt-get autoremove -y | ||
| RUN rm -rf /deps | ||
|
|
||
| ENTRYPOINT ["/bin/bash"] | ||
| CMD ["/usr/bin/start.sh"] | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,23 @@ | ||
| #!/bin/bash | ||
|
|
||
| export XP_ROOT=/usr/bin/ | ||
|
|
||
| service rsyslog start | ||
|
|
||
| while true; do | ||
|
|
||
| # Check if redis-server starts | ||
|
|
||
| result=$(redis-cli ping) | ||
|
|
||
| if [ "$result" == "PONG" ]; then | ||
|
|
||
| redis-cli FLUSHALL | ||
| syncd -p /etc/ssw/AS7512/profile.ini -N | ||
| break | ||
|
|
||
| fi | ||
|
|
||
| sleep 1 | ||
|
|
||
| done |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,23 +1,15 @@ | ||
| include $(PLATFORM_GENERIC_PATH)/rules.mk | ||
|
|
||
| include $(PLATFORM_PATH)/cavm-sai.mk | ||
| include $(PLATFORM_PATH)/docker-syncd-cavm.mk | ||
| include $(PLATFORM_PATH)/docker-orchagent-cavm.mk | ||
|
|
||
| SONIC_ALL += $(DOCKER_SYNCD_CAVM) \ | ||
| $(DOCKER_ORCHAGENT_CAVM) | ||
|
There was a problem hiding this comment. You'll also need this line for building common dockers There was a problem hiding this comment. Hmm, why do I need to replicate "$(DOCKER_SYNCD_CAVM)_DEPENDS" here? There was a problem hiding this comment. You need this one There was a problem hiding this comment. Ooh There was a problem hiding this comment. Thanks for your review There was a problem hiding this comment. This line was added in last commit |
||
|
|
||
| # Inject cavium sai into sairedis | ||
| $(LIBSAIREDIS)_DEPENDS += $(CAVM_SAI) $(CAVM_LIBSAI) | ||
|
|
||
| # Runtime dependency on cavium sai is set only for syncd | ||
| $(SYNCD)_RDEPENDS += $(CAVM_SAI) | ||
|
|
||
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
SED_DPKG is superceded by jinj2 template in commit 66aebb3