Merge pull request sonic-net#192 from mssonicbld/sonicbld/202205-merge

[code sync] Merge code from sonic-net/sonic-buildimage:202205 to 202205

device/mellanox/x86_64-mlnx_msn3420-r0/ACS-MSN3420/sai.profile

@@ -1,3 +1,4 @@
 SAI_INIT_CONFIG_FILE=/usr/share/sonic/hwsku/sai_3420.xml
 SAI_DUMP_STORE_PATH=/var/log/mellanox/sdk-dumps
 SAI_DUMP_STORE_AMOUNT=10
+SAI_DUMP_MFT_CFG_PATH=/etc/mft/fwtrace_cfg

device/mellanox/x86_64-mlnx_msn3700-r0/ACS-MSN3700/sai.profile

@@ -1,3 +1,4 @@
 SAI_INIT_CONFIG_FILE=/usr/share/sonic/hwsku/sai_3700.xml
 SAI_DUMP_STORE_PATH=/var/log/mellanox/sdk-dumps
 SAI_DUMP_STORE_AMOUNT=10
+SAI_DUMP_MFT_CFG_PATH=/etc/mft/fwtrace_cfg

device/mellanox/x86_64-mlnx_msn3700c-r0/ACS-MSN3700C/sai.profile

@@ -1,3 +1,4 @@
 SAI_INIT_CONFIG_FILE=/usr/share/sonic/hwsku/sai_3700c.xml
 SAI_DUMP_STORE_PATH=/var/log/mellanox/sdk-dumps
 SAI_DUMP_STORE_AMOUNT=10
+SAI_DUMP_MFT_CFG_PATH=/etc/mft/fwtrace_cfg

device/mellanox/x86_64-mlnx_msn3800-r0/ACS-MSN3800/sai.profile

@@ -1,3 +1,4 @@
 SAI_INIT_CONFIG_FILE=/usr/share/sonic/hwsku/sai_3800.xml
 SAI_DUMP_STORE_PATH=/var/log/mellanox/sdk-dumps
 SAI_DUMP_STORE_AMOUNT=10
+SAI_DUMP_MFT_CFG_PATH=/etc/mft/fwtrace_cfg

device/mellanox/x86_64-mlnx_msn3800-r0/Mellanox-SN3800-C64/sai.profile

@@ -2,3 +2,4 @@ SAI_INIT_CONFIG_FILE=/usr/share/sonic/hwsku/sai_3800.xml
 SAI_DUMP_STORE_PATH=/var/log/mellanox/sdk-dumps
 SAI_DUMP_STORE_AMOUNT=10
 SAI_DEFAULT_SWITCHING_MODE_STORE_FORWARD=1
+SAI_DUMP_MFT_CFG_PATH=/etc/mft/fwtrace_cfg

device/mellanox/x86_64-mlnx_msn3800-r0/Mellanox-SN3800-D100C12S2/sai.profile

@@ -2,3 +2,4 @@ SAI_INIT_CONFIG_FILE=/usr/share/sonic/hwsku/sai_3800_2x10g_100x50g_12x100g.xml
 SAI_DUMP_STORE_PATH=/var/log/mellanox/sdk-dumps
 SAI_DUMP_STORE_AMOUNT=10
 SAI_DEFAULT_SWITCHING_MODE_STORE_FORWARD=1
+SAI_DUMP_MFT_CFG_PATH=/etc/mft/fwtrace_cfg

device/mellanox/x86_64-mlnx_msn3800-r0/Mellanox-SN3800-D112C8/sai.profile

@@ -2,3 +2,4 @@ SAI_INIT_CONFIG_FILE=/usr/share/sonic/hwsku/sai_3800_112x50g_8x100g.xml
 SAI_DUMP_STORE_PATH=/var/log/mellanox/sdk-dumps
 SAI_DUMP_STORE_AMOUNT=10
 SAI_DEFAULT_SWITCHING_MODE_STORE_FORWARD=1
+SAI_DUMP_MFT_CFG_PATH=/etc/mft/fwtrace_cfg

device/mellanox/x86_64-mlnx_msn3800-r0/Mellanox-SN3800-D24C52/sai.profile

