201811

.gitmodules

@@ -38,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

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
@@ -263,6 +263,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

build_kvm_image.sh

@@ -1,4 +1,4 @@
-#!/bin/sh -ex
+#!/bin/bash -ex
 
 #  Copyright (C) 2014 Curt Brune <[email protected]>
 #
@@ -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/mellanox/x86_64-mlnx_msn2700-r0/Mellanox-SN2700-C28D8/buffers.json.j2

@@ -0,0 +1 @@
+../ACS-MSN2700/buffers.json.j2

device/mellanox/x86_64-mlnx_msn2700-r0/Mellanox-SN2700-C28D8/buffers_defaults_t0.j2

@@ -0,0 +1 @@
+../ACS-MSN2700/buffers_defaults_t0.j2

device/mellanox/x86_64-mlnx_msn2700-r0/Mellanox-SN2700-C28D8/buffers_defaults_t1.j2

@@ -0,0 +1 @@
+../ACS-MSN2700/buffers_defaults_t1.j2

device/mellanox/x86_64-mlnx_msn2700-r0/Mellanox-SN2700-C28D8/pg_profile_lookup.ini

@@ -0,0 +1 @@
+../ACS-MSN2700/pg_profile_lookup.ini

device/mellanox/x86_64-mlnx_msn2700-r0/Mellanox-SN2700-C28D8/port_config.ini

@@ -0,0 +1,37 @@
+# name          lanes                  speed        alias       index
+Ethernet0       0,1,2,3               100000        etp1        1
+Ethernet4       4,5,6,7               100000        etp2        2
+Ethernet8       8,9,10,11             100000        etp3        3
+Ethernet12      12,13,14,15           100000        etp4        4
+Ethernet16      16,17,18,19           100000        etp5        5
+Ethernet20      20,21,22,23           100000        etp6        6
+Ethernet24      24,25,26,27           100000        etp7        7
+Ethernet28      28,29,30,31           100000        etp8        8
+Ethernet32      32,33,34,35           100000        etp9        9
+Ethernet36      36,37,38,39           100000        etp10       10
+Ethernet40      40,41,42,43           100000        etp11       11
+Ethernet44      44,45,46,47           100000        etp12       12
+Ethernet48      48,49,50,51           100000        etp13       13
+Ethernet52      52,53,54,55           100000        etp14       14
+Ethernet56      56,57,58,59           100000        etp15       15
+Ethernet60      60,61,62,63           100000        etp16       16
+Ethernet64      64,65,66,67           100000        etp17       17
+Ethernet68      68,69,70,71           100000        etp18       18
+Ethernet72      72,73,74,75           100000        etp19       19
+Ethernet76      76,77,78,79           100000        etp20       20
+Ethernet80      80,81,82,83           100000        etp21       21
+Ethernet84      84,85,86,87           100000        etp22       22
+Ethernet88      88,89,90,91           100000        etp23       23
+Ethernet92      92,93,94,95           100000        etp24       24
+Ethernet96      96,97,98,99           100000        etp25       25
+Ethernet100     100,101,102,103       100000        etp26       26
+Ethernet104     104,105,106,107       100000        etp27       27
+Ethernet108     108,109,110,111       100000        etp28       28
+Ethernet112     112,113                50000        etp29a      29
+Ethernet114     114,115                50000        etp29b      29
+Ethernet116     116,117                50000        etp30a      30
+Ethernet118     118,119                50000        etp30b      30
+Ethernet120     120,121                50000        etp31a      31
+Ethernet122     122,123                50000        etp31b      31
+Ethernet124     124,125                50000        etp32a      32
+Ethernet126     126,127                50000        etp32b      32

device/mellanox/x86_64-mlnx_msn2700-r0/Mellanox-SN2700-C28D8/qos.json.j2

@@ -0,0 +1 @@
+../ACS-MSN2700/qos.json.j2

device/mellanox/x86_64-mlnx_msn2700-r0/Mellanox-SN2700-C28D8/sai.profile

@@ -0,0 +1 @@
+SAI_INIT_CONFIG_FILE=/usr/share/sonic/hwsku/sai_2700_8x50g_28x100g.xml

