Skip to content

Commit b3804ad

Browse files
qiluo-msftqiluo-msft
committed
Squash merge v1.0.3 branch onto master
1 parent 847a948 commit b3804ad

19 files changed

+43
-59
lines changed

‎dockers/docker-orchagent/start.sh

-11
Original file line numberDiff line numberDiff line change
@@ -11,17 +11,6 @@ rm -f /var/run/rsyslogd.pid
1111

1212
supervisorctl start rsyslogd
1313

14-
# Wait for syncd to start
15-
while true; do
16-
RESULT=$(echo -en "SELECT 1\nHLEN HIDDEN" | redis-cli | sed -n 2p)
17-
18-
if [ "$RESULT" != "0" ]; then
19-
break
20-
fi
21-
22-
sleep 1
23-
done
24-
2514
supervisorctl start orchagent
2615

2716
supervisorctl start portsyncd

‎dockers/docker-orchagent/swssconfig.sh

+12-11
Original file line numberDiff line numberDiff line change
@@ -40,17 +40,18 @@ HWSKU=`sonic-cfggen -m /etc/sonic/minigraph.xml -v minigraph_hwsku`
4040

4141
SWSSCONFIG_ARGS="00-copp.config.json ipinip.json mirror.json "
4242

43-
if [ "$HWSKU" == "Force10-S6000" ]; then
44-
SWSSCONFIG_ARGS+="td2.32ports.buffers.json td2.32ports.qos.json "
45-
elif [ "$HWSKU" == "Force10-S6000-Q32" ]; then
46-
SWSSCONFIG_ARGS+="td2.32ports.buffers.json td2.32ports.qos.json "
47-
elif [ "$HWSKU" == "Arista-7050-QX32" ]; then
48-
SWSSCONFIG_ARGS+="td2.32ports.buffers.json td2.32ports.qos.json "
49-
elif [ "$HWSKU" == "ACS-MSN2700" ]; then
50-
SWSSCONFIG_ARGS+="msn2700.32ports.buffers.json msn2700.32ports.qos.json "
51-
elif [ "$HWSKU" == "ACS-MSN2740" ]; then
52-
SWSSCONFIG_ARGS+="msn2740.32ports.buffers.json msn2740.32ports.qos.json "
53-
fi
43+
# FIXME: Temporarily disable QOS/buffer configurations for further debugging
44+
# if [ "$HWSKU" == "Force10-S6000" ]; then
45+
# SWSSCONFIG_ARGS+="td2.32ports.buffers.json td2.32ports.qos.json "
46+
# elif [ "$HWSKU" == "Force10-S6000-Q32" ]; then
47+
# SWSSCONFIG_ARGS+="td2.32ports.buffers.json td2.32ports.qos.json "
48+
# elif [ "$HWSKU" == "Arista-7050-QX32" ]; then
49+
# SWSSCONFIG_ARGS+="td2.32ports.buffers.json td2.32ports.qos.json "
50+
# elif [ "$HWSKU" == "ACS-MSN2700" ]; then
51+
# SWSSCONFIG_ARGS+="msn2700.32ports.buffers.json msn2700.32ports.qos.json "
52+
# elif [ "$HWSKU" == "ACS-MSN2740" ]; then
53+
# SWSSCONFIG_ARGS+="msn2740.32ports.buffers.json msn2740.32ports.qos.json "
54+
# fi
5455

5556
for file in $SWSSCONFIG_ARGS; do
5657
swssconfig /etc/swss/config.d/$file

‎platform/broadcom/docker-ptf-brcm.mk

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,4 @@ DOCKER_PTF_BRCM = docker-ptf-brcm.gz
44
$(DOCKER_PTF_BRCM)_PATH = $(DOCKERS_PATH)/docker-ptf-saithrift
55
$(DOCKER_PTF_BRCM)_DEPENDS += $(PYTHON_SAITHRIFT_BRCM)
66
$(DOCKER_PTF_BRCM)_LOAD_DOCKERS += $(DOCKER_PTF)
7-
SONIC_DOCKER_IMAGES += $(DOCKER_PTF_BRCM)
7+
#SONIC_DOCKER_IMAGES += $(DOCKER_PTF_BRCM)

