Skip to content

Commit

Permalink
*** temp: Don't build DOCKER_PTF_BRCM, LIBSAITHRIFT_DEV_BRCM, PYTHON_…
Browse files Browse the repository at this point in the history
…SAITHRIFT_BRCM
  • Loading branch information
qiluo-msft committed Jun 16, 2017
1 parent 4791f0f commit 26ce23d
Show file tree
Hide file tree
Showing 4 changed files with 5 additions and 7 deletions.
2 changes: 1 addition & 1 deletion platform/broadcom/docker-ptf-brcm.mk
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,4 @@ DOCKER_PTF_BRCM = docker-ptf-brcm.gz
$(DOCKER_PTF_BRCM)_PATH = $(DOCKERS_PATH)/docker-ptf-saithrift
$(DOCKER_PTF_BRCM)_DEPENDS += $(PYTHON_SAITHRIFT_BRCM)
$(DOCKER_PTF_BRCM)_LOAD_DOCKERS += $(DOCKER_PTF)
SONIC_DOCKER_IMAGES += $(DOCKER_PTF_BRCM)
#SONIC_DOCKER_IMAGES += $(DOCKER_PTF_BRCM)
2 changes: 1 addition & 1 deletion platform/broadcom/libsaithrift-dev.mk
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,4 @@ LIBSAITHRIFT_DEV_BRCM = libsaithrift-dev_0.9.4_amd64.deb
$(LIBSAITHRIFT_DEV_BRCM)_SRC_PATH = $(SRC_PATH)/SAI
$(LIBSAITHRIFT_DEV_BRCM)_DEPENDS += $(LIBTHRIFT) $(LIBTHRIFT_DEV) $(THRIFT_COMPILER) $(BRCM_SAI) $(BRCM_SAI_DEV)
$(LIBSAITHRIFT_DEV_BRCM)_RDEPENDS += $(LIBTHRIFT) $(BRCM_SAI)
SONIC_DPKG_DEBS += $(LIBSAITHRIFT_DEV_BRCM)
#SONIC_DPKG_DEBS += $(LIBSAITHRIFT_DEV_BRCM)
2 changes: 1 addition & 1 deletion platform/broadcom/python-saithrift.mk
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@
PYTHON_SAITHRIFT_BRCM = python-saithrift_0.9.4_amd64.deb
$(PYTHON_SAITHRIFT_BRCM)_SRC_PATH = $(SRC_PATH)/SAI
$(PYTHON_SAITHRIFT_BRCM)_DEPENDS += $(BRCM_SAI_DEV) $(THRIFT_COMPILER) $(PYTHON_THRIFT) $(LIBTHRIFT_DEV)
SONIC_DPKG_DEBS += $(PYTHON_SAITHRIFT_BRCM)
#SONIC_DPKG_DEBS += $(PYTHON_SAITHRIFT_BRCM)
6 changes: 2 additions & 4 deletions platform/broadcom/rules.mk
Original file line number Diff line number Diff line change
Expand Up @@ -22,12 +22,10 @@ $(DSSERVE)_URL = "https://sonicstorage.blob.core.windows.net/packages/20170518/d
SONIC_ONLINE_FILES += $(BCMCMD) $(DSSERVE)

SONIC_ALL += $(SONIC_ONE_IMAGE) $(SONIC_ONE_ABOOT_IMAGE) \
$(DOCKER_FPM) \
$(DOCKER_PTF_BRCM) \
$(DOCKER_SYNCD_BRCM_RPC)
$(DOCKER_FPM)

# Inject brcm sai into sairedis
$(LIBSAIREDIS)_DEPENDS += $(BRCM_OPENNSL) $(BRCM_SAI) $(BRCM_SAI_DEV) $(LIBSAITHRIFT_DEV_BRCM)
$(LIBSAIREDIS)_DEPENDS += $(BRCM_OPENNSL) $(BRCM_SAI) $(BRCM_SAI_DEV) #$(LIBSAITHRIFT_DEV_BRCM)

# Runtime dependency on brcm sai is set only for syncd
$(SYNCD)_RDEPENDS += $(BRCM_OPENNSL) $(BRCM_SAI)

0 comments on commit 26ce23d

Please sign in to comment.