Merge remote-tracking branch 'upstream/master' into frr_enhancements

Author: dgsudharsan

build_debian.sh

@@ -392,6 +392,12 @@ sudo LANG=C DEBIAN_FRONTEND=noninteractive chroot $FILESYSTEM_ROOT apt-get -y in
     zstd                    \
     nvme-cli
 
+sudo cp files/initramfs-tools/pzstd $FILESYSTEM_ROOT/etc/initramfs-tools/hooks/pzstd
+sudo chmod +x $FILESYSTEM_ROOT/etc/initramfs-tools/hooks/pzstd
+
+sudo cp files/initramfs-tools/file $FILESYSTEM_ROOT/etc/initramfs-tools/hooks/file
+sudo chmod +x $FILESYSTEM_ROOT/etc/initramfs-tools/hooks/file
+
 # Have systemd create the auditd log directory
 sudo mkdir -p ${FILESYSTEM_ROOT}/etc/systemd/system/auditd.service.d
 sudo tee ${FILESYSTEM_ROOT}/etc/systemd/system/auditd.service.d/log-directory.conf >/dev/null <<EOF
@@ -855,7 +861,11 @@ if [[ $MULTIARCH_QEMU_ENVIRON == y || $CROSS_BUILD_ENVIRON == y ]]; then
 fi
 
 ## Compress docker files
-pushd $FILESYSTEM_ROOT && sudo tar -I pigz -cf $OLDPWD/$FILESYSTEM_DOCKERFS -C ${DOCKERFS_PATH}var/lib/docker .; popd
+if [ "$BUILD_REDUCE_IMAGE_SIZE" = "y" ]; then
+    pushd $FILESYSTEM_ROOT && sudo tar -I pzstd -cf $OLDPWD/$FILESYSTEM_DOCKERFS -C ${DOCKERFS_PATH}var/lib/docker .; popd
+else
+    pushd $FILESYSTEM_ROOT && sudo tar -I pigz -cf $OLDPWD/$FILESYSTEM_DOCKERFS -C ${DOCKERFS_PATH}var/lib/docker .; popd
+fi
 
 ## Compress together with /boot, /var/lib/docker and $PLATFORM_DIR as an installer payload zip file
 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/mellanox/x86_64-mlnx_msn4700-r0/Mellanox-SN4700-O28/buffers_defaults_objects.j2

@@ -1,5 +1,6 @@
 {#
-    Copyright (c) 2024 NVIDIA CORPORATION & AFFILIATES.
+    SPDX-FileCopyrightText: NVIDIA CORPORATION & AFFILIATES
+    Copyright (c) 2024-2025 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
     Apache-2.0
 
     Licensed under the Apache License, Version 2.0 (the "License");
@@ -92,8 +93,7 @@
     "BUFFER_PG": {
         "Dpc": {
             "active": {
-                "dynamic": "ingress_lossy_profile",
-                "static": "ingress_lossy_profile"
+                "dynamic": "NULL"
             },
             "inactive": {
                 "dynamic": "ingress_lossy_profile",
@@ -361,12 +361,6 @@
         "{{ port }}|3-4": {
             "profile" : {{find_profile_to_attach('BUFFER_PG', port, 'active', 'dynamic')}}
         },
-{% else %}
-{% if port in PORT_DPC %}
-        "{{ port }}|3-4": {
-            "profile" : {{find_profile_to_attach('BUFFER_PG', port, 'active', 'static')}}
-        },
-{% endif %}
 {% endif %}
         "{{ port }}|0": {
             "profile" : "ingress_lossy_profile"

device/mellanox/x86_64-mlnx_msn4700-r0/Mellanox-SN4700-O32/pg_profile_lookup.ini

@@ -1 +1 @@
-../../x86_64-nvidia_sn4280-r0/ACS-SN4280/pg_profile_lookup.ini
+../Mellanox-SN4700-O8C48/pg_profile_lookup.ini

device/mellanox/x86_64-mlnx_msn4700-r0/Mellanox-SN4700-V64/pg_profile_lookup.ini

@@ -1 +1 @@
-../../x86_64-nvidia_sn4280-r0/ACS-SN4280/pg_profile_lookup.ini
+../Mellanox-SN4700-O8C48/pg_profile_lookup.ini