Skip to content

Commit

Permalink
Merge branch 'master' into bfn-paltform-api2.0-support
Browse files Browse the repository at this point in the history
  • Loading branch information
vboykox authored Sep 23, 2020
2 parents b87aac6 + a6a10f0 commit 9d05a27
Show file tree
Hide file tree
Showing 421 changed files with 11,280 additions and 2,932 deletions.
12 changes: 1 addition & 11 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
.arch
.platform
.screen
rules/config.user

# Build artifacts
fsroot/
Expand All @@ -28,17 +29,6 @@ platform/*/docker-*/Dockerfile
# Installer-related files and directories
installer/x86_64/platforms/

# Config engine
src/sonic-config-engine/**/*.pyc
src/sonic-config-engine/build
src/sonic-config-engine/sonic_config_engine.egg-info

src/sonic-py-common/**/*.pyc
src/sonic-py-common/.eggs/
src/sonic-py-common/build
src/sonic-py-common/dist
src/sonic-py-common/sonic_py_common.egg-info

# Misc. files
asic_config_checksum
files/Aboot/boot0
Expand Down
2 changes: 2 additions & 0 deletions Makefile.cache
Original file line number Diff line number Diff line change
Expand Up @@ -89,11 +89,13 @@ endif
-include $(PLATFORM_PATH)/rules.dep
endif

ifndef SONIC_BUILD_QUIETER
$(info "SONIC_DPKG_CACHE_METHOD" : "$(SONIC_DPKG_CACHE_METHOD)")
ifneq ($(SONIC_DPKG_CACHE_METHOD),none)
$(info "DPKG_CACHE_PATH" : "$(SONIC_DPKG_CACHE_SOURCE)")
endif
$(info )
endif


###############################################################################
Expand Down
8 changes: 7 additions & 1 deletion Makefile.work
Original file line number Diff line number Diff line change
Expand Up @@ -115,14 +115,19 @@ DOCKER_RUN := docker run --rm=true --privileged --init \
-w $(DOCKER_BUILDER_WORKDIR) \
-e "http_proxy=$(http_proxy)" \
-e "https_proxy=$(https_proxy)" \
-i$(if $(TERM),t,)
-i$(if $(TERM),t,) \
$(SONIC_BUILDER_EXTRA_CMDLINE)

include rules/config

ifneq ($(DOCKER_BUILDER_USER_MOUNT),)
DOCKER_RUN += $(foreach mount,$(subst $(comma), ,$(DOCKER_BUILDER_USER_MOUNT)), $(addprefix -v , $(mount)))
endif

ifdef SONIC_BUILD_QUIETER
DOCKER_RUN += -e "SONIC_BUILD_QUIETER=$(SONIC_BUILD_QUIETER)"
endif

ifneq ($(SONIC_DPKG_CACHE_SOURCE),)
DOCKER_RUN += -v "$(SONIC_DPKG_CACHE_SOURCE):/dpkg_cache:rw"
endif
Expand Down Expand Up @@ -185,6 +190,7 @@ SONIC_BUILD_INSTRUCTION := make \
PLATFORM_ARCH=$(PLATFORM_ARCH) \
BUILD_NUMBER=$(BUILD_NUMBER) \
BUILD_TIMESTAMP=$(BUILD_TIMESTAMP) \
SONIC_IMAGE_VERSION=$(SONIC_IMAGE_VERSION) \
ENABLE_DHCP_GRAPH_SERVICE=$(ENABLE_DHCP_GRAPH_SERVICE) \
ENABLE_ZTP=$(ENABLE_ZTP) \
SHUTDOWN_BGP_ON_START=$(SHUTDOWN_BGP_ON_START) \
Expand Down
20 changes: 14 additions & 6 deletions build_debian.sh
Original file line number Diff line number Diff line change
Expand Up @@ -242,9 +242,12 @@ sudo cp files/docker/docker.service.conf $_
## Fix systemd race between docker and containerd
sudo sed -i '/After=/s/$/ containerd.service/' $FILESYSTEM_ROOT/lib/systemd/system/docker.service

