Merge branch '202405' into jianquanye/msft_202405

yejianquan · web-flow · commit e29e46fb9467 · 2025-11-05T16:38:56.000+10:00
diff --git a/platform/barefoot/sonic-platform-modules-arista b/platform/barefoot/sonic-platform-modules-arista
@@ -1 +1 @@
-Subproject commit 248d3ca262d908a0599c12ccc820e0b20ff2d628
+Subproject commit e836ab613f96008b261d88d3e4b16645beb16932
diff --git a/platform/broadcom/docker-syncd-brcm-dnx/start.sh b/platform/broadcom/docker-syncd-brcm-dnx/start.sh
@@ -26,6 +26,16 @@ else
         sonic-cfggen -d -t $HWSKU_DIR/config.bcm.j2 > /etc/sai.d/config.bcm
     fi
     if [ -f $HWSKU_DIR/sai.profile ]; then
+        if [ ! -z $(grep "aboot_platform=.*arista" "/etc/machine.conf") ]; then
+            if [ -f /etc/sai.d/sai.profile ]; then
+                hashSrc=$(md5sum $HWSKU_DIR/sai.profile | cut -d ' ' -f 1)
+                hashDst=$(md5sum /etc/sai.d/sai.profile | cut -d ' ' -f 1)
+                if [ "${hashSrc}" == "${hashDst}" ]; then
+                    logger -p info "Arista: sai.profile unchanged, skip copying"
+                    exit 0
+                fi
+            fi
+        fi
         cp $HWSKU_DIR/sai.profile /etc/sai.d/sai.profile
     fi
 fi
diff --git a/platform/broadcom/sonic-platform-modules-arista b/platform/broadcom/sonic-platform-modules-arista
@@ -1 +1 @@
-Subproject commit 248d3ca262d908a0599c12ccc820e0b20ff2d628
+Subproject commit e836ab613f96008b261d88d3e4b16645beb16932
diff --git a/platform/checkout/cisco-8000.ini b/platform/checkout/cisco-8000.ini
@@ -1,3 +1,3 @@
 [module]
 repo=git@github.com:Cisco-8000-sonic/platform-cisco-8000.git
-ref=202405.1.3.7
+ref=202405.1.3.9
diff --git a/src/sonic-utilities b/src/sonic-utilities
@@ -1 +1 @@
-Subproject commit 60b76e9f71eed6e075b6fe75d4768b6a5739441c
+Subproject commit 208bd8057320f6fba5aac96ad6e2d5687486c489

-Original file line number
+Diff line change
@@ @@ -1,3 +1,3 @@ @@
 [module]
 repo[email protected]:Cisco-8000-sonic/platform-cisco-8000.git
 -ref=202405.1.3.7
 +ref=202405.1.3.9