@@ -2,3 +2,4 @@ SAI_INIT_CONFIG_FILE=/usr/share/sonic/hwsku/sai_3800_24x50g_52x100g.xml
 SAI_DUMP_STORE_PATH=/var/log/mellanox/sdk-dumps
 SAI_DUMP_STORE_AMOUNT=10
 SAI_DEFAULT_SWITCHING_MODE_STORE_FORWARD=1
+SAI_DUMP_MFT_CFG_PATH=/etc/mft/fwtrace_cfg

device/mellanox/x86_64-mlnx_msn3800-r0/Mellanox-SN3800-D28C49S1/sai.profile

@@ -2,3 +2,4 @@ SAI_INIT_CONFIG_FILE=/usr/share/sonic/hwsku/sai_3800_1x10g_28x50g_49x100g.xml
 SAI_DUMP_STORE_PATH=/var/log/mellanox/sdk-dumps
 SAI_DUMP_STORE_AMOUNT=10
 SAI_DEFAULT_SWITCHING_MODE_STORE_FORWARD=1
+SAI_DUMP_MFT_CFG_PATH=/etc/mft/fwtrace_cfg

device/mellanox/x86_64-mlnx_msn3800-r0/Mellanox-SN3800-D28C50/sai.profile

@@ -2,3 +2,4 @@ SAI_INIT_CONFIG_FILE=/usr/share/sonic/hwsku/sai_3800_28x50g_52x100g.xml
 SAI_DUMP_STORE_PATH=/var/log/mellanox/sdk-dumps
 SAI_DUMP_STORE_AMOUNT=10
 SAI_DEFAULT_SWITCHING_MODE_STORE_FORWARD=1
+SAI_DUMP_MFT_CFG_PATH=/etc/mft/fwtrace_cfg

device/mellanox/x86_64-mlnx_msn4410-r0/ACS-MSN4410/sai.profile

@@ -1,3 +1,4 @@
 SAI_INIT_CONFIG_FILE=/usr/share/sonic/hwsku/sai_4410.xml
 SAI_DUMP_STORE_PATH=/var/log/mellanox/sdk-dumps
 SAI_DUMP_STORE_AMOUNT=10
+SAI_DUMP_MFT_CFG_PATH=/etc/mft/fwtrace_cfg

device/mellanox/x86_64-mlnx_msn4600-r0/ACS-MSN4600/sai.profile

@@ -1,3 +1,4 @@
 SAI_INIT_CONFIG_FILE=/usr/share/sonic/hwsku/sai_4600.xml
 SAI_DUMP_STORE_PATH=/var/log/mellanox/sdk-dumps
 SAI_DUMP_STORE_AMOUNT=10
+SAI_DUMP_MFT_CFG_PATH=/etc/mft/fwtrace_cfg

device/mellanox/x86_64-mlnx_msn4600c-r0/ACS-MSN4600C/sai.profile

@@ -1,3 +1,4 @@
 SAI_INIT_CONFIG_FILE=/usr/share/sonic/hwsku/sai_4600C.xml
 SAI_DUMP_STORE_PATH=/var/log/mellanox/sdk-dumps
 SAI_DUMP_STORE_AMOUNT=10
+SAI_DUMP_MFT_CFG_PATH=/etc/mft/fwtrace_cfg

device/mellanox/x86_64-mlnx_msn4600c-r0/Mellanox-SN4600C-C64/sai.profile

@@ -2,3 +2,4 @@ SAI_INIT_CONFIG_FILE=/usr/share/sonic/hwsku/sai_4600C.xml
 SAI_DUMP_STORE_PATH=/var/log/mellanox/sdk-dumps
 SAI_DUMP_STORE_AMOUNT=10
 SAI_DEFAULT_SWITCHING_MODE_STORE_FORWARD=1
+SAI_DUMP_MFT_CFG_PATH=/etc/mft/fwtrace_cfg

device/mellanox/x86_64-mlnx_msn4600c-r0/Mellanox-SN4600C-D100C12S2/sai.profile