device/mellanox/x86_64-mlnx_msn2700-r0/Mellanox-SN2700-C28D8/sai_2700_8x50g_28x100g.xml

@@ -0,0 +1,250 @@
+<?xml version="1.0"?>
+<root>
+	<platform_info type="2700">
+
+		<!-- Device MAC address  -->
+		<device-mac-address>00:02:03:04:05:00</device-mac-address>
+
+		<!-- ISSU enabled -->
+		<issu-enabled>1</issu-enabled>
+
+		<!-- Number of ports in the following port list -->
+		<number-of-physical-ports>32</number-of-physical-ports>
+
+		<!-- List of ports in the device -->
+		<ports-list>
+			<port-info>
+				<local-port>1</local-port>
+				<width>4</width>
+				<module>16</module>
+
+				<!-- 0 none, 1=2, 2=4, 3=2,4 -->
+				<breakout-modes>3</breakout-modes>
+
+				<!-- (BITMASK) 4096 - 10Gb , 939524096 - 25Gb , 98368 - 40Gb , 3221225472 - 50Gb , 11534336 - 100Gb-->
+				<port-speed>11534336</port-speed>
+			</port-info>
+			<port-info>
+				<local-port>3</local-port>
+				<width>4</width>
+				<module>17</module>
+				<breakout-modes>1</breakout-modes>
+				<port-speed>11534336</port-speed>
+			</port-info>
+			<port-info>
+				<local-port>5</local-port>
+				<width>4</width>
+				<module>18</module>
+				<breakout-modes>3</breakout-modes>
+				<port-speed>11534336</port-speed>
+			</port-info>
+			<port-info>
+				<local-port>7</local-port>
+				<width>4</width>
+				<module>19</module>
+				<breakout-modes>1</breakout-modes>
+				<port-speed>11534336</port-speed>
+			</port-info>
+			<port-info>
+				<local-port>9</local-port>
+				<width>4</width>
+				<module>20</module>
+				<breakout-modes>3</breakout-modes>
+				<port-speed>11534336</port-speed>
+			</port-info>
+			<port-info>
+				<local-port>11</local-port>
+				<width>4</width>
+				<module>21</module>
+				<breakout-modes>1</breakout-modes>
+				<port-speed>11534336</port-speed>
+			</port-info>
+			<port-info>
+				<local-port>13</local-port>
+				<width>4</width>
+				<module>22</module>
+				<breakout-modes>3</breakout-modes>
+				<port-speed>11534336</port-speed>
+			</port-info>
+			<port-info>
+				<local-port>15</local-port>
+				<width>4</width>
+				<module>23</module>
+				<breakout-modes>1</breakout-modes>
+				<port-speed>11534336</port-speed>
+			</port-info>
+			<port-info>
+				<local-port>17</local-port>
+				<width>4</width>
+				<module>24</module>
+				<breakout-modes>3</breakout-modes>
+				<port-speed>11534336</port-speed>
+			</port-info>
+			<port-info>
+				<local-port>19</local-port>
+				<width>4</width>
+				<module>25</module>
+				<breakout-modes>1</breakout-modes>
+				<port-speed>11534336</port-speed>
+			</port-info>
+			<port-info>
+				<local-port>21</local-port>
+				<width>4</width>
+				<module>26</module>
+				<breakout-modes>3</breakout-modes>
+				<port-speed>11534336</port-speed>
+			</port-info>
+			<port-info>
+				<local-port>23</local-port>
+				<width>4</width>
+				<module>27</module>
+				<breakout-modes>1</breakout-modes>
+				<port-speed>11534336</port-speed>
+			</port-info>
+			<port-info>
+				<local-port>25</local-port>
+				<width>4</width>
+				<module>28</module>
+				<breakout-modes>3</breakout-modes>
+				<port-speed>3221225472</port-speed>
+				<split>2</split>
+			</port-info>
+			<port-info>
+				<local-port>27</local-port>
+				<width>4</width>
+				<module>29</module>
+				<breakout-modes>1</breakout-modes>
+				<port-speed>3221225472</port-speed>
+				<split>2</split>
+			</port-info>
+			<port-info>
+				<local-port>29</local-port>
+				<width>4</width>
+				<module>30</module>
+				<breakout-modes>3</breakout-modes>
+				<port-speed>3221225472</port-speed>
+				<split>2</split>
+			</port-info>
+			<port-info>
+				<local-port>31</local-port>
+				<width>4</width>
+				<module>31</module>
+				<breakout-modes>1</breakout-modes>
+				<port-speed>3221225472</port-speed>
+				<split>2</split>
+			</port-info>
+			<port-info>
+				<local-port>33</local-port>
+				<width>4</width>
+				<module>14</module>
+				<breakout-modes>3</breakout-modes>
+				<port-speed>11534336</port-speed>
+			</port-info>
+			<port-info>
+				<local-port>35</local-port>
+				<width>4</width>
+				<module>15</module>
+				<breakout-modes>1</breakout-modes>
+				<port-speed>11534336</port-speed>
+			</port-info>
+			<port-info>
+				<local-port>37</local-port>
+				<width>4</width>
+				<module>12</module>
+				<breakout-modes>3</breakout-modes>
+				<port-speed>11534336</port-speed>
+			</port-info>
+			<port-info>
+				<local-port>39</local-port>
+				<width>4</width>
+				<module>13</module>
+				<breakout-modes>1</breakout-modes>
+				<port-speed>11534336</port-speed>
+			</port-info>
+			<port-info>
+				<local-port>41</local-port>
+				<width>4</width>
+				<module>10</module>
+				<breakout-modes>3</breakout-modes>
+				<port-speed>11534336</port-speed>
+			</port-info>
+			<port-info>
+				<local-port>43</local-port>
+				<width>4</width>
+				<module>11</module>
+				<breakout-modes>1</breakout-modes>
+				<port-speed>11534336</port-speed>
+			</port-info>
+			<port-info>
+				<local-port>45</local-port>
+				<width>4</width>
+				<module>8</module>
+				<breakout-modes>3</breakout-modes>
+				<port-speed>11534336</port-speed>
+			</port-info>
+			<port-info>
+				<local-port>47</local-port>
+				<width>4</width>
+				<module>9</module>
+				<breakout-modes>1</breakout-modes>
+				<port-speed>11534336</port-speed>
+			</port-info>
+			<port-info>
+				<local-port>49</local-port>
+				<width>4</width>
+				<module>6</module>
+				<breakout-modes>3</breakout-modes>
+				<port-speed>11534336</port-speed>
+			</port-info>
+			<port-info>
+				<local-port>51</local-port>
+				<width>4</width>
+				<module>7</module>
+				<breakout-modes>1</breakout-modes>
+				<port-speed>11534336</port-speed>
+			</port-info>
+			<port-info>
+				<local-port>53</local-port>
+				<width>4</width>
+				<module>4</module>
+				<breakout-modes>3</breakout-modes>
+				<port-speed>11534336</port-speed>
+			</port-info>
+			<port-info>
+				<local-port>55</local-port>
+				<width>4</width>
+				<module>5</module>
+				<breakout-modes>1</breakout-modes>
+				<port-speed>11534336</port-speed>
+			</port-info>
+			<port-info>
+				<local-port>57</local-port>
+				<width>4</width>
+				<module>2</module>
+				<breakout-modes>3</breakout-modes>
+				<port-speed>11534336</port-speed>
+			</port-info>
+			<port-info>
+				<local-port>59</local-port>
+				<width>4</width>
+				<module>3</module>
+				<breakout-modes>1</breakout-modes>
+				<port-speed>11534336</port-speed>
+			</port-info>
+			<port-info>
+				<local-port>61</local-port>
+				<width>4</width>
+				<module>0</module>
+				<breakout-modes>3</breakout-modes>
+				<port-speed>11534336</port-speed>
+			</port-info>
+			<port-info>
+				<local-port>63</local-port>
+				<width>4</width>
+				<module>1</module>
+				<breakout-modes>1</breakout-modes>
+				<port-speed>11534336</port-speed>
+			</port-info>
+		</ports-list>
+	</platform_info>
+</root>