## Create redis group
sudo LANG=C chroot $FILESYSTEM_ROOT groupadd -f redis

## Create default user
## Note: user should be in the group with the same name, and also in sudo/docker group
sudo LANG=C chroot $FILESYSTEM_ROOT useradd -G sudo,docker $USERNAME -c "$DEFAULT_USERINFO" -m -s /bin/bash
## Note: user should be in the group with the same name, and also in sudo/docker/redis groups
sudo LANG=C chroot $FILESYSTEM_ROOT useradd -G sudo,docker,redis $USERNAME -c "$DEFAULT_USERINFO" -m -s /bin/bash
## Create password for the default user
echo "$USERNAME:$PASSWORD" | sudo LANG=C chroot $FILESYSTEM_ROOT chpasswd

Expand Down Expand Up @@ -312,8 +315,13 @@ sudo LANG=C DEBIAN_FRONTEND=noninteractive chroot $FILESYSTEM_ROOT apt-get -y in
python-pip \
python3-pip \
cron \
haveged
haveged \
jq

# Install "wheel" package so that we can install .whl packages and not
# encounter a "error: invalid command 'bdist_wheel'" error
sudo https_proxy=$https_proxy LANG=C chroot $FILESYSTEM_ROOT pip install wheel
sudo https_proxy=$https_proxy LANG=C chroot $FILESYSTEM_ROOT pip3 install wheel

if [[ $CONFIGURED_ARCH == amd64 ]]; then
## Pre-install the fundamental packages for amd64 (x86)
Expand Down Expand Up @@ -393,7 +401,7 @@ sudo mkdir -p $FILESYSTEM_ROOT/var/core

# Config sysctl
sudo augtool --autosave "
set /files/etc/sysctl.conf/kernel.core_pattern '|/usr/bin/coredump-compress %e %t %p'
set /files/etc/sysctl.conf/kernel.core_pattern '|/usr/local/bin/coredump-compress %e %t %p %P'
set /files/etc/sysctl.conf/kernel.softlockup_panic 1
set /files/etc/sysctl.conf/kernel.panic 10
set /files/etc/sysctl.conf/vm.panic_on_oom 2
Expand Down Expand Up @@ -446,7 +454,7 @@ fi
## Version file
sudo mkdir -p $FILESYSTEM_ROOT/etc/sonic
sudo tee $FILESYSTEM_ROOT/etc/sonic/sonic_version.yml > /dev/null <<EOF
build_version: '$(sonic_get_version)'
build_version: '${SONIC_IMAGE_VERSION}'
debian_version: '$(cat $FILESYSTEM_ROOT/etc/debian_version)'
kernel_version: '$kversion'
asic_type: $sonic_asic_platform
Expand Down Expand Up @@ -483,7 +491,7 @@ fi
sudo cp -f files/image_config/ebtables/ebtables.default $FILESYSTEM_ROOT/etc/default/ebtables
sudo cp -f files/image_config/ebtables/ebtables.init $FILESYSTEM_ROOT/etc/init.d/ebtables
sudo cp -f files/image_config/ebtables/ebtables.service $FILESYSTEM_ROOT/lib/systemd/system/ebtables.service
sudo cp files/image_config/ebtables/ebtables.filter ${FILESYSTEM_ROOT}/etc
sudo cp files/image_config/ebtables/ebtables.filter.cfg ${FILESYSTEM_ROOT}/etc
sudo LANG=C chroot $FILESYSTEM_ROOT update-alternatives --set ebtables /usr/sbin/ebtables-legacy
sudo LANG=C chroot $FILESYSTEM_ROOT systemctl enable ebtables.service

Expand Down
2 changes: 1 addition & 1 deletion build_image.sh
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ fi
exit 1
}

