Skip to content
This repository has been archived by the owner on Mar 1, 2023. It is now read-only.

Commit

Permalink
Merge pull request #21 from Azure/master
Browse files Browse the repository at this point in the history 
Merging latest changes from Azure/sonic-buildimage:master
  • Loading branch information
@nirenjan
nirenjan authored Jul 25, 2019
2 parents e67219a + 2c6cd62 commit 46570d1
Show file tree
Hide file tree
Showing 121 changed files with 13,350 additions and 1,703 deletions.
2 changes: 1 addition & 1 deletion Makefile.work
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
10 changes: 7 additions & 3 deletions build_debian.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -204,7 +204,7 @@ 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 \
ifmetric \
iproute2 \
bridge-utils \
isc-dhcp-client \
Expand Down Expand Up @@ -248,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 && \
Expand Down Expand Up @@ -379,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'
Expand Down
146 changes: 73 additions & 73 deletions device/accton/x86_64-accton_as5712_54x-r0/Accton-AS5712-54X/port_config.ini
View file
Original file line number Diff line number Diff line change
@@ -1,73 +1,73 @@
# name lanes alias index
Ethernet0 13 tenGigE0 0
Ethernet1 14 tenGigE1 1
Ethernet2 15 tenGigE2 2
Ethernet3 16 tenGigE3 3
Ethernet4 21 tenGigE4 4
Ethernet5 22 tenGigE5 5
Ethernet6 23 tenGigE6 6
Ethernet7 24 tenGigE7 7
Ethernet8 25 tenGigE8 8
Ethernet9 26 tenGigE9 9
Ethernet10 27 tenGigE10 10
Ethernet11 28 tenGigE11 11
Ethernet12 29 tenGigE12 12
Ethernet13 30 tenGigE13 13
Ethernet14 31 tenGigE14 14
Ethernet15 32 tenGigE15 15
Ethernet16 45 tenGigE16 16
Ethernet17 46 tenGigE17 17
Ethernet18 47 tenGigE18 18
Ethernet19 48 tenGigE19 19
Ethernet20 49 tenGigE20 20
Ethernet21 50 tenGigE21 21
Ethernet22 51 tenGigE22 22
Ethernet23 52 tenGigE23 23
Ethernet24 53 tenGigE24 24
Ethernet25 54 tenGigE25 25
Ethernet26 55 tenGigE26 26
Ethernet27 56 tenGigE27 27
Ethernet28 57 tenGigE28 28
Ethernet29 58 tenGigE29 29
Ethernet30 59 tenGigE30 30
Ethernet31 60 tenGigE31 31
Ethernet32 61 tenGigE32 32
Ethernet33 62 tenGigE33 33
Ethernet34 63 tenGigE34 34
Ethernet35 64 tenGigE35 35
Ethernet36 65 tenGigE36 36
Ethernet37 66 tenGigE37 37
Ethernet38 67 tenGigE38 38
Ethernet39 68 tenGigE39 39
Ethernet40 69 tenGigE40 40
Ethernet41 70 tenGigE41 41
Ethernet42 71 tenGigE42 42
Ethernet43 72 tenGigE43 43
Ethernet44 73 tenGigE44 44
Ethernet45 74 tenGigE45 45
Ethernet46 75 tenGigE46 46
Ethernet47 76 tenGigE47 47
Ethernet48 97 tenGigE48 48
Ethernet49 98 tenGigE49 49
Ethernet50 99 tenGigE50 50
Ethernet51 100 tenGigE51 51
Ethernet52 101 tenGigE52 52
Ethernet53 102 tenGigE53 53
Ethernet54 103 tenGigE54 54
Ethernet55 104 tenGigE55 55
Ethernet56 81 tenGigE56 56
Ethernet57 82 tenGigE57 57
Ethernet58 83 tenGigE58 58
Ethernet59 84 tenGigE59 59
Ethernet60 105 tenGigE60 60
Ethernet61 106 tenGigE61 61
Ethernet62 107 tenGigE62 62
Ethernet63 108 tenGigE63 63
Ethernet64 109 tenGigE64 64
Ethernet65 110 tenGigE65 65
Ethernet66 111 tenGigE66 66
Ethernet67 112 tenGigE67 67
Ethernet68 77 tenGigE68 68
Ethernet69 78 tenGigE69 69
Ethernet70 79 tenGigE70 70
Ethernet71 80 tenGigE71 71
# name lanes alias index speed
Ethernet0 13 tenGigE0 1 10000
Ethernet1 14 tenGigE1 2 10000
Ethernet2 15 tenGigE2 3 10000
Ethernet3 16 tenGigE3 4 10000
Ethernet4 21 tenGigE4 5 10000
Ethernet5 22 tenGigE5 6 10000
Ethernet6 23 tenGigE6 7 10000
Ethernet7 24 tenGigE7 8 10000
Ethernet8 25 tenGigE8 9 10000
Ethernet9 26 tenGigE9 10 10000
Ethernet10 27 tenGigE10 11 10000
Ethernet11 28 tenGigE11 12 10000
Ethernet12 29 tenGigE12 13 10000
Ethernet13 30 tenGigE13 14 10000
Ethernet14 31 tenGigE14 15 10000
Ethernet15 32 tenGigE15 16 10000
Ethernet16 45 tenGigE16 17 10000
Ethernet17 46 tenGigE17 18 10000
Ethernet18 47 tenGigE18 19 10000
Ethernet19 48 tenGigE19 20 10000
Ethernet20 49 tenGigE20 21 10000
Ethernet21 50 tenGigE21 22 10000
Ethernet22 51 tenGigE22 23 10000
Ethernet23 52 tenGigE23 24 10000
Ethernet24 53 tenGigE24 25 10000
Ethernet25 54 tenGigE25 26 10000
Ethernet26 55 tenGigE26 27 10000
Ethernet27 56 tenGigE27 28 10000
Ethernet28 57 tenGigE28 29 10000
Ethernet29 58 tenGigE29 30 10000
Ethernet30 59 tenGigE30 31 10000
Ethernet31 60 tenGigE31 32 10000
Ethernet32 61 tenGigE32 33 10000
Ethernet33 62 tenGigE33 34 10000
Ethernet34 63 tenGigE34 35 10000
Ethernet35 64 tenGigE35 36 10000
Ethernet36 65 tenGigE36 37 10000
Ethernet37 66 tenGigE37 38 10000
Ethernet38 67 tenGigE38 39 10000
Ethernet39 68 tenGigE39 40 10000
Ethernet40 69 tenGigE40 41 10000
Ethernet41 70 tenGigE41 42 10000
Ethernet42 71 tenGigE42 43 10000
Ethernet43 72 tenGigE43 44 10000
Ethernet44 73 tenGigE44 45 10000
Ethernet45 74 tenGigE45 46 10000
Ethernet46 75 tenGigE46 47 10000
Ethernet47 76 tenGigE47 48 10000
Ethernet48 97 tenGigE48 49 10000
Ethernet49 98 tenGigE49 49 10000
Ethernet50 99 tenGigE50 49 10000
Ethernet51 100 tenGigE51 49 10000
Ethernet52 101 tenGigE52 50 10000
Ethernet53 102 tenGigE53 50 10000
Ethernet54 103 tenGigE54 50 10000
Ethernet55 104 tenGigE55 50 10000
Ethernet56 81 tenGigE56 51 10000
Ethernet57 82 tenGigE57 51 10000
Ethernet58 83 tenGigE58 51 10000
Ethernet59 84 tenGigE59 51 10000
Ethernet60 105 tenGigE60 52 10000
Ethernet61 106 tenGigE61 52 10000
Ethernet62 107 tenGigE62 52 10000
Ethernet63 108 tenGigE63 52 10000
Ethernet64 109 tenGigE64 53 10000
Ethernet65 110 tenGigE65 53 10000
Ethernet66 111 tenGigE66 53 10000
Ethernet67 112 tenGigE67 53 10000
Ethernet68 77 tenGigE68 54 10000
Ethernet69 78 tenGigE69 54 10000
Ethernet70 79 tenGigE70 54 10000
Ethernet71 80 tenGigE71 54 10000
Loading

0 comments on commit 46570d1

Please sign in to comment.