201811 cel

.gitmodules

@@ -1,15 +1,18 @@
 [submodule "sonic-swss-common"]
  path = src/sonic-swss-common
  url = https://github.com/Azure/sonic-swss-common
+ branch = 201811
 [submodule "sonic-linux-kernel"]
  path = src/sonic-linux-kernel
  url = https://github.com/Azure/sonic-linux-kernel
 [submodule "sonic-sairedis"]
  path = src/sonic-sairedis
  url = https://github.com/Azure/sonic-sairedis
+ branch = 201811
 [submodule "sonic-swss"]
  path = src/sonic-swss
  url = https://github.com/Azure/sonic-swss
+ branch = 201811
 [submodule "src/p4c-bm/p4c-bm"]
  path = platform/p4/p4c-bm/p4c-bm
  url = https://github.com/krambn/p4c-bm
@@ -35,12 +38,14 @@
 [submodule "src/sonic-utilities"]
  path = src/sonic-utilities
  url = https://github.com/Azure/sonic-utilities
+ branch = 201811
 [submodule "platform/broadcom/sonic-platform-modules-arista"]
  path = platform/broadcom/sonic-platform-modules-arista
  url = https://github.com/aristanetworks/sonic
 [submodule "src/sonic-platform-common"]
  path = src/sonic-platform-common
  url = https://github.com/Azure/sonic-platform-common
+ branch = 201811
 [submodule "src/sonic-platform-daemons"]
  path = src/sonic-platform-daemons
  url = https://github.com/Azure/sonic-platform-daemons
@@ -62,3 +67,6 @@
 [submodule "src/redis-dump-load"]
  path = src/redis-dump-load
  url = https://github.com/p/redis-dump-load.git
+[submodule "platform/broadcom/sonic-platform-modules-cel"]
+ path = platform/broadcom/sonic-platform-modules-cel
+ url = https://github.com/celestica-Inc/sonic-platform-modules-cel.git

Makefile.work

@@ -27,6 +27,9 @@
 # * make NOSTRETCH=1 KEEP_SLAVE_ON=yes <any jessie target>
 # * SOURCE_FOLDER: host path to be mount as /var/$(USER)/src, only effective when KEEP_SLAVE_ON=yes
 # * SONIC_BUILD_JOBS: Specifying number of concurrent build job(s) to run
+# * VS_PREPARE_MEM: Prepare memory in VS build (drop cache and compact).
+# * Default: yes
+# * Values: yes, no
 # * KERNEL_PROCURE_METHOD: Specifying method of obtaining kernel Debian package: download or build
 #
 ###############################################################################
@@ -114,6 +117,7 @@ SONIC_BUILD_INSTRUCTION := make \
  PASSWORD=$(PASSWORD) \
  USERNAME=$(USERNAME) \
  SONIC_BUILD_JOBS=$(SONIC_BUILD_JOBS) \
+ VS_PREPARE_MEM=$(VS_PREPARE_MEM) \
  KERNEL_PROCURE_METHOD=$(KERNEL_PROCURE_METHOD) \
  HTTP_PROXY=$(http_proxy) \
  HTTPS_PROXY=$(https_proxy) \

build_debian.sh

@@ -29,7 +29,7 @@
 set -x -e
 
 ## docker engine version (with platform)
-DOCKER_VERSION=5:18.09.0~3-0~debian-stretch
+DOCKER_VERSION=5:18.09.2~3-0~debian-stretch
 LINUX_KERNEL_VERSION=4.9.0-8
 
 ## Working directory to prepare the file system
@@ -150,8 +150,8 @@ sudo chmod +x $FILESYSTEM_ROOT/etc/initramfs-tools/scripts/init-bottom/union-mou
 sudo cp files/initramfs-tools/varlog $FILESYSTEM_ROOT/etc/initramfs-tools/scripts/init-bottom/varlog
 sudo chmod +x $FILESYSTEM_ROOT/etc/initramfs-tools/scripts/init-bottom/varlog
 # Management interface (eth0) dhcp can be optionally turned off (during a migration from another NOS to SONiC)
