Skip to content

Commit a0be257

Browse files
miatttaomiatttao
authored
Merge branch 'sonic-net:master' into mia-add-yang-new
2 parents c1535ee + ab88fe0 commit a0be257

File tree

502 files changed

+47223
-11426
lines changed

Some content is hidden

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

502 files changed

+47223
-11426
lines changed

‎build_debian.sh

+13-2
Original file line numberDiff line numberDiff line change
@@ -169,7 +169,7 @@ sudo dpkg --root=$FILESYSTEM_ROOT -i $debs_path/linux-image-${LINUX_KERNEL_VERSI
169169
sudo LANG=C DEBIAN_FRONTEND=noninteractive chroot $FILESYSTEM_ROOT apt-get -y install -f
170170
sudo LANG=C DEBIAN_FRONTEND=noninteractive chroot $FILESYSTEM_ROOT apt-get -y install acl
171171
if [[ $CONFIGURED_ARCH == amd64 ]]; then
172-
sudo LANG=C DEBIAN_FRONTEND=noninteractive chroot $FILESYSTEM_ROOT apt-get -y install dmidecode hdparm
172+
sudo LANG=C DEBIAN_FRONTEND=noninteractive chroot $FILESYSTEM_ROOT apt-get -y install hdparm
173173
fi
174174

175175
## Update initramfs for booting with squashfs+overlay
@@ -379,6 +379,7 @@ sudo LANG=C DEBIAN_FRONTEND=noninteractive chroot $FILESYSTEM_ROOT apt-get -y in
379379
haveged \
380380
fdisk \
381381
gpg \
382+
dmidecode \
382383
jq \
383384
auditd \
384385
linux-perf \
@@ -391,6 +392,12 @@ sudo LANG=C DEBIAN_FRONTEND=noninteractive chroot $FILESYSTEM_ROOT apt-get -y in
391392
zstd \
392393
nvme-cli
393394

395+
sudo cp files/initramfs-tools/pzstd $FILESYSTEM_ROOT/etc/initramfs-tools/hooks/pzstd
396+
sudo chmod +x $FILESYSTEM_ROOT/etc/initramfs-tools/hooks/pzstd
397+
398+
sudo cp files/initramfs-tools/file $FILESYSTEM_ROOT/etc/initramfs-tools/hooks/file
399+
sudo chmod +x $FILESYSTEM_ROOT/etc/initramfs-tools/hooks/file
400+
394401
# Have systemd create the auditd log directory
395402
sudo mkdir -p ${FILESYSTEM_ROOT}/etc/systemd/system/auditd.service.d
396403
sudo tee ${FILESYSTEM_ROOT}/etc/systemd/system/auditd.service.d/log-directory.conf >/dev/null <<EOF
@@ -854,7 +861,11 @@ if [[ $MULTIARCH_QEMU_ENVIRON == y || $CROSS_BUILD_ENVIRON == y ]]; then
854861
fi
855862

856863
## Compress docker files
857-
pushd $FILESYSTEM_ROOT && sudo tar -I pigz -cf $OLDPWD/$FILESYSTEM_DOCKERFS -C ${DOCKERFS_PATH}var/lib/docker .; popd
864+
if [ "$BUILD_REDUCE_IMAGE_SIZE" = "y" ]; then
865+
pushd $FILESYSTEM_ROOT && sudo tar -I pzstd -cf $OLDPWD/$FILESYSTEM_DOCKERFS -C ${DOCKERFS_PATH}var/lib/docker .; popd
866+
else
867+
pushd $FILESYSTEM_ROOT && sudo tar -I pigz -cf $OLDPWD/$FILESYSTEM_DOCKERFS -C ${DOCKERFS_PATH}var/lib/docker .; popd
868+
fi
858869

859870
## Compress together with /boot, /var/lib/docker and $PLATFORM_DIR as an installer payload zip file
860871
pushd $FILESYSTEM_ROOT && sudo tar -I pigz -cf platform.tar.gz -C $PLATFORM_DIR . && sudo zip -n .gz $OLDPWD/$INSTALLER_PAYLOAD -r boot/ platform.tar.gz; popd

‎device/arista/x86_64-arista_7050cx3_32s/Arista-7050CX3-32S-C28S4/config.bcm.j2

+20-20
Original file line numberDiff line numberDiff line change
@@ -401,7 +401,7 @@ phy_chain_tx_polarity_flip_physical{97.0}=0x1
401401
phy_chain_tx_polarity_flip_physical{98.0}=0x1
402402
phy_chain_tx_polarity_flip_physical{99.0}=0x1
403403
portmap_103=101:100
404-
portmap_107=105:10
404+
portmap_107=105:100
405405
portmap_1=1:100
406406
portmap_111=109:100
407407
portmap_115=113:100
@@ -411,25 +411,25 @@ portmap_127=125:100
411411
portmap_130=128:10:m
412412
portmap_13=13:100
413413
portmap_17=17:100
414-
portmap_21=21:10
414+
portmap_21=21:100
415415
portmap_25=25:100
416416
portmap_29=29:100
417417
portmap_33=33:100
418418
portmap_37=37:100
419-
portmap_41=41:10
419+
portmap_41=41:100
420420
portmap_45=45:100
421421
portmap_49=49:100
422422
portmap_53=53:100
423423
portmap_5=5:100
424-
portmap_57=57:100
425-
portmap_61=61:100
424+
portmap_57=57:10
425+
portmap_61=61:10
426426
portmap_66=129:10:m
427-
portmap_67=65:100
428-
portmap_71=69:100
427+
portmap_67=65:10
428+
portmap_71=69:10
429429
portmap_75=73:100
430430
portmap_79=77:100
431431
portmap_83=81:100
432-
portmap_87=85:10
432+
portmap_87=85:100
433433
portmap_91=89:100
434434
portmap_95=93:100
435435
portmap_9=9:100
@@ -505,34 +505,34 @@ serdes_preemphasis_5=0x104105
505505
serdes_preemphasis_9=0x104105
506506
serdes_preemphasis_13=0x104105
507507
serdes_preemphasis_17=0xd3e05
508-
serdes_driver_current_21=0xe
509-
serdes_preemphasis_21=0x14410a
508+
serdes_preemphasis_21=0xd3e05
510509
serdes_preemphasis_25=0xd3e05
511510
serdes_preemphasis_29=0xb3403
512511
serdes_preemphasis_33=0xb3403
513512
serdes_preemphasis_37=0x93603
514-
serdes_driver_current_41=0xe
515-
serdes_preemphasis_41=0x14410a
513+
serdes_preemphasis_41=0x93603
516514
serdes_preemphasis_45=0x93503
517515
serdes_preemphasis_49=0x62e03
518516
serdes_preemphasis_53=0x63003
519-
serdes_preemphasis_57=0x63003
520-
serdes_preemphasis_61=0x62e03
517+
serdes_driver_current_57=0xe
518+
serdes_preemphasis_57=0x410a
519+
serdes_driver_current_61=0xe
520+
serdes_preemphasis_61=0x410a
521521
serdes_driver_current_66=0xe
522522
serdes_preemphasis_66=0x102804
523-
serdes_preemphasis_67=0x62e03
524-
serdes_preemphasis_71=0x63003
523+
serdes_driver_current_67=0xe
524+
serdes_preemphasis_67=0x410a
525+
serdes_driver_current_71=0xe
526+
serdes_preemphasis_71=0x410a
525527
serdes_preemphasis_75=0x63003
526528
serdes_preemphasis_79=0x62e03
527529
serdes_preemphasis_83=0x93503
528-
serdes_driver_current_87=0xe
529-
serdes_preemphasis_87=0x14410a
530+
serdes_preemphasis_87=0x93603
530531
serdes_preemphasis_91=0x93603
531532
serdes_preemphasis_95=0x93603
532533
serdes_preemphasis_99=0xb3403
533534
serdes_preemphasis_103=0xb3403
534-
serdes_driver_current_107=0xe
535-
serdes_preemphasis_107=0x14410a
535+
serdes_preemphasis_107=0xd3e05
536536
serdes_preemphasis_111=0xd3e05
537537
serdes_preemphasis_115=0xd3e05
538538
serdes_preemphasis_119=0x104105

‎device/arista/x86_64-arista_7050cx3_32s/Arista-7050CX3-32S-C28S4/port_config.ini

+8-8
Original file line numberDiff line numberDiff line change
@@ -3,29 +3,29 @@ Ethernet0 1,2,3,4 Ethernet1/1 1 100000
33
Ethernet4 5,6,7,8 Ethernet2/1 2 100000
44
Ethernet8 9,10,11,12 Ethernet3/1 3 100000
55
Ethernet12 13,14,15,16 Ethernet4/1 4 100000
6-
Ethernet16 21 Ethernet5/1 5 10000
6+
Ethernet16 21,22,23,24 Ethernet5/1 5 100000
77
Ethernet20 17,18,19,20 Ethernet6/1 6 100000
88
Ethernet24 25,26,27,28 Ethernet7/1 7 100000
99
Ethernet28 29,30,31,32 Ethernet8/1 8 100000
1010
Ethernet32 37,38,39,40 Ethernet9/1 9 100000
1111
Ethernet36 33,34,35,36 Ethernet10/1 10 100000
12-
Ethernet40 41 Ethernet11/1 11 10000
12+
Ethernet40 41,42,43,44 Ethernet11/1 11 100000
1313
Ethernet44 45,46,47,48 Ethernet12/1 12 100000
1414
Ethernet48 53,54,55,56 Ethernet13/1 13 100000
1515
Ethernet52 49,50,51,52 Ethernet14/1 14 100000
16-
Ethernet56 57,58,59,60 Ethernet15/1 15 100000
17-
Ethernet60 61,62,63,64 Ethernet16/1 16 100000
18-
Ethernet64 69,70,71,72 Ethernet17/1 17 100000
19-
Ethernet68 65,66,67,68 Ethernet18/1 18 100000
16+
Ethernet56 57 Ethernet15/1 15 10000
17+
Ethernet60 61 Ethernet16/1 16 10000
18+
Ethernet64 69 Ethernet17/1 17 10000
19+
Ethernet68 65 Ethernet18/1 18 10000
2020
Ethernet72 73,74,75,76 Ethernet19/1 19 100000
2121
Ethernet76 77,78,79,80 Ethernet20/1 20 100000
22-
Ethernet80 85 Ethernet21/1 21 10000
22+
Ethernet80 85,86,87,88 Ethernet21/1 21 100000
2323
Ethernet84 81,82,83,84 Ethernet22/1 22 100000
2424
Ethernet88 89,90,91,92 Ethernet23/1 23 100000
2525
Ethernet92 93,94,95,96 Ethernet24/1 24 100000
2626
Ethernet96 101,102,103,104 Ethernet25/1 25 100000
2727
Ethernet100 97,98,99,100 Ethernet26/1 26 100000
28-
Ethernet104 105 Ethernet27/1 27 10000
28+
Ethernet104 105,106,107,108 Ethernet27/1 27 100000
2929
Ethernet108 109,110,111,112 Ethernet28/1 28 100000
3030
Ethernet112 117,118,119,120 Ethernet29/1 29 100000
3131
Ethernet116 113,114,115,116 Ethernet30/1 30 100000

‎device/arista/x86_64-arista_7800r3_48cq2_lc/Arista-7800R3-48CQ2-C48/jr2-a7280cr3-32d4-40x100G.config.bcm

+2
Original file line numberDiff line numberDiff line change
@@ -863,3 +863,5 @@ dma_desc_aggregator_enable_specific_MDB_FEC.BCM8869X=1
863863
sai_pfc_dlr_init_capability=0
864864
sai_default_cpu_tx_tc=7
865865
sai_disable_srcmacqedstmac_ctrl=1
866+
appl_param_active_links_thr_high=58
867+
appl_param_active_links_thr_low=1

‎device/arista/x86_64-arista_7800r3a_36d2_lc/Arista-7800R3A-36D2-C36/0/j2p-a7800r3a-36d-36x400G.config.bcm

+2
Original file line numberDiff line numberDiff line change
@@ -1017,3 +1017,5 @@ xflow_macsec_secure_chan_to_num_secure_assoc_decrypt=2
10171017
sai_pfc_dlr_init_capability=0
10181018
sai_default_cpu_tx_tc=7
10191019
sai_disable_srcmacqedstmac_ctrl=1
1020+
appl_param_active_links_thr_high=91
1021+
appl_param_active_links_thr_low=1

‎device/arista/x86_64-arista_7800r3a_36d2_lc/Arista-7800R3A-36D2-C36/1/j2p-a7800r3a-36d-36x400G.config.bcm

+2
Original file line numberDiff line numberDiff line change
@@ -1017,3 +1017,5 @@ xflow_macsec_secure_chan_to_num_secure_assoc_decrypt=2
10171017
sai_pfc_dlr_init_capability=0
10181018
sai_default_cpu_tx_tc=7
10191019
sai_disable_srcmacqedstmac_ctrl=1
1020+
appl_param_active_links_thr_high=91
1021+
appl_param_active_links_thr_low=1

‎device/arista/x86_64-arista_7800r3a_36d2_lc/Arista-7800R3A-36D2-C72/0/j2p-a7800r3a-36d-36x400G.config.bcm

+2
Original file line numberDiff line numberDiff line change
@@ -1034,3 +1034,5 @@ xflow_macsec_secure_chan_to_num_secure_assoc_decrypt=4
10341034
sai_pfc_dlr_init_capability=0
10351035
sai_default_cpu_tx_tc=7
10361036
sai_disable_srcmacqedstmac_ctrl=1
1037+
appl_param_active_links_thr_high=91
1038+
appl_param_active_links_thr_low=1

‎device/arista/x86_64-arista_7800r3a_36d2_lc/Arista-7800R3A-36D2-C72/1/j2p-a7800r3a-36d-36x400G.config.bcm

+2
Original file line numberDiff line numberDiff line change
@@ -1034,3 +1034,5 @@ xflow_macsec_secure_chan_to_num_secure_assoc_decrypt=4
10341034
sai_pfc_dlr_init_capability=0
10351035
sai_default_cpu_tx_tc=7
10361036
sai_disable_srcmacqedstmac_ctrl=1
1037+
appl_param_active_links_thr_high=91
1038+
appl_param_active_links_thr_low=1

‎device/arista/x86_64-arista_7800r3a_36d2_lc/Arista-7800R3A-36D2-D36/0/j2p-a7800r3a-36d-36x400G.config.bcm

+2
Original file line numberDiff line numberDiff line change
@@ -1054,3 +1054,5 @@ xflow_macsec_secure_chan_to_num_secure_assoc_decrypt=4
10541054
sai_pfc_dlr_init_capability=0
10551055
sai_default_cpu_tx_tc=7
10561056
sai_disable_srcmacqedstmac_ctrl=1
1057+
appl_param_active_links_thr_high=91
1058+
appl_param_active_links_thr_low=1

‎device/arista/x86_64-arista_7800r3a_36d2_lc/Arista-7800R3A-36D2-D36/1/j2p-a7800r3a-36d-36x400G.config.bcm

+2
Original file line numberDiff line numberDiff line change
@@ -1054,3 +1054,5 @@ xflow_macsec_secure_chan_to_num_secure_assoc_decrypt=4
10541054
sai_pfc_dlr_init_capability=0
10551055
sai_default_cpu_tx_tc=7
10561056
sai_disable_srcmacqedstmac_ctrl=1
1057+
appl_param_active_links_thr_high=91
1058+
appl_param_active_links_thr_low=1

‎device/arista/x86_64-arista_7800r3a_36d_lc/pmon_daemon_control.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
../x86_64-arista_common/pmon_daemon_control.json
1+
../x86_64-arista_common/pmon_daemon_control_linecard.json

‎device/arista/x86_64-arista_7800r3a_36d_lc/system_health_monitoring_config.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
../x86_64-arista_common/system_health_monitoring_config.json
1+
../x86_64-arista_common/system_health_monitoring_config_linecard.json

‎device/arista/x86_64-arista_7800r3a_36d_lc/thermal_policy.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
../x86_64-arista_common/thermal_policy.json
1+
../x86_64-arista_common/thermal_policy_linecard.json

‎device/arista/x86_64-arista_7800r3a_36dm2_lc/pmon_daemon_control.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
../x86_64-arista_common/pmon_daemon_control.json
1+
../x86_64-arista_common/pmon_daemon_control_linecard.json

‎device/arista/x86_64-arista_7800r3a_36dm2_lc/system_health_monitoring_config.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
../x86_64-arista_common/system_health_monitoring_config.json
1+
../x86_64-arista_common/system_health_monitoring_config_linecard.json

‎device/arista/x86_64-arista_7800r3a_36dm2_lc/thermal_policy.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
../x86_64-arista_common/thermal_policy.json
1+
../x86_64-arista_common/thermal_policy_linecard.json

‎device/arista/x86_64-arista_7800r3a_36p_lc/pmon_daemon_control.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
../x86_64-arista_common/pmon_daemon_control.json
1+
../x86_64-arista_common/pmon_daemon_control_linecard.json

‎device/arista/x86_64-arista_7800r3a_36p_lc/system_health_monitoring_config.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
../x86_64-arista_common/system_health_monitoring_config.json
1+
../x86_64-arista_common/system_health_monitoring_config_linecard.json

‎device/arista/x86_64-arista_7800r3a_36p_lc/thermal_policy.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
../x86_64-arista_common/thermal_policy.json
1+
../x86_64-arista_common/thermal_policy_linecard.json

‎device/arista/x86_64-arista_7800r3ak_36d2_lc/pmon_daemon_control.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
../x86_64-arista_common/pmon_daemon_control.json
1+
../x86_64-arista_common/pmon_daemon_control_linecard.json

‎device/arista/x86_64-arista_7800r3ak_36d2_lc/system_health_monitoring_config.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
../x86_64-arista_common/system_health_monitoring_config.json
1+
../x86_64-arista_common/system_health_monitoring_config_linecard.json

‎device/arista/x86_64-arista_7800r3ak_36d2_lc/thermal_policy.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
../x86_64-arista_common/thermal_policy.json
1+
../x86_64-arista_common/thermal_policy_linecard.json

‎device/arista/x86_64-arista_7800r3ak_36dm2_lc/pmon_daemon_control.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
../x86_64-arista_common/pmon_daemon_control.json
1+
../x86_64-arista_common/pmon_daemon_control_linecard.json

‎device/arista/x86_64-arista_7800r3ak_36dm2_lc/system_health_monitoring_config.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
../x86_64-arista_common/system_health_monitoring_config.json
1+
../x86_64-arista_common/system_health_monitoring_config_linecard.json

‎device/arista/x86_64-arista_7800r3ak_36dm2_lc/thermal_policy.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
../x86_64-arista_common/thermal_policy.json
1+
../x86_64-arista_common/thermal_policy_linecard.json

‎device/marvell/arm64-marvell_db98cx8580_16cd-r0/FALCON16X25G/buffers_defaults_t1.j2

-36
This file was deleted.

‎device/marvell/arm64-marvell_db98cx8580_16cd-r0/FALCON16X25G/port_config.ini

-19
This file was deleted.

‎device/marvell/arm64-marvell_db98cx8580_16cd-r0/FALCON16X25G/profile.ini

-2
This file was deleted.

‎device/marvell/arm64-marvell_db98cx8580_16cd-r0/FALCON16X25G/sai.profile

-3
This file was deleted.

‎device/marvell/arm64-marvell_db98cx8580_16cd-r0/FALCON16x400G/buffers_defaults_t0.j2

-36
This file was deleted.

0 commit comments

Comments
 (0)