Merging latest changes from Azure/sonic-buildimage:master

Makefile.work

@@ -46,7 +46,7 @@ endif
 # Note: Using the greater of CE (17.05.0) and EE (17.06.1) versions that support ARG before FROM
 docker_min := 17.06.1
 docker_min_ver := $(shell echo "$(docker_min)" | awk -F. '{printf("%d%03d%03d\n",$$1,$$2,$$3);}' 2>/dev/null)
-docker_ver := $(shell docker info 2>/dev/null | grep -i "server version" | cut -d' ' -f3 | awk -F. '{printf("%d%03d%03d\n",$$1,$$2,$$3);}' 2>/dev/null)
+docker_ver := $(shell docker info 2>/dev/null | grep -i "server version" | rev | cut -d' ' -f1 | rev | awk -F. '{printf("%d%03d%03d\n",$$1,$$2,$$3);}' 2>/dev/null)
 docker_is_valid := $(shell if [ $(docker_ver) -lt $(docker_min_ver) ] ; then echo "0"; else echo "1"; fi)
 ifeq (0,$(docker_is_valid))
 $(error SONiC requires Docker version $(docker_min) or later)

build_debian.sh

@@ -29,7 +29,7 @@
 set -x -e
 
 ## docker engine version (with platform)
-DOCKER_VERSION=5:18.09.2~3-0~debian-stretch
+DOCKER_VERSION=5:18.09.8~3-0~debian-stretch
 LINUX_KERNEL_VERSION=4.9.0-9-2
 
 ## Working directory to prepare the file system
@@ -205,7 +205,6 @@ sudo LANG=C chroot $FILESYSTEM_ROOT apt-get -y install \
 ## Note: don't install python-apt by pip, older than Debian repo one
 sudo LANG=C DEBIAN_FRONTEND=noninteractive chroot $FILESYSTEM_ROOT apt-get -y install \
  file \
- ifupdown2 \
  iproute2 \
  bridge-utils \
  isc-dhcp-client \
@@ -249,7 +248,8 @@ sudo LANG=C DEBIAN_FRONTEND=noninteractive chroot $FILESYSTEM_ROOT apt-get -y in
  mtr-tiny \
  locales \
  flashrom \
- cgroup-tools
+ cgroup-tools \
+ mcelog
 
 #Adds a locale to a debian system in non-interactive mode
 sudo sed -i '/^#.* en_US.* /s/^#//' $FILESYSTEM_ROOT/etc/locale.gen && \
@@ -380,6 +380,9 @@ set /files/etc/sysctl.conf/net.core.rmem_max 2097152
 set /files/etc/sysctl.conf/net.core.wmem_max 2097152
 " -r $FILESYSTEM_ROOT
 
+# Configure mcelog to log machine checks to syslog
+sudo sed -i 's/^#syslog = yes/syslog = yes/' $FILESYSTEM_ROOT/etc/mcelog/mcelog.conf
+
 ## docker-py is needed by Ansible docker module
 sudo https_proxy=$https_proxy LANG=C chroot $FILESYSTEM_ROOT easy_install pip
 sudo https_proxy=$https_proxy LANG=C chroot $FILESYSTEM_ROOT pip install 'docker-py==1.6.0'

device/accton/x86_64-accton_as5835_54x-r0/Accton-AS5835-54X/port_config.ini