‎platform/broadcom/libsaithrift-dev.mk

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,4 @@ LIBSAITHRIFT_DEV_BRCM = libsaithrift-dev_0.9.4_amd64.deb
44
$(LIBSAITHRIFT_DEV_BRCM)_SRC_PATH = $(SRC_PATH)/SAI
55
$(LIBSAITHRIFT_DEV_BRCM)_DEPENDS += $(LIBTHRIFT) $(LIBTHRIFT_DEV) $(THRIFT_COMPILER) $(BRCM_SAI) $(BRCM_SAI_DEV)
66
$(LIBSAITHRIFT_DEV_BRCM)_RDEPENDS += $(LIBTHRIFT) $(BRCM_SAI)
7-
SONIC_DPKG_DEBS += $(LIBSAITHRIFT_DEV_BRCM)
7+
#SONIC_DPKG_DEBS += $(LIBSAITHRIFT_DEV_BRCM)

‎platform/broadcom/python-saithrift.mk

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,4 @@
33
PYTHON_SAITHRIFT_BRCM = python-saithrift_0.9.4_amd64.deb
44
$(PYTHON_SAITHRIFT_BRCM)_SRC_PATH = $(SRC_PATH)/SAI
55
$(PYTHON_SAITHRIFT_BRCM)_DEPENDS += $(BRCM_SAI_DEV) $(THRIFT_COMPILER) $(PYTHON_THRIFT) $(LIBTHRIFT_DEV)
6-
SONIC_DPKG_DEBS += $(PYTHON_SAITHRIFT_BRCM)
6+
#SONIC_DPKG_DEBS += $(PYTHON_SAITHRIFT_BRCM)

‎platform/broadcom/rules.mk

+2-4
Original file line numberDiff line numberDiff line change
@@ -25,12 +25,10 @@ $(DSSERVE)_URL = "https://sonicstorage.blob.core.windows.net/packages/20170518/d
2525
SONIC_ONLINE_FILES += $(BCMCMD) $(DSSERVE)
2626

2727
SONIC_ALL += $(SONIC_ONE_IMAGE) $(SONIC_ONE_ABOOT_IMAGE) \
28-
$(DOCKER_FPM) \
29-
$(DOCKER_PTF_BRCM) \
30-
$(DOCKER_SYNCD_BRCM_RPC)
28+
$(DOCKER_FPM)
3129

3230
# Inject brcm sai into sairedis
33-
$(LIBSAIREDIS)_DEPENDS += $(BRCM_OPENNSL) $(BRCM_SAI) $(BRCM_SAI_DEV) $(LIBSAITHRIFT_DEV_BRCM)
31+
$(LIBSAIREDIS)_DEPENDS += $(BRCM_OPENNSL) $(BRCM_SAI) $(BRCM_SAI_DEV) #$(LIBSAITHRIFT_DEV_BRCM)
3432

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

‎platform/broadcom/sai.mk

+6-4
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,11 @@
1-
BRCM_SAI = libsaibcm_2.1.5.1-16-20170712202323.49_amd64.deb
2-
$(BRCM_SAI)_URL = "https://sonicstorage.blob.core.windows.net/packages/libsaibcm_2.1.5.1-16-20170712202323.49_amd64.deb?sv=2015-04-05&sr=b&sig=jsPXiAoSyKqZ1SmiyeEj73W8tRlri8ysExnWvc%2BWSi4%3D&se=2031-03-21T22%3A49%3A32Z&sp=r"
1+
BRCM_SAI = libsaibcm_3.0.2.2_amd64.deb
2+
# TODO: upload new SAI build to blob
3+
$(BRCM_SAI)_URL = "https://sonicstorage.blob.core.windows.net/packages/libsaibcm_3.0.2.2_amd64.deb"
34

