Skip to content

Commit 9c699cd

Browse files
authoredMar 5, 2025
Merge branch 'sonic-net:master' into mia-add-young-models
2 parents ba92d31 + 5b081a8 commit 9c699cd

File tree

482 files changed

+46502
-11224
lines changed

Some content is hidden

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

482 files changed

+46502
-11224
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_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

0 commit comments

Comments
 (0)