@@ -1,55 +1,55 @@
-# name lanes alias index speed
-Ethernet0 1 tenGigE1  1 10000
-Ethernet1 2 tenGigE2  2 10000
-Ethernet2 3 tenGigE3  3 10000
-Ethernet3 4 tenGigE4  4 10000
-Ethernet4 5 tenGigE5  5 10000
-Ethernet5 6 tenGigE6  6 10000
-Ethernet6 7 tenGigE7  7 10000
-Ethernet7 8 tenGigE8  8 10000
-Ethernet8 9 tenGigE9  9 10000
-Ethernet9 10 tenGigE10  10 10000
-Ethernet10 11 tenGigE11  11 10000
-Ethernet11 12 tenGigE12  12 10000
-Ethernet12 13 tenGigE13  13 10000
-Ethernet13 14 tenGigE14  14 10000
-Ethernet14 15 tenGigE15  15 10000
-Ethernet15 16 tenGigE16  16 10000
-Ethernet16 17 tenGigE17  17 10000
-Ethernet17 18 tenGigE18  18 10000
-Ethernet18 19 tenGigE19  19 10000
-Ethernet19 20 tenGigE20  20 10000
-Ethernet20 21 tenGigE21  21 10000
-Ethernet21 22 tenGigE22  22 10000
-Ethernet22 23 tenGigE23  23 10000
-Ethernet23 24 tenGigE24  24 10000
-Ethernet24 53 tenGigE25  25 10000
-Ethernet25 54 tenGigE26  26 10000
-Ethernet26 55 tenGigE27  27 10000
-Ethernet27 56 tenGigE28  28 10000
-Ethernet28 57 tenGigE29  29 10000
-Ethernet29 58 tenGigE30  30 10000
-Ethernet30 59 tenGigE31  31 10000
-Ethernet31 60 tenGigE32  32 10000
-Ethernet32 61 tenGigE33  33 10000
-Ethernet33 62 tenGigE34  34 10000
-Ethernet34 63 tenGigE35  35 10000
-Ethernet35 64 tenGigE36  36 10000
-Ethernet36 65 tenGigE37  37 10000
-Ethernet37 66 tenGigE38  38 10000
-Ethernet38 67 tenGigE39  39 10000
-Ethernet39 68 tenGigE40  40 10000
-Ethernet40 69 tenGigE41  41 10000
-Ethernet41 70 tenGigE42  42 10000
-Ethernet42 71 tenGigE43  43 10000
-Ethernet43 72 tenGigE44  44 10000
-Ethernet44 73 tenGigE45  45 10000
-Ethernet45 74 tenGigE46  46 10000
-Ethernet46 75 tenGigE47  47 10000
-Ethernet47 76 tenGigE48  48 10000
-Ethernet48 29,30,31,32 hundredGigE49 49 100000
-Ethernet52 33,34,35,36 hundredGigE50 53 100000
-Ethernet56 37,38,39,40 hundredGigE51 57 100000
-Ethernet60 41,42,43,44 hundredGigE52 61 100000
-Ethernet64 45,46,47,48 hundredGigE53 65 100000
-Ethernet68 49,50,51,52 hundredGigE54 69 100000
+# name lanes alias index speed
+Ethernet0 1 tenGigE1  1 10000
+Ethernet1 2 tenGigE2  2 10000
+Ethernet2 3 tenGigE3  3 10000
+Ethernet3 4 tenGigE4  4 10000
+Ethernet4 5 tenGigE5  5 10000
+Ethernet5 6 tenGigE6  6 10000
+Ethernet6 7 tenGigE7  7 10000
+Ethernet7 8 tenGigE8  8 10000
+Ethernet8 9 tenGigE9  9 10000
+Ethernet9 10 tenGigE10  10 10000
+Ethernet10 11 tenGigE11  11 10000
+Ethernet11 12 tenGigE12  12 10000
+Ethernet12 13 tenGigE13  13 10000
+Ethernet13 14 tenGigE14  14 10000
+Ethernet14 15 tenGigE15  15 10000
+Ethernet15 16 tenGigE16  16 10000
+Ethernet16 17 tenGigE17  17 10000
+Ethernet17 18 tenGigE18  18 10000
+Ethernet18 19 tenGigE19  19 10000
+Ethernet19 20 tenGigE20  20 10000
+Ethernet20 21 tenGigE21  21 10000
+Ethernet21 22 tenGigE22  22 10000
+Ethernet22 23 tenGigE23  23 10000
+Ethernet23 24 tenGigE24  24 10000
+Ethernet24 53 tenGigE25  25 10000
+Ethernet25 54 tenGigE26  26 10000
+Ethernet26 55 tenGigE27  27 10000
+Ethernet27 56 tenGigE28  28 10000
+Ethernet28 57 tenGigE29  29 10000
+Ethernet29 58 tenGigE30  30 10000
+Ethernet30 59 tenGigE31  31 10000
+Ethernet31 60 tenGigE32  32 10000
+Ethernet32 61 tenGigE33  33 10000
+Ethernet33 62 tenGigE34  34 10000
+Ethernet34 63 tenGigE35  35 10000
+Ethernet35 64 tenGigE36  36 10000
+Ethernet36 65 tenGigE37  37 10000
+Ethernet37 66 tenGigE38  38 10000
+Ethernet38 67 tenGigE39  39 10000
+Ethernet39 68 tenGigE40  40 10000
+Ethernet40 69 tenGigE41  41 10000
+Ethernet41 70 tenGigE42  42 10000
+Ethernet42 71 tenGigE43  43 10000
+Ethernet43 72 tenGigE44  44 10000
+Ethernet44 73 tenGigE45  45 10000
+Ethernet45 74 tenGigE46  46 10000
+Ethernet46 75 tenGigE47  47 10000
+Ethernet47 76 tenGigE48  48 10000
+Ethernet48 37,38,39,40 hundredGigE49 49  100000
+Ethernet52 29,30,31,32 hundredGigE50 53  100000
+Ethernet56 33,34,35,36 hundredGigE51 57  100000
+Ethernet60 49,50,51,52 hundredGigE52 61  100000
+Ethernet64 45,46,47,48 hundredGigE53 65  100000
+Ethernet68 41,42,43,44 hundredGigE54 69  100000