@@ -2,3 +2,4 @@ SAI_INIT_CONFIG_FILE=/usr/share/sonic/hwsku/sai_4600c_100x50g_12x100g_2x10g.xml
 SAI_DUMP_STORE_PATH=/var/log/mellanox/sdk-dumps
 SAI_DUMP_STORE_AMOUNT=10
 SAI_DEFAULT_SWITCHING_MODE_STORE_FORWARD=1
+SAI_DUMP_MFT_CFG_PATH=/etc/mft/fwtrace_cfg

device/mellanox/x86_64-mlnx_msn4600c-r0/Mellanox-SN4600C-D112C8/sai.profile

@@ -2,3 +2,4 @@ SAI_INIT_CONFIG_FILE=/usr/share/sonic/hwsku/sai_4600c_112x50g_8x100g.xml
 SAI_DUMP_STORE_PATH=/var/log/mellanox/sdk-dumps
 SAI_DUMP_STORE_AMOUNT=10
 SAI_DEFAULT_SWITCHING_MODE_STORE_FORWARD=1
+SAI_DUMP_MFT_CFG_PATH=/etc/mft/fwtrace_cfg

device/mellanox/x86_64-mlnx_msn4600c-r0/Mellanox-SN4600C-D48C40/sai.profile

@@ -2,3 +2,4 @@ SAI_INIT_CONFIG_FILE=/usr/share/sonic/hwsku/sai_4600c_48x50g_40x100g.xml
 SAI_DUMP_STORE_PATH=/var/log/mellanox/sdk-dumps
 SAI_DUMP_STORE_AMOUNT=10
 SAI_DEFAULT_SWITCHING_MODE_STORE_FORWARD=1
+SAI_DUMP_MFT_CFG_PATH=/etc/mft/fwtrace_cfg

device/mellanox/x86_64-mlnx_msn4700-r0/ACS-MSN4700/sai.profile

@@ -1,3 +1,4 @@
 SAI_INIT_CONFIG_FILE=/usr/share/sonic/hwsku/sai_4700.xml
 SAI_DUMP_STORE_PATH=/var/log/mellanox/sdk-dumps
 SAI_DUMP_STORE_AMOUNT=10
+SAI_DUMP_MFT_CFG_PATH=/etc/mft/fwtrace_cfg

device/mellanox/x86_64-mlnx_msn4700-r0/Mellanox-SN4700-A96C8V8/sai.profile

@@ -1,3 +1,4 @@
 SAI_INIT_CONFIG_FILE=/usr/share/sonic/hwsku/sai_4700_8x200g_8x100g_96x25g.xml
 SAI_DUMP_STORE_PATH=/var/log/mellanox/sdk-dumps
 SAI_DUMP_STORE_AMOUNT=10
+SAI_DUMP_MFT_CFG_PATH=/etc/sonic/mft/fwtrace_cfg

device/mellanox/x86_64-mlnx_msn4700-r0/Mellanox-SN4700-C128/sai.profile

@@ -1,3 +1,4 @@
 SAI_INIT_CONFIG_FILE=/usr/share/sonic/hwsku/sai_4700_128x100g.xml
 SAI_DUMP_STORE_PATH=/var/log/mellanox/sdk-dumps
 SAI_DUMP_STORE_AMOUNT=10
+SAI_DUMP_MFT_CFG_PATH=/etc/sonic/mft/fwtrace_cfg

device/mellanox/x86_64-mlnx_msn4700-r0/Mellanox-SN4700-V48C32/sai.profile

@@ -1,3 +1,4 @@
 SAI_INIT_CONFIG_FILE=/usr/share/sonic/hwsku/sai_4700_32x100g_48x200g.xml
 SAI_DUMP_STORE_PATH=/var/log/mellanox/sdk-dumps
 SAI_DUMP_STORE_AMOUNT=10
+SAI_DUMP_MFT_CFG_PATH=/etc/sonic/mft/fwtrace_cfg

device/mellanox/x86_64-nvidia_sn4800-r0/ACS-SN4800/sai.profile

@@ -1,3 +1,4 @@
 SAI_INIT_CONFIG_FILE=/usr/share/sonic/hwsku/sai_4800.xml
 SAI_DUMP_STORE_PATH=/var/log/mellanox/sdk-dumps
 SAI_DUMP_STORE_AMOUNT=10
