Skip to content
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.

Commit a0be257

Browse files
miatttaomiatttao
authoredMar 7, 2025··
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

0 commit comments

Comments
 (0)