device/accton/x86_64-accton_as7312_54xs-r0/Accton-AS7312-54XS/port_config.ini

@@ -1,55 +1,55 @@
-# name lanes alias index
-Ethernet0 41 twentyfiveGigE1 0
-Ethernet1 42 twentyfiveGigE2 1
-Ethernet2 43 twentyfiveGigE3 2
-Ethernet3 44 twentyfiveGigE4 3
-Ethernet4 49 twentyfiveGigE5 4
-Ethernet5 50 twentyfiveGigE6 5
-Ethernet6 51 twentyfiveGigE7 6
-Ethernet7 52 twentyfiveGigE8 7
-Ethernet8 53 twentyfiveGigE9 8
-Ethernet9 54 twentyfiveGigE10 9
-Ethernet10 55 twentyfiveGigE11 10
-Ethernet11 56 twentyfiveGigE12 11
-Ethernet12 65 twentyfiveGigE13 12
-Ethernet13 66 twentyfiveGigE14 13
-Ethernet14 67 twentyfiveGigE15 14
-Ethernet15 68 twentyfiveGigE16 15
-Ethernet16 33 twentyfiveGigE17 16
-Ethernet17 34 twentyfiveGigE18 17
-Ethernet18 35 twentyfiveGigE19 18
-Ethernet19 36 twentyfiveGigE20 19
-Ethernet20 37 twentyfiveGigE21 20
-Ethernet21 38 twentyfiveGigE22 21
-Ethernet22 39 twentyfiveGigE23 22
-Ethernet23 40 twentyfiveGigE24 23
-Ethernet24 69 twentyfiveGigE25 24
-Ethernet25 70 twentyfiveGigE26 25
-Ethernet26 71 twentyfiveGigE27 26
-Ethernet27 72 twentyfiveGigE28 27
-Ethernet28 81 twentyfiveGigE29 28
-Ethernet29 82 twentyfiveGigE30 29
-Ethernet30 83 twentyfiveGigE31 30
-Ethernet31 84 twentyfiveGigE32 31
-Ethernet32 85 twentyfiveGigE33 32
-Ethernet33 86 twentyfiveGigE34 33
-Ethernet34 87 twentyfiveGigE35 34
-Ethernet35 88 twentyfiveGigE36 35
-Ethernet36 97 twentyfiveGigE37 36
-Ethernet37 98 twentyfiveGigE38 37
-Ethernet38 99 twentyfiveGigE39 38
-Ethernet39 100 twentyfiveGigE40 39
-Ethernet40 101 twentyfiveGigE41 40
-Ethernet41 102 twentyfiveGigE42 41
-Ethernet42 103 twentyfiveGigE43 42
-Ethernet43 104 twentyfiveGigE44 43
-Ethernet44 105 twentyfiveGigE45 44
-Ethernet45 106 twentyfiveGigE46 45
-Ethernet46 107 twentyfiveGigE47 46
-Ethernet47 108 twentyfiveGigE48 47
-Ethernet48 5,6,7,8 hundredGigE49 48
-Ethernet52 1,2,3,4 hundredGigE50 52
-Ethernet56 109,110,111,112 hundredGigE51 56
-Ethernet60 21,22,23,24 hundredGigE52 60
-Ethernet64 9,10,11,12 hundredGigE53 64
-Ethernet68 117,118,119,120 hundredGigE54 68
+# name lanes alias index speed
+Ethernet0 41 twentyfiveGigE1 1 25000
+Ethernet1 42 twentyfiveGigE2 2 25000
+Ethernet2 43 twentyfiveGigE3 3 25000
+Ethernet3 44 twentyfiveGigE4 4 25000
+Ethernet4 49 twentyfiveGigE5 5 25000
+Ethernet5 50 twentyfiveGigE6 6 25000
+Ethernet6 51 twentyfiveGigE7 7 25000
+Ethernet7 52 twentyfiveGigE8 8 25000
+Ethernet8 53 twentyfiveGigE9 9 25000
+Ethernet9 54 twentyfiveGigE10 10 25000
+Ethernet10 55 twentyfiveGigE11 11 25000
+Ethernet11 56 twentyfiveGigE12 12 25000
+Ethernet12 65 twentyfiveGigE13 13 25000
+Ethernet13 66 twentyfiveGigE14 14 25000
+Ethernet14 67 twentyfiveGigE15 15 25000
+Ethernet15 68 twentyfiveGigE16 16 25000
+Ethernet16 33 twentyfiveGigE17 17 25000
+Ethernet17 34 twentyfiveGigE18 18 25000
+Ethernet18 35 twentyfiveGigE19 19 25000
+Ethernet19 36 twentyfiveGigE20 20 25000
+Ethernet20 37 twentyfiveGigE21 21 25000
+Ethernet21 38 twentyfiveGigE22 22 25000
+Ethernet22 39 twentyfiveGigE23 23 25000
+Ethernet23 40 twentyfiveGigE24 24 25000
+Ethernet24 69 twentyfiveGigE25 25 25000
+Ethernet25 70 twentyfiveGigE26 26 25000
+Ethernet26 71 twentyfiveGigE27 27 25000
+Ethernet27 72 twentyfiveGigE28 28 25000
+Ethernet28 81 twentyfiveGigE29 29 25000
+Ethernet29 82 twentyfiveGigE30 30 25000
+Ethernet30 83 twentyfiveGigE31 31 25000
+Ethernet31 84 twentyfiveGigE32 32 25000
+Ethernet32 85 twentyfiveGigE33 33 25000
+Ethernet33 86 twentyfiveGigE34 34 25000
+Ethernet34 87 twentyfiveGigE35 35 25000
+Ethernet35 88 twentyfiveGigE36 36 25000
+Ethernet36 97 twentyfiveGigE37 37 25000
+Ethernet37 98 twentyfiveGigE38 38 25000
+Ethernet38 99 twentyfiveGigE39 39 25000
+Ethernet39 100 twentyfiveGigE40 40 25000
+Ethernet40 101 twentyfiveGigE41 41 25000
+Ethernet41 102 twentyfiveGigE42 42 25000
+Ethernet42 103 twentyfiveGigE43 43 25000
+Ethernet43 104 twentyfiveGigE44 44 25000
+Ethernet44 105 twentyfiveGigE45 45 25000
+Ethernet45 106 twentyfiveGigE46 46 25000
+Ethernet46 107 twentyfiveGigE47 47 25000
+Ethernet47 108 twentyfiveGigE48 48 25000
+Ethernet48 5,6,7,8 hundredGigE49 49 100000
+Ethernet52 1,2,3,4 hundredGigE50 50 100000
+Ethernet56 109,110,111,112 hundredGigE51 51 100000
+Ethernet60 21,22,23,24 hundredGigE52 52 100000
+Ethernet64 9,10,11,12 hundredGigE53 53 100000
+Ethernet68 117,118,119,120 hundredGigE54 54 100000