+SAI_DUMP_MFT_CFG_PATH=/etc/mft/fwtrace_cfg

files/build/versions/build/build-sonic-slave-bullseye/versions-deb-bullseye

@@ -36,7 +36,7 @@ libyang-cpp==1.0.73
 libyang-dev==1.0.73
 linux-headers-5.10.0-18-2-amd64==5.10.140-1
 linux-headers-5.10.0-18-2-common==5.10.140-1
-mlnx-sai==1.mlnx.SAIBuild2205.25.1.2
+mlnx-sai==1.mlnx.SAIBuild2205.25.1.27
 net-tools==1.60+git20181103.0eebece-1
 python-thrift==0.11.0-4
 python3-swsscommon==1.0.0

files/build/versions/build/build-sonic-slave-buster/versions-deb-buster

@@ -21,7 +21,7 @@ libteam-utils==1.30-1
 libteam5==1.30-1
 libteamdctl0==1.30-1
 libthrift-0.11.0==0.11.0-4
-libthrift-dev==0.14.1
+libthrift-dev==0.11.0-4
 libthrift0==0.14.1
 libyang==1.0.73
 libyang-cpp==1.0.73
@@ -33,4 +33,4 @@ python3-thrift==0.14.1
 python3-yang==1.0.73
 sonic-mgmt-common==1.0.0
 sonic-mgmt-common-codegen==1.0.0
-thrift-compiler==0.14.1
+thrift-compiler==0.11.0-4

files/build/versions/default/versions-git

@@ -1,24 +1,24 @@
-https://chromium.googlesource.com/chromium/tools/depot_tools.git==963000950bc08f9dca9dde2d7a40e71079d606ae
+https://chromium.googlesource.com/chromium/tools/depot_tools.git==390005586bde14be9b55fde71ca4ae2107021ac9
 https://github.com/aristanetworks/swi-tools.git==b5f087e4774168bf536360d43c9c509c8f14ad9f
 https://github.com/CESNET/libyang.git==7e5ea21030fe6632b6faad30c0de8d9669503773
 https://github.com/daveolson53/audisp-tacplus.git==559c9f22edd4f2dea0ecedffb3ad9502b12a75b6
 https://github.com/daveolson53/libnss-tacplus.git==19008ab68d9d504aa58eb34d5f564755a1613b8b
 https://github.com/dyninc/OpenBFDD.git==e35f43ad8d2b3f084e96a84c392528a90d05a287
-https://github.com/flashrom/flashrom.git==9a570318bbb816c6f6587b64d82c986678703495
-https://github.com/FreeRADIUS/freeradius-server.git==d7d0e5f502179b5a70183ad95488cd6aec65a66e
+https://github.com/flashrom/flashrom.git==e188cc383e30e51015dd1d3216eb33947cf312c4
+https://github.com/FreeRADIUS/freeradius-server.git==8fd38fd136b087fb0ca6fcbb9d6037768d775ebe
 https://github.com/FreeRADIUS/pam_radius.git==77da6f5028730ded726d50732da379568a9edded
 https://github.com/jeroennijhof/pam_tacplus.git==b89dba44b58ec7fdc9b5365b982aa4a316484a3c
 https://github.com/jpirko/libteam.git==8b843e93cee1dab61fb79b01791201cdad45e1d1
 https://github.com/lguohan/gnxi.git==3adf8b97755b49947e465b5a14645f11e79fa0cd
 https://github.com/Marvell-switching/mrvl-prestera.git==953f3c4f41536142fe986c314cd53f7e40ab4efe
 https://github.com/Mellanox/libpsample.git==62bb27d9a49424e45191eee81df7ce0d8c74e774
-https://github.com/opencomputeproject/SAI.git==25ef69febf44e4a8fc07a9aed4dfc691c13e8f3a
+https://github.com/opencomputeproject/SAI.git==96143eef4a662b720038a10e68d7d702370dc20a
 https://github.com/p4lang/scapy-vxlan.git==85ffe83da156568ee47a0750f638227e6e1d7479
