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

Commit 1e45d9f

Browse files
jeffyin-delljeffyin-dell
authored
Merge pull request #28 from Azure/master
Merging latest changes from Azure - 2019-08-13
2 parents 1969e2c + 88dc7ad commit 1e45d9f

188 files changed

Lines changed: 15227 additions & 4058 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎build_debian.sh‎

Lines changed: 15 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -213,9 +213,11 @@ sudo LANG=C chroot $FILESYSTEM_ROOT useradd -G sudo,docker $USERNAME -c "$DEFAUL
213213
## Create password for the default user
214214
echo "$USERNAME:$PASSWORD" | sudo LANG=C chroot $FILESYSTEM_ROOT chpasswd
215215

216-
## Pre-install hardware drivers
217-
sudo LANG=C chroot $FILESYSTEM_ROOT apt-get -y install \
218-
firmware-linux-nonfree
216+
if [[ $CONFIGURED_ARCH == amd64 ]]; then
217+
## Pre-install hardware drivers
218+
sudo LANG=C chroot $FILESYSTEM_ROOT apt-get -y install \
219+
firmware-linux-nonfree
220+
fi
219221

220222
## Pre-install the fundamental packages
221223
## Note: gdisk is needed for sgdisk in install.sh
@@ -267,9 +269,14 @@ sudo LANG=C DEBIAN_FRONTEND=noninteractive chroot $FILESYSTEM_ROOT apt-get -y in
267269
tcptraceroute \
268270
mtr-tiny \
269271
locales \
272+
cgroup-tools
273+
274+
if [[ $CONFIGURED_ARCH == amd64 ]]; then
275+
## Pre-install the fundamental packages for amd64 (x86)
276+
sudo LANG=C DEBIAN_FRONTEND=noninteractive chroot $FILESYSTEM_ROOT apt-get -y install \
270277
flashrom \
271-
cgroup-tools \
272278
mcelog
279+
fi
273280

274281
#Adds a locale to a debian system in non-interactive mode
275282
sudo sed -i '/^#.* en_US.* /s/^#//' $FILESYSTEM_ROOT/etc/locale.gen && \
@@ -402,8 +409,10 @@ set /files/etc/sysctl.conf/net.core.rmem_max 2097152
402409
set /files/etc/sysctl.conf/net.core.wmem_max 2097152
403410
" -r $FILESYSTEM_ROOT
404411

405-
# Configure mcelog to log machine checks to syslog
406-
sudo sed -i 's/^#syslog = yes/syslog = yes/' $FILESYSTEM_ROOT/etc/mcelog/mcelog.conf
412+
if [[ $CONFIGURED_ARCH == amd64 ]]; then
413+
# Configure mcelog to log machine checks to syslog
414+
sudo sed -i 's/^#syslog = yes/syslog = yes/' $FILESYSTEM_ROOT/etc/mcelog/mcelog.conf
415+
fi
407416

408417
## docker-py is needed by Ansible docker module
409418
sudo https_proxy=$https_proxy LANG=C chroot $FILESYSTEM_ROOT easy_install pip