4-
BRCM_SAI_DEV = libsaibcm-dev_2.1.5.1-16-20170712202323.49_amd64.deb
5+
BRCM_SAI_DEV = libsaibcm-dev_3.0.2.2_amd64.deb
56
$(eval $(call add_derived_package,$(BRCM_SAI),$(BRCM_SAI_DEV)))
6-
$(BRCM_SAI_DEV)_URL = "https://sonicstorage.blob.core.windows.net/packages/libsaibcm-dev_2.1.5.1-16-20170712202323.49_amd64.deb?sv=2015-04-05&sr=b&sig=azYZkCi%2FFGS4eELKhIozOok3qimfH%2FjdXlz%2BS2MRBco%3D&se=2031-03-21T22%3A49%3A57Z&sp=r"
7+
# TODO: upload new SAI build to blob
8+
$(BRCM_SAI_DEV)_URL = "https://sonicstorage.blob.core.windows.net/packages/libsaibcm-dev_3.0.2.2_amd64.deb"
79

810
SONIC_ONLINE_DEBS += $(BRCM_SAI) $(BRCM_SAI_DEV)
911
$(BRCM_SAI)_DEPENDS += $(BRCM_OPENNSL)

‎platform/broadcom/sdk.mk

+6-4
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
1-
BRCM_OPENNSL = libopennsl_3.2.2.2-10-20170707181826.44_amd64.deb
2-
$(BRCM_OPENNSL)_URL = "https://sonicstorage.blob.core.windows.net/packages/libopennsl_3.2.2.2-10-20170707181826.44_amd64.deb?sv=2015-04-05&sr=b&sig=hc4PbMQvfOu7p7E0MR1kn0OA6vu%2BPIdYOLeDU9hPJMY%3D&se=2031-03-19T21%3A20%3A15Z&sp=r"
1+
BRCM_OPENNSL = libopennsl_3.2.3.1_amd64.deb
2+
# TODO: upload new SDK build to blob
3+
$(BRCM_OPENNSL)_URL = "https://sonicstorage.blob.core.windows.net/packages/libopennsl_3.2.3.1+0~20170605184634.7~1.gbp4a0717_amd64.deb"
34

4-
BRCM_OPENNSL_KERNEL = opennsl-modules-3.16.0-4-amd64_3.2.2.2-10-20170707181826.44_amd64.deb
5-
$(BRCM_OPENNSL_KERNEL)_URL = "https://sonicstorage.blob.core.windows.net/packages/opennsl-modules-3.16.0-4-amd64_3.2.2.2-10-20170707181826.44_amd64.deb?sv=2015-04-05&sr=b&sig=xtGLlxX5SspadCxaObMGGVMQliPGrTkuN0T6A4wLETA%3D&se=2031-03-19T21%3A21%3A43Z&sp=r"
5+
BRCM_OPENNSL_KERNEL = opennsl-modules-3.16.0-4-amd64_3.2.3.1_amd64.deb
6+
# TODO: upload new SDK build to blob
7+
$(BRCM_OPENNSL_KERNEL)_URL = "https://sonicstorage.blob.core.windows.net/packages/opennsl-modules-3.16.0-4-amd64_3.2.3.1+0~20170605184634.7~1.gbp4a0717_amd64.deb"
68

79
SONIC_ONLINE_DEBS += $(BRCM_OPENNSL) $(BRCM_OPENNSL_KERNEL)

‎platform/mellanox/docker-ptf-mlnx.mk

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,4 @@ DOCKER_PTF_MLNX = docker-ptf-mlnx.gz
44
$(DOCKER_PTF_MLNX)_PATH = $(DOCKERS_PATH)/docker-ptf-saithrift
55
$(DOCKER_PTF_MLNX)_DEPENDS += $(PYTHON_SAITHRIFT_MLNX)
66
$(DOCKER_PTF_MLNX)_LOAD_DOCKERS += $(DOCKER_PTF)
7-
SONIC_DOCKER_IMAGES += $(DOCKER_PTF_MLNX)
7+
#SONIC_DOCKER_IMAGES += $(DOCKER_PTF_MLNX)