-https://github.com/sflow/host-sflow==571c86a6189ba6b51fd58cd7a6ccd9ab0421ab14
-https://github.com/sflow/sflowtool==2b622f99d36254884507d9137e6e99020db260cb
+https://github.com/sflow/host-sflow==a68aea078a9496e0e707595a16674a85dcf653cc
+https://github.com/sflow/sflowtool==c1eeb55ad6bfd76283833614a8296f635627e1db
 https://github.com/thom311/libnl==bdf83151326e365f137fe0e36dc9b1b7aeb1cf33
 https://salsa.debian.org/debian/libteam.git==48142125234a665ad5367b724af36a58fb484d3d
 https://salsa.debian.org/kernel-team/ethtool/==8374ab341998bc3345a328a20651d278ae58504e
 https://salsa.debian.org/kernel-team/initramfs-tools.git==cf964bfb4362019fd7fba1e839e403ff950dca8e
 https://salsa.debian.org/sk-guest/monit.git==c9da7ebb1f35dfba17b50b5969a6e75e29cbec0d
-https://salsa.debian.org/ssh-team/openssh.git==a1402dfde1ca8a005494c78023e4350715b58f51
+https://salsa.debian.org/ssh-team/openssh.git==494a22f31c6d224f1a6d00c044a7341770709a1a

files/build/versions/default/versions-mirror

@@ -1,15 +1,15 @@
 deb.nodesource.com_node%5f14.x_dists_bullseye==2023-02-17T00:35:28Z
 deb.nodesource.com_node%5f14.x_dists_buster==2023-02-17T00:35:28Z
-debian==20231205T000133Z
-debian-security==20231205T000313Z
-download.docker.com_linux_debian_dists_bullseye==2023-11-21T08:51:06Z
-download.docker.com_linux_debian_dists_buster==2023-11-21T08:51:06Z
+debian==20231217T000358Z
+debian-security==20231217T000308Z
+download.docker.com_linux_debian_dists_bullseye==2023-12-12T21:40:29Z
+download.docker.com_linux_debian_dists_buster==2023-12-12T21:40:29Z
 packages.microsoft.com_repos_sonic-dev_dists_jessie==2022-10-31T19:34:29Z
-packages.trafficmanager.net_snapshot_debian-security_20231205T000313Z_dists_bullseye-security==2023-12-04T23:52:58Z
-packages.trafficmanager.net_snapshot_debian-security_20231205T000313Z_dists_buster_updates==2023-12-04T23:52:57Z
-packages.trafficmanager.net_snapshot_debian_20231205T000133Z_dists_bullseye==2023-10-07T11:07:16Z
-packages.trafficmanager.net_snapshot_debian_20231205T000133Z_dists_bullseye-backports==2023-12-04T20:20:03Z
-packages.trafficmanager.net_snapshot_debian_20231205T000133Z_dists_bullseye-updates==2023-12-04T20:20:03Z
-packages.trafficmanager.net_snapshot_debian_20231205T000133Z_dists_buster==2023-06-10T08:53:33Z
-packages.trafficmanager.net_snapshot_debian_20231205T000133Z_dists_buster-backports==2023-12-04T20:20:02Z
-packages.trafficmanager.net_snapshot_debian_20231205T000133Z_dists_buster-updates==2023-06-10T08:55:10Z
+packages.trafficmanager.net_snapshot_debian-security_20231217T000308Z_dists_bullseye-security==2023-12-16T20:06:11Z
+packages.trafficmanager.net_snapshot_debian-security_20231217T000308Z_dists_buster_updates==2023-12-16T20:06:11Z
+packages.trafficmanager.net_snapshot_debian_20231217T000358Z_dists_bullseye==2023-10-07T11:07:16Z
+packages.trafficmanager.net_snapshot_debian_20231217T000358Z_dists_bullseye-backports==2023-12-16T20:12:49Z
+packages.trafficmanager.net_snapshot_debian_20231217T000358Z_dists_bullseye-updates==2023-12-16T20:12:49Z
+packages.trafficmanager.net_snapshot_debian_20231217T000358Z_dists_buster==2023-06-10T08:53:33Z
+packages.trafficmanager.net_snapshot_debian_20231217T000358Z_dists_buster-backports==2023-12-16T20:12:49Z
+packages.trafficmanager.net_snapshot_debian_20231217T000358Z_dists_buster-updates==2023-06-10T08:55:10Z