-sudo cp files/initramfs-tools/mgmt-intf-dhcp $FILESYSTEM_ROOT/etc/initramfs-tools/scripts/init-bottom/mgmt-intf-dhcp
-sudo chmod +x $FILESYSTEM_ROOT/etc/initramfs-tools/scripts/init-bottom/mgmt-intf-dhcp
+#sudo cp files/initramfs-tools/mgmt-intf-dhcp $FILESYSTEM_ROOT/etc/initramfs-tools/scripts/init-bottom/mgmt-intf-dhcp
+#sudo chmod +x $FILESYSTEM_ROOT/etc/initramfs-tools/scripts/init-bottom/mgmt-intf-dhcp
 sudo cp files/initramfs-tools/union-fsck $FILESYSTEM_ROOT/etc/initramfs-tools/hooks/union-fsck
 sudo chmod +x $FILESYSTEM_ROOT/etc/initramfs-tools/hooks/union-fsck
 pushd $FILESYSTEM_ROOT/usr/share/initramfs-tools/scripts/init-bottom && sudo patch -p1 < $OLDPWD/files/initramfs-tools/udev.patch; popd
@@ -182,6 +182,8 @@ sudo LANG=C chroot $FILESYSTEM_ROOT apt-get -y remove software-properties-common
 sudo mkdir -p $FILESYSTEM_ROOT/etc/systemd/system/docker.service.d/
 ## Note: $_ means last argument of last command
 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 default user
 ## Note: user should be in the group with the same name, and also in sudo/docker group
@@ -240,7 +242,8 @@ sudo LANG=C DEBIAN_FRONTEND=noninteractive chroot $FILESYSTEM_ROOT apt-get -y in
  python-scapy \
  tcptraceroute \
  mtr-tiny \
- locales
+ locales \
+ dmidecode
 
 #Adds a locale to a debian system in non-interactive mode
 sudo sed -i '/^#.* en_US.* /s/^#//' $FILESYSTEM_ROOT/etc/locale.gen && \
@@ -261,6 +264,10 @@ sudo mv $FILESYSTEM_ROOT/grub-pc-bin*.deb $FILESYSTEM_ROOT/$PLATFORM_DIR/x86_64-
 ## Disable kexec supported reboot which was installed by default
 sudo sed -i 's/LOAD_KEXEC=true/LOAD_KEXEC=false/' $FILESYSTEM_ROOT/etc/default/kexec
 
+## Modifty ntp default configuration: disable initial jump (add -x), and disable
+## jump when time difference is greater than 1000 seconds (remove -g).
+sudo sed -i "s/NTPD_OPTS='-g'/NTPD_OPTS='-x'/" $FILESYSTEM_ROOT/etc/default/ntp
+
 ## Fix ping tools permission so non root user can directly use them
 ## Note: this is a workaround since aufs doesn't support extended attributes
 ## Ref: https://github.com/moby/moby/issues/5650#issuecomment-303499489
@@ -339,6 +346,7 @@ set /files/etc/sysctl.conf/net.ipv6.conf.all.keep_addr_on_down 1
 set /files/etc/sysctl.conf/net.ipv6.conf.eth0.keep_addr_on_down 1
 
 set /files/etc/sysctl.conf/net.ipv6.conf.eth0.accept_ra_defrtr 0
+set /files/etc/sysctl.conf/net.ipv6.conf.eth0.accept_ra 0
 
 set /files/etc/sysctl.conf/net.core.rmem_max 2097152
 set /files/etc/sysctl.conf/net.core.wmem_max 2097152

build_kvm_image.sh

@@ -1,4 +1,4 @@
-#!/bin/sh -ex
+#!/bin/bash -ex
 
 # Copyright (C) 2014 Curt Brune <curt@cumulusnetworks.com>
 #