‎device/accton/x86_64-accton_as7116_54x-r0/Accton-AS7116-54X/buffers_defaults_t0.j2‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
"ingress_lossless_pool": {
2020
"size": "{{ ingress_lossless_pool_size }}",
2121
"type": "ingress",
22-
"mode": "dynamic"
22+
"mode": "static"
2323
},
2424
"ingress_lossy_pool": {
2525
"size": "{{ ingress_lossy_pool_size }}",
@@ -29,7 +29,7 @@
2929
"egress_lossless_pool": {
3030
"size": "{{ egress_lossless_pool_size }}",
3131
"type": "egress",
32-
"mode": "dynamic"
32+
"mode": "static"
3333
},
3434
"egress_lossy_pool": {
3535
"size": "{{ egress_lossy_pool_size }}",

‎device/accton/x86_64-accton_as7116_54x-r0/Accton-AS7116-54X/buffers_defaults_t1.j2‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
"ingress_lossless_pool": {
2020
"size": "{{ ingress_lossless_pool_size }}",
2121
"type": "ingress",
22-
"mode": "dynamic"
22+
"mode": "static"
2323
},
2424
"ingress_lossy_pool": {
2525
"size": "{{ ingress_lossy_pool_size }}",
@@ -29,7 +29,7 @@
2929
"egress_lossless_pool": {
3030
"size": "{{ egress_lossless_pool_size }}",
3131
"type": "egress",
32-
"mode": "dynamic"
32+
"mode": "static"
3333
},
3434
"egress_lossy_pool": {
3535
"size": "{{ egress_lossy_pool_size }}",

‎device/accton/x86_64-accton_as7116_54x-r0/Accton-AS7116-54X/nephos_dac.dsh‎

Lines changed: 404 additions & 0 deletions
Large diffs are not rendered by default.

‎device/accton/x86_64-accton_as7116_54x-r0/Accton-AS7116-54X/nephos_opt.dsh‎

Lines changed: 404 additions & 0 deletions
Large diffs are not rendered by default.

‎device/accton/x86_64-accton_as7116_54x-r0/Accton-AS7116-54X/port_config.ini‎

Lines changed: 55 additions & 55 deletions
Original file line numberDiff line numberDiff line change
@@ -1,55 +1,55 @@
1-
# name lanes alias index
2-
Ethernet0 8 Ethernet1/1 0
3-
Ethernet1 9 Ethernet2/1 1
4-
Ethernet2 10 Ethernet3/1 2
5-
Ethernet3 11 Ethernet4/1 3
6-
Ethernet4 12 Ethernet5/1 4
7-
Ethernet5 13 Ethernet6/1 5
8-
Ethernet6 14 Ethernet7/1 6
9-
Ethernet7 15 Ethernet8/1 7
10-
Ethernet8 16 Ethernet9/1 8
11-
Ethernet9 17 Ethernet10/1 9
12-
Ethernet10 18 Ethernet11/1 10
13-
Ethernet11 19 Ethernet12/1 11
14-
Ethernet12 20 Ethernet13/1 12
15-
Ethernet13 21 Ethernet14/1 13
16-
Ethernet14 22 Ethernet15/1 14
17-
Ethernet15 23 Ethernet16/1 15
18-
Ethernet16 32 Ethernet17/1 16
19-
Ethernet17 33 Ethernet18/1 17
20-
Ethernet18 34 Ethernet19/1 18
21-
Ethernet19 35 Ethernet20/1 19
22-
Ethernet20 40 Ethernet21/1 20
23-
Ethernet21 41 Ethernet22/1 21
24-
Ethernet22 42 Ethernet23/1 22
25-
Ethernet23 43 Ethernet24/1 23
26-
Ethernet24 48 Ethernet25/1 24
27-
Ethernet25 49 Ethernet26/1 25
28-
Ethernet26 50 Ethernet27/1 26
29-
Ethernet27 51 Ethernet28/1 27
30-
Ethernet28 56 Ethernet29/1 28
31-
Ethernet29 57 Ethernet30/1 29
32-
Ethernet30 58 Ethernet31/1 30
33-
Ethernet31 59 Ethernet32/1 31
34-
Ethernet32 64 Ethernet33/1 32
35-
Ethernet33 65 Ethernet34/1 33
36-
Ethernet34 66 Ethernet35/1 34
37-
Ethernet35 67 Ethernet36/1 35
38-
Ethernet36 68 Ethernet37/1 36
39-
Ethernet37 69 Ethernet38/1 37
40-
Ethernet38 70 Ethernet39/1 38
41-
Ethernet39 71 Ethernet40/1 39
42-
Ethernet40 72 Ethernet41/1 40
43-
Ethernet41 73 Ethernet42/1 41
44-
Ethernet42 74 Ethernet43/1 42
45-
Ethernet43 75 Ethernet44/1 43
46-
Ethernet44 76 Ethernet45/1 44
47-
Ethernet45 77 Ethernet46/1 45
48-
Ethernet46 78 Ethernet47/1 46
49-
Ethernet47 79 Ethernet48/1 47
50-
Ethernet48 84,85,86,87 Ethernet49/1 48
51-
Ethernet49 80,81,82,83 Ethernet50/1 49
52-
Ethernet50 104,105,106,107 Ethernet51/1 50
53-
Ethernet51 108,109,110,111 Ethernet52/1 51
54-
Ethernet52 112,113,114,115 Ethernet53/1 52
55-
Ethernet53 116,117,118,119 Ethernet54/1 53
1+
# name lanes alias index speed
2+
Ethernet0 8 Ethernet1/1 0 25000
3+
Ethernet1 9 Ethernet2/1 1 25000
4+
Ethernet2 10 Ethernet3/1 2 25000
5+
Ethernet3 11 Ethernet4/1 3 25000
6+
Ethernet4 12 Ethernet5/1 4 25000
7+
Ethernet5 13 Ethernet6/1 5 25000
8+
Ethernet6 14 Ethernet7/1 6 25000
9+
Ethernet7 15 Ethernet8/1 7 25000
10+
Ethernet8 16 Ethernet9/1 8 25000
11+
Ethernet9 17 Ethernet10/1 9 25000
12+
Ethernet10 18 Ethernet11/1 10 25000
13+
Ethernet11 19 Ethernet12/1 11 25000
14+
Ethernet12 20 Ethernet13/1 12 25000
15+
Ethernet13 21 Ethernet14/1 13 25000
16+
Ethernet14 22 Ethernet15/1 14 25000
17+
Ethernet15 23 Ethernet16/1 15 25000
18+
Ethernet16 32 Ethernet17/1 16 25000
19+
Ethernet17 33 Ethernet18/1 17 25000
20+
Ethernet18 34 Ethernet19/1 18 25000
21+
Ethernet19 35 Ethernet20/1 19 25000
22+
Ethernet20 40 Ethernet21/1 20 25000
23+
Ethernet21 41 Ethernet22/1 21 25000
24+
Ethernet22 42 Ethernet23/1 22 25000
25+
Ethernet23 43 Ethernet24/1 23 25000
26+
Ethernet24 48 Ethernet25/1 24 25000
27+
Ethernet25 49 Ethernet26/1 25 25000
28+
Ethernet26 50 Ethernet27/1 26 25000
29+
Ethernet27 51 Ethernet28/1 27 25000
30+
Ethernet28 56 Ethernet29/1 28 25000
31+
Ethernet29 57 Ethernet30/1 29 25000
32+
Ethernet30 58 Ethernet31/1 30 25000
33+
Ethernet31 59 Ethernet32/1 31 25000
34+
Ethernet32 64 Ethernet33/1 32 25000
35+
Ethernet33 65 Ethernet34/1 33 25000
36+
Ethernet34 66 Ethernet35/1 34 25000
37+
Ethernet35 67 Ethernet36/1 35 25000
38+
Ethernet36 68 Ethernet37/1 36 25000
39+
Ethernet37 69 Ethernet38/1 37 25000
40+
Ethernet38 70 Ethernet39/1 38 25000
41+
Ethernet39 71 Ethernet40/1 39 25000
42+
Ethernet40 72 Ethernet41/1 40 25000
43+
Ethernet41 73 Ethernet42/1 41 25000
44+
Ethernet42 74 Ethernet43/1 42 25000
45+
Ethernet43 75 Ethernet44/1 43 25000
46+
Ethernet44 76 Ethernet45/1 44 25000
47+
Ethernet45 77 Ethernet46/1 45 25000
48+
Ethernet46 78 Ethernet47/1 46 25000
49+
Ethernet47 79 Ethernet48/1 47 25000
50+
Ethernet48 84,85,86,87 Ethernet49/1 48 100000
51+
Ethernet49 80,81,82,83 Ethernet50/1 49 100000
52+
Ethernet50 104,105,106,107 Ethernet51/1 50 100000
53+
Ethernet51 108,109,110,111 Ethernet52/1 51 100000
54+
Ethernet52 112,113,114,115 Ethernet53/1 52 100000
55+
Ethernet53 116,117,118,119 Ethernet54/1 53 100000

‎device/accton/x86_64-accton_as7116_54x-r0/Accton-AS7116-54X/port_config.nps‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -410,5 +410,5 @@ port set property portlist=48-53 medium-type=sr4
410410
port set property portlist=129-130 medium-type=kr
411411
port set adver portlist=129-130 speed-10g-kr
412412
port set property portlist=129-130 an=enable
413-
port set property portlist=0-53,129-130 admin=enable
414-
413+
port set property unit=0 portlist=129-130 admin=enable
414+
port set property unit=0 portlist=0-53 admin=disable

device/accton/x86_64-accton_as7116_54x-r0/led_proc_init.nps renamed to device/accton/x86_64-accton_as7116_54x-r0/Accton-AS7116-54X/proc_init.nps

File renamed without changes.

‎device/accton/x86_64-accton_as7116_54x-r0/Accton-AS7116-54X/sai.profile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
SAI_INIT_CONFIG_FILE=/usr/share/sonic/platform/led_proc_init.nps
2-
SAI_DSH_CONFIG_FILE=/usr/share/sonic/hwsku/port_config.nps
1+
SAI_INIT_CONFIG_FILE=/usr/share/sonic/hwsku/proc_init.nps
2+
SAI_DSH_CONFIG_FILE=/usr/share/sonic/hwsku/port_config.nps

‎device/accton/x86_64-accton_as7116_54x-r0/default_sku‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
Accton-AS7116-54X t1
1+
Accton-AS7116-54X t1

0 commit comments

Comments
 (0)