files/build/versions/default/versions-web

@@ -48,8 +48,8 @@ https://github.com/Marvell-switching/sonic-marvell-binaries/raw/master/armhf/sai
 https://github.com/Mellanox/Spectrum-SDK-Drivers-SONiC-Bins/releases/download/fw-2010.4316/fw-SPC-rel-13_2010_4316-EVB.mfa==12d1faa4f12fc0c3ef5fdae4451fea94
 https://github.com/Mellanox/Spectrum-SDK-Drivers-SONiC-Bins/releases/download/fw-2010.4316/fw-SPC2-rel-29_2010_4316-EVB.mfa==aeb69216740088a09362d50c1147d637
 https://github.com/Mellanox/Spectrum-SDK-Drivers-SONiC-Bins/releases/download/fw-2010.4316/fw-SPC3-rel-30_2010_4316-EVB.mfa==bf4180031e9dc9cfb68d2a9a9548349a
-https://github.com/Mellanox/Spectrum-SDK-Drivers-SONiC-Bins/releases/download/sai-2205.25.1.2-bullseye-amd64/mlnx-sai-dbgsym_1.mlnx.SAIBuild2205.25.1.2_amd64.deb==fb992237734b1f0e04a4952ce2c6915f
-https://github.com/Mellanox/Spectrum-SDK-Drivers-SONiC-Bins/releases/download/sai-2205.25.1.2-bullseye-amd64/mlnx-sai_1.mlnx.SAIBuild2205.25.1.2_amd64.deb==b3c4a2bc178ff0a3e3d3a1fb3389c700
+https://github.com/Mellanox/Spectrum-SDK-Drivers-SONiC-Bins/releases/download/sai-SAIBuild2205.25.1.27-bullseye-amd64/mlnx-sai-dbgsym_1.mlnx.SAIBuild2205.25.1.27_amd64.deb==de86494179d17799d76b4a80b8d26401
+https://github.com/Mellanox/Spectrum-SDK-Drivers-SONiC-Bins/releases/download/sai-SAIBuild2205.25.1.27-bullseye-amd64/mlnx-sai_1.mlnx.SAIBuild2205.25.1.27_amd64.deb==f45f5e394e7c21f2eda5abb00273b564
 https://github.com/Mellanox/Spectrum-SDK-Drivers-SONiC-Bins/releases/download/sdk-4.5.4318-bullseye-amd64/applibs-dev_1.mlnx.4.5.4318_amd64.deb==f695947edc79174b02f67a0261e0a17f
 https://github.com/Mellanox/Spectrum-SDK-Drivers-SONiC-Bins/releases/download/sdk-4.5.4318-bullseye-amd64/applibs_1.mlnx.4.5.4318_amd64.deb==7dc100b1d3a59d677ea8588bde7f2d5e
 https://github.com/Mellanox/Spectrum-SDK-Drivers-SONiC-Bins/releases/download/sdk-4.5.4318-bullseye-amd64/iproute2-dev_1.mlnx.4.5.4318_amd64.deb==f560cabd4c8e797abcdcd72e95aecd07

files/build/versions/dockers/docker-ptf/versions-deb-buster

@@ -486,7 +486,7 @@ tk8.6-blt2.5==2.5.3+dfsg-4
 tmux==2.8-3+deb10u1
 traceroute==1:2.1.0-2
 ttf-bitstream-vera==1.10-8
-tzdata==2021a-0+deb10u11
+tzdata==2021a-0+deb10u12
 ucf==3.0038+nmu1
 unzip==6.0-23+deb10u3
 vim==2:8.1.0875-5+deb10u6

files/build/versions/dockers/docker-saiserverv2-mlnx/versions-deb-bullseye

@@ -96,7 +96,7 @@ mailcap==3.69
 make==4.3-4.1
 mft==4.22.1-15
 mime-support==3.66
-mlnx-sai==1.mlnx.SAIBuild2205.25.1.2
+mlnx-sai==1.mlnx.SAIBuild2205.25.1.27
 netbase==6.3
 patch==2.7.6-7
 pkg-config==0.29.2-1