IMAGE_VERSION=$(. functions.sh && sonic_get_version)
IMAGE_VERSION="${SONIC_IMAGE_VERSION}"

generate_onie_installer_image()
{
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
{
"skip_ledd": true
"skip_ledd": true,
"skip_thermalctld": true
}

Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
SAI_INIT_CONFIG_FILE=/usr/share/sonic/hwsku/td2-as5712-72x10G.config.bcm
SAI_NUM_ECMP_MEMBERS=64
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ bcm_stat_flags=0
parity_enable=0
parity_correction=0

bcm_num_cos=8
bcm_num_cos=10
l2_mem_entries=32768
l3_mem_entries=16384
l3_alpm_enable=2
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
{
"skip_ledd": true
"skip_ledd": true,
"skip_thermalctld": true
}

Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
SAI_INIT_CONFIG_FILE=/usr/share/sonic/hwsku/td2-as5812t-72x10G.config.bcm
SAI_NUM_ECMP_MEMBERS=64
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
bcm_num_cos=8
bcm_num_cos=10
bcm_stat_flags=0
bcm_stat_interval=2000000
bcm_tunnel_term_compatible_mode=1
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
{
"skip_ledd": true
"skip_ledd": true,
"skip_thermalctld": true
}

Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
SAI_INIT_CONFIG_FILE=/usr/share/sonic/hwsku/td2-as5812-72x10G.config.bcm
SAI_NUM_ECMP_MEMBERS=64
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ bcm_stat_flags=0
parity_enable=0
parity_correction=0

bcm_num_cos=8
bcm_num_cos=10
l2_mem_entries=32768
l3_mem_entries=16384
l3_alpm_enable=2
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
{
"skip_ledd": true
"skip_ledd": true,
"skip_thermalctld": true
}

Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ fpem_mem_entries=16384
l2xmsg_mode=1

# Platform specfic
bcm_num_cos=8
bcm_num_cos=10
bcm_stat_interval=2000000
cdma_timeout_usec=3000000
ifp_inports_support_enable=1
Expand Down
Original file line number Diff line number Diff line change
@@ -1,2 +1,3 @@
SAI_INIT_CONFIG_FILE=/usr/share/sonic/hwsku/mv2-as5835t-48x10G+6x100G.config.bcm
SAI_BOARD_CONFIG_PATH=/etc/accton
SAI_NUM_ECMP_MEMBERS=64
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
{
"skip_ledd": true
"skip_ledd": true,
"skip_thermalctld": true
}

Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
SAI_INIT_CONFIG_FILE=/etc/bcm/mv2-as5835-48x10G+6x100G.config.bcm
SAI_NUM_ECMP_MEMBERS=64
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
{
"skip_ledd": true
"skip_ledd": true,
"skip_thermalctld": true
}

Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
SAI_INIT_CONFIG_FILE=/usr/share/sonic/hwsku/td2-as6712-32x40G.config.bcm
SAI_NUM_ECMP_MEMBERS=64
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
{
"skip_ledd": true
"skip_ledd": true,
"skip_thermalctld": true
}

Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
{
"skip_ledd": true
"skip_ledd": true,
"skip_thermalctld": true
}

Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
{
"skip_ledd": true
"skip_ledd": true,
"skip_thermalctld": true
}

Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
SAI_INIT_CONFIG_FILE=/usr/share/sonic/hwsku/th-as7312-48x25G+6x100G.config.bcm
SAI_NUM_ECMP_MEMBERS=64
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
{
"skip_ledd": true
"skip_ledd": true,
"skip_thermalctld": true
}

Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
SAI_INIT_CONFIG_FILE=/usr/share/sonic/hwsku/th-as7312-48x25G+6x100G.config.bcm
SAI_NUM_ECMP_MEMBERS=64
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
{
"skip_ledd": true
"skip_ledd": true,
"skip_thermalctld": true
}

Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
SAI_INIT_CONFIG_FILE=/usr/share/sonic/hwsku/qax-as7315-20x10G+4x25G+3x100G.config.bcm
SAI_NUM_ECMP_MEMBERS=64
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
{
"skip_ledd": true
"skip_ledd": true,
"skip_thermalctld": true
}

Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
SAI_INIT_CONFIG_FILE=/usr/share/sonic/hwsku/td3-as7326-48x25G+8x100G.config.bcm
SAI_NUM_ECMP_MEMBERS=64
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ fpem_mem_entries=16384
l2xmsg_mode=1

# Platform specfic
bcm_num_cos=8
bcm_num_cos=10
bcm_stat_interval=2000000
cdma_timeout_usec=3000000
ifp_inports_support_enable=1
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
{
"skip_ledd": true
"skip_ledd": true,
"skip_thermalctld": true
}

Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
{
"skip_ledd": true
"skip_ledd": true,
"skip_thermalctld": true
}

Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
SAI_INIT_CONFIG_FILE=/usr/share/sonic/hwsku/th-as7712-32x100G.config.bcm
SAI_NUM_ECMP_MEMBERS=64
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ pbmp_xport_xe=0x444444451111111144444444422222222
#
arl_clean_timeout_usec=15000000
asf_mem_profile=2
bcm_num_cos=8
bcm_num_cos=10
bcm_stat_flags=1
bcm_stat_jumbo=9236
cdma_timeout_usec=15000000
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
{
"skip_ledd": true
"skip_ledd": true,
"skip_thermalctld": true
}

Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
SAI_INIT_CONFIG_FILE=/usr/share/sonic/hwsku/th-as7716-32x100G.config.bcm
SAI_NUM_ECMP_MEMBERS=64
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ pbmp_xport_xe=0x444444451111111144444444422222222
#
arl_clean_timeout_usec=15000000
asf_mem_profile=2
bcm_num_cos=8
bcm_num_cos=10
bcm_stat_flags=1
bcm_stat_jumbo=9236
cdma_timeout_usec=15000000
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
{
"skip_ledd": true
"skip_ledd": true,
"skip_thermalctld": true
}

Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
SAI_INIT_CONFIG_FILE=/usr/share/sonic/hwsku/th-as7716-32x100G.config.bcm
SAI_NUM_ECMP_MEMBERS=64
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ pbmp_xport_xe=0x444444451111111144444444422222222
#
arl_clean_timeout_usec=15000000
asf_mem_profile=2
bcm_num_cos=8
bcm_num_cos=10
bcm_stat_flags=1
bcm_stat_jumbo=9236
cdma_timeout_usec=15000000
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
{
"skip_ledd": true
"skip_ledd": true,
"skip_thermalctld": true
}

Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
SAI_INIT_CONFIG_FILE=/usr/share/sonic/hwsku/td3-as7726-32x100G.config.bcm
SAI_NUM_ECMP_MEMBERS=64
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ fpem_mem_entries=16384
l2xmsg_mode=1

# Platform specfic
bcm_num_cos=8
bcm_num_cos=10
bcm_stat_interval=2000000
cdma_timeout_usec=3000000
ifp_inports_support_enable=1
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
{
"skip_ledd": true
"skip_ledd": true,
"skip_thermalctld": true
}

Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
SAI_INIT_CONFIG_FILE=/usr/share/sonic/hwsku/th2-as7816-64x25G-48x100G_row1.config.bcm
SAI_NUM_ECMP_MEMBERS=64
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ pbmp_oversubscribe=0x1ffffffffffffffffffffffffffffffffffffffffffffffffffffffffff
# platform specific setting
arl_clean_timeout_usec=15000000
asf_mem_profile=2
bcm_num_cos=8
bcm_num_cos=10
bcm_stat_flags=1
bcm_stat_jumbo=9236
cdma_timeout_usec=15000000
Expand Down
Loading

0 comments on commit 9d05a27

Please sign in to comment.