‎platform/mellanox/fw.mk

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# mellanox firmware
22

3-
MLNX_FW = fw-SPC-rel-13_1224_0140-EVB.mfa
3+
MLNX_FW = fw-SPC-rel-13_1400_0126-EVB.mfa
44
$(MLNX_FW)_URL = $(MLNX_SDK_BASE_URL)/$(MLNX_FW)
55
SONIC_ONLINE_FILES += $(MLNX_FW)
66

‎platform/mellanox/libsaithrift-dev.mk

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,4 @@ LIBSAITHRIFT_DEV_MLNX = libsaithrift-dev_0.9.4_amd64.deb
44
$(LIBSAITHRIFT_DEV_MLNX)_SRC_PATH = $(SRC_PATH)/SAI
55
$(LIBSAITHRIFT_DEV_MLNX)_DEPENDS += $(LIBTHRIFT) $(LIBTHRIFT_DEV) $(THRIFT_COMPILER) $(MLNX_SAI) $(MLNX_SAI_DEV)
66
$(LIBSAITHRIFT_DEV_MLNX)_RDEPENDS += $(LIBTHRIFT) $(MLNX_SAI)
7-
SONIC_DPKG_DEBS += $(LIBSAITHRIFT_DEV_MLNX)
7+
#SONIC_DPKG_DEBS += $(LIBSAITHRIFT_DEV_MLNX)

‎platform/mellanox/mlnx-sai.mk

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# Mellanox SAI
22

3-
MLNX_SAI_VERSION = 161120
4-
MLNX_SAI_REVISION = ba3ccd6de8e5b82fa2cdfc30f9b8b1f1882bfede
3+
MLNX_SAI_VERSION = SAIRel1.8.2-master
4+
MLNX_SAI_REVISION = 6b094746adc7ef2321701b4868806bc54a95bbd1
55

66
export MLNX_SAI_VERSION MLNX_SAI_REVISION
77

‎platform/mellanox/python-saithrift.mk

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,4 @@
33
PYTHON_SAITHRIFT_MLNX = python-saithrift_0.9.4_amd64.deb
44
$(PYTHON_SAITHRIFT_MLNX)_SRC_PATH = $(SRC_PATH)/SAI
55
$(PYTHON_SAITHRIFT_MLNX)_DEPENDS += $(MLNX_SAI_DEV) $(MLNX_SAI) $(THRIFT_COMPILER) $(PYTHON_THRIFT) $(LIBTHRIFT_DEV)
6-
SONIC_DPKG_DEBS += $(PYTHON_SAITHRIFT_MLNX)
6+
#SONIC_DPKG_DEBS += $(PYTHON_SAITHRIFT_MLNX)

‎platform/mellanox/rules.mk

+2-4
Original file line numberDiff line numberDiff line change
@@ -12,12 +12,10 @@ include $(PLATFORM_PATH)/python-saithrift.mk
1212
include $(PLATFORM_PATH)/docker-ptf-mlnx.mk
1313

1414
SONIC_ALL += $(SONIC_ONE_IMAGE) \
15-
$(DOCKER_FPM) \
16-
$(DOCKER_PTF_MLNX) \
17-
$(DOCKER_SYNCD_MLNX_RPC)
15+
$(DOCKER_FPM)
1816

1917
# Inject mlnx sai into sairedis
20-
$(LIBSAIREDIS)_DEPENDS += $(MLNX_SAI) $(LIBSAITHRIFT_DEV_MLNX)
18+
$(LIBSAIREDIS)_DEPENDS += $(MLNX_SAI) #$(LIBSAITHRIFT_DEV_MLNX)
2119

2220
# Runtime dependency on mlnx sai is set only for syncd
2321
$(SYNCD)_RDEPENDS += $(MLNX_SAI)

‎platform/mellanox/sdk.mk