files/build/versions/dockers/docker-syncd-mlnx/versions-deb-bullseye

@@ -48,7 +48,7 @@ linux-libc-dev==5.10.197-1
 mailcap==3.69
 mft==4.22.1-15
 mime-support==3.66
-mlnx-sai==1.mlnx.SAIBuild2205.25.1.2
+mlnx-sai==1.mlnx.SAIBuild2205.25.1.27
 openssh-client==1:8.4p1-5+deb11u2
 python-dev-is-python2==2.7.18-9
 python-is-python2==2.7.18-9

files/build/versions/dockers/sonic-slave-bullseye/versions-deb-bullseye-arm64

@@ -19,4 +19,5 @@ libubsan1-armhf-cross==10.2.1-6cross1
 libxslt1-dev==1.1.34-4+deb11u1
 linux-headers-5.10.0-26-arm64==5.10.197-1
 linux-headers-arm64==5.10.197-1
-nodejs==14.21.3-deb-1nodesource1
+nodejs==14.21.3-deb-1nodesource1
+tzdata==2021a-1+deb11u11

files/build/versions/dockers/sonic-slave-bullseye/versions-deb-bullseye-armhf

@@ -51,4 +51,5 @@ sassc==3.6.1+20201027-1
 texlive-extra-utils==2020.20210202-3
 texlive-font-utils==2020.20210202-3
 texlive-luatex==2020.20210202-3
+tzdata==2021a-1+deb11u11
 yui-compressor==2.4.8-2.1

files/build/versions/dockers/sonic-slave-buster/versions-deb-buster

@@ -50,7 +50,7 @@ cmake==3.13.4-1
 cmake-data==3.13.4-1
 cmocka-doc==1.1.3-1
 comerr-dev==2.1-1.44.5-1+deb10u3
-containerd.io==1.6.25-1
+containerd.io==1.6.26-1
 cowbuilder==0.88
 cowdancer==0.88
 cpio==2.12+dfsg-9+deb10u1
@@ -291,7 +291,7 @@ libbinutils==2.31.1-16
 libbison-dev==2:3.3.2.dfsg-1
 libbit-vector-perl==7.4-1+b5
 libblkid-dev==2.33.1-0.1
-libbluetooth3==5.50-1.2~deb10u3
+libbluetooth3==5.50-1.2~deb10u4
 libbluray2==1:1.1.0-1+deb10u1
 libboost-atomic1.71-dev==1.71.0-6~bpo10+1
 libboost-atomic1.71.0==1.71.0-6~bpo10+1

files/build/versions/host-image/versions-deb-bullseye

@@ -397,6 +397,7 @@ systemd-sysv==247.3-7+deb11u4
 tcpdump==4.99.0-2+deb11u1
 tcptraceroute==1.5beta7+debian-4.1+b1
 traceroute==1:2.1.0-2+deb11u1
+tzdata==2021a-1+deb11u11
 u-boot-tools==2021.01+dfsg-5
 ucf==3.0043
 udev==247.3-7+deb11u4

platform/broadcom/sonic-platform-modules-dell/s6100/sonic_platform/chassis.py

@@ -217,7 +217,7 @@ def get_serial(self):
         Returns:
             string: Serial number of chassis
         """
-        return self._eeprom.serial_str()
+        return self._eeprom.serial_number_str()
 
     def get_status(self):
         """

platform/broadcom/sonic-platform-modules-dell/s6100/sonic_platform/eeprom.py

@@ -83,8 +83,14 @@ def __init__(self, i2c_line=0, iom_eeprom=False):
                 self.eeprom_tlv_dict[mac_code] = '00:00:00:00:00:00'
 
     def serial_number_str(self):
-        (is_valid, results) = self.get_tlv_field(
-                    self.eeprom_data, self._TLV_CODE_SERIAL_NUMBER)
+        # For Chassis, return service tag instead of serial number
+        if not self.is_module:
+            (is_valid, results) = self.get_tlv_field(
+                        self.eeprom_data, self._TLV_CODE_SERVICE_TAG)
+        else:
+            (is_valid, results) = self.get_tlv_field(
+                        self.eeprom_data, self._TLV_CODE_SERIAL_NUMBER)
+
         if not is_valid:
             return "N/A"
 