@@ -47,6 +47,15 @@ prepare_installer_disk()
 create_disk
 prepare_installer_disk
 
+echo "Prepare memory for KVM build: $vs_build_prepare_mem"
+free -m
+if [[ "$vs_build_prepare_mem" == "yes" ]]; then
+ # Force o.s. to drop cache and compact memory so that KVM can get 2G memory
+ sudo bash -c 'echo 1 > /proc/sys/vm/drop_caches'
+ sudo bash -c 'echo 1 > /proc/sys/vm/compact_memory'
+ free -m
+fi
+
 /usr/bin/kvm -m $MEM \
  -name "onie" \
  -boot "order=cd,once=d" -cdrom "$ONIE_RECOVERY_ISO" \

device/alibaba/x86_64-alibaba_as13-32h-cl-r0/AS13-32H/port_config.ini

@@ -0,0 +1,33 @@
+# name lanes alias index
+Ethernet1 1,2,3,4 QSFP1 1
+Ethernet2 5,6,7,8 QSFP2 2
+Ethernet3 9,10,11,12 QSFP3 3
+Ethernet4 13,14,15,16 QSFP4 4
+Ethernet5 17,18,19,20 QSFP5 5
+Ethernet6 21,22,23,24 QSFP6 6
+Ethernet7 25,26,27,28 QSFP7 7
+Ethernet8 29,30,31,32 QSFP8 8
+Ethernet9 33,34,35,36 QSFP9 9
+Ethernet10 37,38,39,40 QSFP10 10
+Ethernet11 41,42,43,44 QSFP11 11
+Ethernet12 45,46,47,48 QSFP12 12
+Ethernet13 49,50,51,52 QSFP13 13
+Ethernet14 53,54,55,56 QSFP14 14
+Ethernet15 57,58,59,60 QSFP15 15
+Ethernet16 61,62,63,64 QSFP16 16
+Ethernet17 65,66,67,68 QSFP17 17
+Ethernet18 69,70,71,72 QSFP18 18
+Ethernet19 73,74,75,76 QSFP19 19
+Ethernet20 77,78,79,80 QSFP20 20
+Ethernet21 81,82,83,84 QSFP21 21
+Ethernet22 85,86,87,88 QSFP22 22
+Ethernet23 89,90,91,92 QSFP23 23
+Ethernet24 93,94,95,96 QSFP24 24
+Ethernet25 97,98,99,100 QSFP25 25
+Ethernet26 101,102,103,104 QSFP26 26
+Ethernet27 105,106,107,108 QSFP27 27
+Ethernet28 109,110,111,112 QSFP28 28
+Ethernet29 113,114,115,116 QSFP29 29
+Ethernet30 117,118,119,120 QSFP30 30
+Ethernet31 121,122,123,124 QSFP31 31
+Ethernet32 125,126,127,128 QSFP32 32

device/alibaba/x86_64-alibaba_as13-32h-cl-r0/AS13-32H/sai.profile

@@ -0,0 +1 @@
+SAI_INIT_CONFIG_FILE=/usr/share/sonic/platform/td3-as13-32h.config.bcm

device/alibaba/x86_64-alibaba_as13-32h-cl-r0/default_sku

@@ -0,0 +1 @@
+AS13-32H t1

device/alibaba/x86_64-alibaba_as13-32h-cl-r0/installer.conf

@@ -0,0 +1,2 @@
+CONSOLE_SPEED=9600
+ONIE_PLATFORM_EXTRA_CMDLINE_LINUX="processor.max_cstate=1 intel_idle.max_cstate=0"

device/alibaba/x86_64-alibaba_as13-32h-cl-r0/led_proc_init.soc

@@ -0,0 +1,9 @@
+#Enable all ports
+#port all en=1
+#sleep 6
+#linkscan 250000; port xe,ce linkscan=on
+
+#Load LED
+#led auto on; led start
+
+