+2-8
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
MLNX_SDK_BASE_URL = https://github.com/Mellanox/SAI-Implementation/raw/ba3ccd6de8e5b82fa2cdfc30f9b8b1f1882bfede/sdk
2-
MLNX_SDK_VERSION = 4.2.3130
1+
MLNX_SDK_BASE_URL = https://github.com/Mellanox/SAI-Implementation/raw/sonicv1.0.2/sdk
2+
MLNX_SDK_VERSION = 4.2.5008
33
MLNX_SDK_RDEBS += $(APPLIBS) $(IPROUTE2) $(SX_ACL_RM) $(SX_COMPLIB) \
44
$(SX_EXAMPLES) $(SX_GEN_UTILS) $(SX_SCEW) $(SX_SDN_HAL) \
55
$(SXD_LIBS) $(TESTX)
@@ -20,8 +20,6 @@ $(eval $(call add_derived_package,$(IPROUTE2),$(IPROUTE2_DEV)))
2020
SX_COMPLIB = sx-complib_1.mlnx.$(MLNX_SDK_VERSION)_amd64.deb
2121
SX_COMPLIB_DEV = sx-complib-dev_1.mlnx.$(MLNX_SDK_VERSION)_amd64.deb
2222
$(eval $(call add_derived_package,$(SX_COMPLIB),$(SX_COMPLIB_DEV)))
23-
SX_COMPLIB_DEV_STATIC = sx-complib-dev-static_1.mlnx.$(MLNX_SDK_VERSION)_amd64.deb
24-
$(eval $(call add_derived_package,$(SX_COMPLIB),$(SX_COMPLIB_DEV_STATIC)))
2523
SX_EXAMPLES = sx-examples_1.mlnx.$(MLNX_SDK_VERSION)_amd64.deb
2624
$(SX_EXAMPLES)_DEPENDS += $(APPLIBS) $(SX_SCEW) $(SXD_LIBS)
2725
SX_EXAMPLES_DEV = sx-examples-dev_1.mlnx.$(MLNX_SDK_VERSION)_amd64.deb
@@ -33,13 +31,9 @@ $(eval $(call add_derived_package,$(SX_GEN_UTILS),$(SX_GEN_UTILS_DEV)))
3331
SX_SCEW = sx-scew_1.mlnx.$(MLNX_SDK_VERSION)_amd64.deb
3432
SX_SCEW_DEV = sx-scew-dev_1.mlnx.$(MLNX_SDK_VERSION)_amd64.deb
3533
$(eval $(call add_derived_package,$(SX_SCEW),$(SX_SCEW_DEV)))
36-
SX_SCEW_DEV_STATIC = sx-scew-dev-static_1.mlnx.$(MLNX_SDK_VERSION)_amd64.deb
37-
$(eval $(call add_derived_package,$(SX_SCEW),$(SX_SCEW_DEV_STATIC)))
3834
SXD_LIBS = sxd-libs_1.mlnx.$(MLNX_SDK_VERSION)_amd64.deb
3935
SXD_LIBS_DEV = sxd-libs-dev_1.mlnx.$(MLNX_SDK_VERSION)_amd64.deb
4036
$(eval $(call add_derived_package,$(SXD_LIBS),$(SXD_LIBS_DEV)))
41-
SXD_LIBS_DEV_STATIC = sxd-libs-dev-static_1.mlnx.$(MLNX_SDK_VERSION)_amd64.deb
42-
$(eval $(call add_derived_package,$(SXD_LIBS),$(SXD_LIBS_DEV_STATIC)))
4337
#packages that are required for runtime only
4438
PYTHON_SDK_API = python-sdk-api_1.mlnx.$(MLNX_SDK_VERSION)_amd64.deb
4539
$(PYTHON_SDK_API)_DEPENDS += $(APPLIBS) $(SXD_LIBS)

‎src/sonic-quagga

‎src/sonic-sairedis

‎src/sonic-swss

‎src/sonic-swss-common

0 commit comments

Comments
 (0)