@@ -118,14 +124,6 @@ def part_number_str(self):
 
         return results[2].decode('ascii')
 
-    def serial_str(self):
-        (is_valid, results) = self.get_tlv_field(
-                    self.eeprom_data, self._TLV_CODE_SERVICE_TAG)
-        if not is_valid:
-            return "N/A"
-
-        return results[2].decode('ascii')
-
     def revision_str(self):
         (is_valid, results) = self.get_tlv_field(
                     self.eeprom_data, self._TLV_CODE_LABEL_REVISION)

platform/broadcom/sonic-platform-modules-dell/s6100/sonic_platform/module.py

@@ -139,7 +139,7 @@ def get_serial(self):
         Returns:
             string: Serial number of module
         """
-        return self._eeprom.serial_str()
+        return self._eeprom.serial_number_str()
 
     def get_status(self):
         """

platform/mellanox/docker-syncd-mlnx.mk

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2016-2021 NVIDIA CORPORATION & AFFILIATES.
+# Copyright (c) 2016-2023 NVIDIA CORPORATION & AFFILIATES.
 # Apache-2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -19,7 +19,7 @@
 DOCKER_SYNCD_PLATFORM_CODE = mlnx
 include $(PLATFORM_PATH)/../template/docker-syncd-bullseye.mk
 
-$(DOCKER_SYNCD_BASE)_DEPENDS += $(SYNCD) $(PYTHON_SDK_API) $(MFT)
+$(DOCKER_SYNCD_BASE)_DEPENDS += $(SYNCD) $(PYTHON_SDK_API) $(MFT) $(MFT_FWTRACE_CFG)
 
 ifeq ($(ENABLE_ASAN), y)
 $(DOCKER_SYNCD_BASE)_DEPENDS += $(SYNCD_DBG)

platform/mellanox/mft-fwtrace-cfg.dep

@@ -0,0 +1,10 @@
+# DPKG FRK
+
+SPATH := $($(MFT_FWTRACE_CFG)_SRC_PATH)
+DEP_FILES := $(SONIC_COMMON_FILES_LIST) $(PLATFORM_PATH)/mft-fwtrace-cfg.mk $(PLATFORM_PATH)/mft-fwtrace-cfg.dep
+DEP_FILES += $(SONIC_COMMON_BASE_FILES_LIST)
+DEP_FILES += $(shell git ls-files -- $(SPATH))
+
+$(MFT_FWTRACE_CFG)_CACHE_MODE := GIT_CONTENT_SHA
+$(MFT_FWTRACE_CFG)_DEP_FLAGS := $(SONIC_COMMON_FLAGS_LIST)
+$(MFT_FWTRACE_CFG)_DEP_FILES := $(DEP_FILES)

platform/mellanox/mft-fwtrace-cfg.mk

@@ -0,0 +1,22 @@
+#
+# Copyright (c) 2023 NVIDIA CORPORATION & AFFILIATES.
+# Apache-2.0
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+MFT_FWTRACE_CFG = mft-fwtrace-cfg-$(MFT_VERSION)-$(MFT_REVISION).deb
+$(MFT_FWTRACE_CFG)_SRC_PATH = $(PLATFORM_PATH)/mft-fwtrace-cfg
+SONIC_MAKE_DEBS += $(MFT_FWTRACE_CFG)
+
+export MFT_FWTRACE_CFG

platform/mellanox/mft-fwtrace-cfg/DEBIAN/changelog

@@ -0,0 +1,5 @@
+mft-fwtrace-cfg (1.0.0) STABLE; urgency=low
+
+  * Initial release.
+
+ -- Vadym Hlushko <vadymh@nvidia.com>  Mon, 24 Jul 2023 12:03:04 +0300

platform/mellanox/mft-fwtrace-cfg/DEBIAN/control

@@ -0,0 +1,7 @@
+Package: mft-fwtrace-cfg
+Version: 1.0.0
+Section: utils
+Priority: optional
+Architecture: all
+Maintainer: Vadym Hlushko <vadymh@nvidia.com>
+Description: fwtrace_cfg files for the mlxtrace utility from the MFT debian package