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

[build]: fixed BFN target build (#2784)

Browse Source 
Signed-off-by: Andriy Kokhan <akokhan@barefootnetworks.com>
This commit is contained in:
Andriy Kokhan 2019-04-16 08:34:56 +03:00 committed by lguohan
parent 539d4ff6d5
commit d038fd228a
8 changed files with 39 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
platform/barefoot/bfn-platform.mk
View File

@ -1,5 +1,10 @@
BFN_PLATFORM = bfnplatform_master.df38274.deb ifdef BLDENV
$(BFN_PLATFORM)_URL = "https://github.com/barefootnetworks/sonic-release-pkgs/raw/vxlan_poc/bfnplatform_master.df38274.deb" BFN_PLATFORM = bfnplatform_master.92171a1_deb9.deb
$(BFN_PLATFORM)_URL = "https://github.com/barefootnetworks/sonic-release-pkgs/raw/sde-master/bfnplatform_master.92171a1_deb9.deb"
else
BFN_PLATFORM = bfnplatform_master.92171a1_deb8.deb
$(BFN_PLATFORM)_URL = "https://github.com/barefootnetworks/sonic-release-pkgs/raw/sde-master/bfnplatform_master.92171a1_deb8.deb"
endif
SONIC_ONLINE_DEBS += $(BFN_PLATFORM) # $(BFN_SAI_DEV) SONIC_ONLINE_DEBS += $(BFN_PLATFORM) # $(BFN_SAI_DEV)
$(BFN_SAI_DEV)_DEPENDS += $(BFN_PLATFORM) $(BFN_SAI_DEV)_DEPENDS += $(BFN_PLATFORM)

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

@ -1,5 +1,10 @@
BFN_SAI = bfnsdk_master.df38274.deb ifdef BLDENV
$(BFN_SAI)_URL = "https://github.com/barefootnetworks/sonic-release-pkgs/raw/vxlan_poc/bfnsdk_master.df38274.deb" BFN_SAI = bfnsdk_master.92171a1_deb9.deb
$(BFN_SAI)_URL = "https://github.com/barefootnetworks/sonic-release-pkgs/raw/sde-master/bfnsdk_master.92171a1_deb9.deb"
else
BFN_SAI = bfnsdk_master.92171a1_deb8.deb
$(BFN_SAI)_URL = "https://github.com/barefootnetworks/sonic-release-pkgs/raw/sde-master/bfnsdk_master.92171a1_deb8.deb"
endif
SONIC_ONLINE_DEBS += $(BFN_SAI) # $(BFN_SAI_DEV) SONIC_ONLINE_DEBS += $(BFN_SAI) # $(BFN_SAI_DEV)
$(BFN_SAI_DEV)_DEPENDS += $(BFN_SAI) $(BFN_SAI_DEV)_DEPENDS += $(BFN_SAI)

1
platform/barefoot/docker-syncd-bfn-rpc.mk
View File

@ -5,6 +5,7 @@ $(DOCKER_SYNCD_BFN_RPC)_PATH = $(PLATFORM_PATH)/docker-syncd-bfn-rpc
$(DOCKER_SYNCD_BFN_RPC)_DEPENDS += $(SYNCD_RPC) $(LIBTHRIFT) $(DOCKER_SYNCD_BFN_RPC)_DEPENDS += $(SYNCD_RPC) $(LIBTHRIFT)
$(DOCKER_SYNCD_BFN_RPC)_LOAD_DOCKERS += $(DOCKER_SYNCD_BFN) $(DOCKER_SYNCD_BFN_RPC)_LOAD_DOCKERS += $(DOCKER_SYNCD_BFN)
SONIC_DOCKER_IMAGES += $(DOCKER_SYNCD_BFN_RPC) SONIC_DOCKER_IMAGES += $(DOCKER_SYNCD_BFN_RPC)
SONIC_STRETCH_DOCKERS += $(DOCKER_SYNCD_BFN_RPC)
ifeq ($(ENABLE_SYNCD_RPC),y) ifeq ($(ENABLE_SYNCD_RPC),y)
SONIC_INSTALL_DOCKER_IMAGES += $(DOCKER_SYNCD_BFN_RPC) SONIC_INSTALL_DOCKER_IMAGES += $(DOCKER_SYNCD_BFN_RPC)
endif endif

3
platform/barefoot/docker-syncd-bfn.mk
View File

@ -3,8 +3,9 @@
DOCKER_SYNCD_BFN = docker-syncd-bfn.gz DOCKER_SYNCD_BFN = docker-syncd-bfn.gz
$(DOCKER_SYNCD_BFN)_PATH = $(PLATFORM_PATH)/docker-syncd-bfn $(DOCKER_SYNCD_BFN)_PATH = $(PLATFORM_PATH)/docker-syncd-bfn
$(DOCKER_SYNCD_BFN)_DEPENDS += $(SYNCD) $(DOCKER_SYNCD_BFN)_DEPENDS += $(SYNCD)
$(DOCKER_SYNCD_BFN)_LOAD_DOCKERS += $(DOCKER_CONFIG_ENGINE) $(DOCKER_SYNCD_BFN)_LOAD_DOCKERS += $(DOCKER_CONFIG_ENGINE_STRETCH)
SONIC_DOCKER_IMAGES += $(DOCKER_SYNCD_BFN) SONIC_DOCKER_IMAGES += $(DOCKER_SYNCD_BFN)
SONIC_STRETCH_DOCKERS += $(DOCKER_SYNCD_BFN)
ifneq ($(ENABLE_SYNCD_RPC),y) ifneq ($(ENABLE_SYNCD_RPC),y)
SONIC_INSTALL_DOCKER_IMAGES += $(DOCKER_SYNCD_BFN) SONIC_INSTALL_DOCKER_IMAGES += $(DOCKER_SYNCD_BFN)
endif endif

13
platform/barefoot/docker-syncd-bfn/Dockerfile.j2
View File

@ -1,4 +1,4 @@
FROM docker-config-engine FROM docker-config-engine-stretch
## Make apt-get non-interactive ## Make apt-get non-interactive
ENV DEBIAN_FRONTEND=noninteractive ENV DEBIAN_FRONTEND=noninteractive
@ -11,7 +11,16 @@ debs/{{ deb }}{{' '}}
{%- endfor -%} {%- endfor -%}
debs/ debs/
RUN apt-get install -y libxml2 libpcap-dev libusb-1.0-0-dev libcurl3 libcurl4-gnutls-dev libunwind8-dev libpython3.4 RUN apt-get install -y \
libxml2 \
libpcap-dev \
libusb-1.0-0-dev \
libcurl3 \
libcurl4-gnutls-dev \
libunwind8-dev \
libpython3.4 \
libc-ares2 \
libgoogle-perftools4
RUN dpkg -i \ RUN dpkg -i \
{% for deb in docker_syncd_bfn_debs.split(' ') -%} {% for deb in docker_syncd_bfn_debs.split(' ') -%}

4
platform/barefoot/rules.mk
View File

@ -12,8 +12,8 @@ include $(PLATFORM_PATH)/one-image.mk
include $(PLATFORM_PATH)/libsaithrift-dev.mk include $(PLATFORM_PATH)/libsaithrift-dev.mk
include $(PLATFORM_PATH)/docker-ptf-bfn.mk include $(PLATFORM_PATH)/docker-ptf-bfn.mk
include $(PLATFORM_PATH)/bfn-platform.mk include $(PLATFORM_PATH)/bfn-platform.mk
include $(PLATFORM_PATH)/bfn-platform-wnc.mk #include $(PLATFORM_PATH)/bfn-platform-wnc.mk
include $(PLATFORM_PATH)/bfn-platform-ingrasys.mk #include $(PLATFORM_PATH)/bfn-platform-ingrasys.mk
include $(PLATFORM_PATH)/bfn-modules.mk include $(PLATFORM_PATH)/bfn-modules.mk
SONIC_ALL += $(SONIC_ONE_IMAGE) $(SONIC_ONE_ABOOT) \ SONIC_ALL += $(SONIC_ONE_IMAGE) $(SONIC_ONE_ABOOT) \

7
sonic-slave-stretch/Dockerfile
View File

@ -114,6 +114,13 @@ RUN apt-get update && apt-get install -y \
# For mellanox sai build # For mellanox sai build
libtool-bin \ libtool-bin \
libxml2-dev \ libxml2-dev \
# For BFN sdk build
libusb-1.0-0-dev \
libcurl3-nss-dev \
libunwind8-dev \
telnet \
libc-ares2 \
libgoogle-perftools4 \
# For build image # For build image
cpio \ cpio \
squashfs-tools \ squashfs-tools \

2
sonic-slave/Dockerfile
View File

@ -124,6 +124,8 @@ RUN apt-get update && apt-get install -y \
libcurl3-nss-dev \ libcurl3-nss-dev \
libunwind8-dev \ libunwind8-dev \
telnet \ telnet \
libc-ares2 \
libgoogle-perftools4 \
# For build image # For build image
cpio \ cpio \
squashfs-tools \ squashfs-tools \