Merge https://github.com/sonic-net/sonic-buildimage

sonic-net · Aug 30, 2023 · 67facfa · 67facfa
2 parents d414219 + 9a15221
commit 67facfa
Show file tree

Hide file tree

Showing 49 changed files with 313 additions and 133 deletions.
diff --git a/.azure-pipelines/dpkg-cache-cleanup.yml b/.azure-pipelines/dpkg-cache-cleanup.yml
@@ -15,13 +15,34 @@ trigger: none
 pr: none
 
 jobs:
-- job: Build
+- job: Amd
   pool: sonicbld
   timeoutInMinutes: 5
   steps:
   - checkout: none
   - script: |
-      set -xe
+      df -h
       sudo find /nfs/dpkg_cache/ -name *.tgz -mtime +30 -type f -delete
+      df -h
     displayName: clean dpkg cache
-    
+- job: Armhf
+  pool: sonicbld-armhf
+  timeoutInMinutes: 5
+  steps:
+  - checkout: none
+  - script: |
+      df -h
+      sudo find /nfs/dpkg_cache/ -name *.tgz -mtime +30 -type f -delete
+      df -h
+    displayName: clean dpkg cache
+- job: Arm64
+  pool: sonicbld-arm64
+  timeoutInMinutes: 5
+  steps:
+  - checkout: none
+  - script: |
+      df -h
+      sudo find /nfs/dpkg_cache/ -name *.tgz -mtime +30 -type f -delete
+      df -h
+    displayName: clean dpkg cache
+
diff --git a/...86_64-arista_7800r3_48cq2_lc/Arista-7800R3-48CQ2-C48/jr2-a7280cr3-32d4-40x100G.config.bcm b/...86_64-arista_7800r3_48cq2_lc/Arista-7800R3-48CQ2-C48/jr2-a7280cr3-32d4-40x100G.config.bcm
@@ -860,3 +860,4 @@ dma_desc_aggregator_timeout_usec.BCM8869X=1000
 dma_desc_aggregator_enable_specific_MDB_LPM.BCM8869X=1
 dma_desc_aggregator_enable_specific_MDB_FEC.BCM8869X=1
 sai_pfc_dlr_init_capability=0 
+sai_default_cpu_tx_tc=7
diff --git a/...6_64-arista_7800r3a_36d2_lc/Arista-7800R3A-36D2-C36/0/j2p-a7800r3a-36d-36x400G.config.bcm b/...6_64-arista_7800r3a_36d2_lc/Arista-7800R3A-36D2-C36/0/j2p-a7800r3a-36d-36x400G.config.bcm
@@ -1014,3 +1014,4 @@ appl_param_nof_ports_per_modid=64
 xflow_macsec_secure_chan_to_num_secure_assoc_encrypt=2
 xflow_macsec_secure_chan_to_num_secure_assoc_decrypt=2
 sai_pfc_dlr_init_capability=0
+sai_default_cpu_tx_tc=7
diff --git a/...6_64-arista_7800r3a_36d2_lc/Arista-7800R3A-36D2-C36/1/j2p-a7800r3a-36d-36x400G.config.bcm b/...6_64-arista_7800r3a_36d2_lc/Arista-7800R3A-36D2-C36/1/j2p-a7800r3a-36d-36x400G.config.bcm
@@ -1014,3 +1014,4 @@ appl_param_nof_ports_per_modid=64
 xflow_macsec_secure_chan_to_num_secure_assoc_encrypt=2
 xflow_macsec_secure_chan_to_num_secure_assoc_decrypt=2
 sai_pfc_dlr_init_capability=0
+sai_default_cpu_tx_tc=7
diff --git a/...6_64-arista_7800r3a_36d2_lc/Arista-7800R3A-36D2-C72/0/j2p-a7800r3a-36d-36x400G.config.bcm b/...6_64-arista_7800r3a_36d2_lc/Arista-7800R3A-36D2-C72/0/j2p-a7800r3a-36d-36x400G.config.bcm
@@ -1031,3 +1031,4 @@ serdes_tx_taps_36=nrz:-8:89:-29:0:0:0
 xflow_macsec_secure_chan_to_num_secure_assoc_encrypt=2
 xflow_macsec_secure_chan_to_num_secure_assoc_decrypt=4
 sai_pfc_dlr_init_capability=0
+sai_default_cpu_tx_tc=7
diff --git a/...6_64-arista_7800r3a_36d2_lc/Arista-7800R3A-36D2-C72/1/j2p-a7800r3a-36d-36x400G.config.bcm b/...6_64-arista_7800r3a_36d2_lc/Arista-7800R3A-36D2-C72/1/j2p-a7800r3a-36d-36x400G.config.bcm
@@ -1031,3 +1031,4 @@ serdes_tx_taps_36=nrz:-7:85:-25:0:0:0
 xflow_macsec_secure_chan_to_num_secure_assoc_encrypt=2
 xflow_macsec_secure_chan_to_num_secure_assoc_decrypt=4
 sai_pfc_dlr_init_capability=0
+sai_default_cpu_tx_tc=7
diff --git a/...6_64-arista_7800r3a_36d2_lc/Arista-7800R3A-36D2-D36/0/j2p-a7800r3a-36d-36x400G.config.bcm b/...6_64-arista_7800r3a_36d2_lc/Arista-7800R3A-36D2-D36/0/j2p-a7800r3a-36d-36x400G.config.bcm
@@ -1051,3 +1051,4 @@ appl_param_nof_ports_per_modid=64
 xflow_macsec_secure_chan_to_num_secure_assoc_encrypt=2
 xflow_macsec_secure_chan_to_num_secure_assoc_decrypt=4
 sai_pfc_dlr_init_capability=0
+sai_default_cpu_tx_tc=7
diff --git a/...6_64-arista_7800r3a_36d2_lc/Arista-7800R3A-36D2-D36/1/j2p-a7800r3a-36d-36x400G.config.bcm b/...6_64-arista_7800r3a_36d2_lc/Arista-7800R3A-36D2-D36/1/j2p-a7800r3a-36d-36x400G.config.bcm
@@ -1051,3 +1051,4 @@ appl_param_nof_ports_per_modid=64
 xflow_macsec_secure_chan_to_num_secure_assoc_encrypt=2
 xflow_macsec_secure_chan_to_num_secure_assoc_decrypt=4
 sai_pfc_dlr_init_capability=0
+sai_default_cpu_tx_tc=7
diff --git a/device/mellanox/x86_64-nvidia_sn5600-r0/ACS-SN5600/sai_5600.xml b/device/mellanox/x86_64-nvidia_sn5600-r0/ACS-SN5600/sai_5600.xml
@@ -27,6 +27,9 @@
         <!-- Number of ports in the following port list -->
         <number-of-physical-ports>65</number-of-physical-ports>
 
+        <!-- Global port late create -->
+        <late-create-all-ports>1</late-create-all-ports>
+
         <!-- List of ports in the device -->
         <ports-list>
             <port-info>

diff --git a/device/mellanox/x86_64-nvidia_sn5600_simx-r0/ACS-SN5600/sai_5600.xml b/device/mellanox/x86_64-nvidia_sn5600_simx-r0/ACS-SN5600/sai_5600.xml
@@ -27,6 +27,9 @@
         <!-- Number of ports in the following port list -->
         <number-of-physical-ports>65</number-of-physical-ports>
 
+        <!-- Global port late create -->
+        <late-create-all-ports>1</late-create-all-ports>
+
         <!-- List of ports in the device -->
         <ports-list>
             <port-info>

diff --git a/...4-nokia_ixr7250e_36x400g-r0/Nokia-IXR7250E-36x100G/0/jr2cp-nokia-18x100g-4x25g-config.bcm b/...4-nokia_ixr7250e_36x400g-r0/Nokia-IXR7250E-36x100G/0/jr2cp-nokia-18x100g-4x25g-config.bcm
@@ -2093,3 +2093,4 @@ xflow_macsec_secure_chan_to_num_secure_assoc_decrypt=4
 cmic_dma_abort_in_cold_boot=0
 sai_pfc_dlr_init_capability=0
 trunk_group_max_members=16
+sai_default_cpu_tx_tc=7
diff --git a/...4-nokia_ixr7250e_36x400g-r0/Nokia-IXR7250E-36x100G/1/jr2cp-nokia-18x100g-4x25g-config.bcm b/...4-nokia_ixr7250e_36x400g-r0/Nokia-IXR7250E-36x100G/1/jr2cp-nokia-18x100g-4x25g-config.bcm
@@ -2094,3 +2094,4 @@ xflow_macsec_secure_chan_to_num_secure_assoc_decrypt=4
 cmic_dma_abort_in_cold_boot=0
 sai_pfc_dlr_init_capability=0
 trunk_group_max_members=16
+sai_default_cpu_tx_tc=7
diff --git a/.../x86_64-nokia_ixr7250e_36x400g-r0/Nokia-IXR7250E-36x400G/0/jr2cp-nokia-18x400g-config.bcm b/.../x86_64-nokia_ixr7250e_36x400g-r0/Nokia-IXR7250E-36x400G/0/jr2cp-nokia-18x400g-config.bcm
@@ -2095,3 +2095,4 @@ xflow_macsec_secure_chan_to_num_secure_assoc_decrypt=4
 cmic_dma_abort_in_cold_boot=0
 sai_pfc_dlr_init_capability=0
 trunk_group_max_members=16
+sai_default_cpu_tx_tc=7
diff --git a/.../x86_64-nokia_ixr7250e_36x400g-r0/Nokia-IXR7250E-36x400G/1/jr2cp-nokia-18x400g-config.bcm b/.../x86_64-nokia_ixr7250e_36x400g-r0/Nokia-IXR7250E-36x400G/1/jr2cp-nokia-18x400g-config.bcm
@@ -2097,3 +2097,4 @@ xflow_macsec_secure_chan_to_num_secure_assoc_decrypt=4
 cmic_dma_abort_in_cold_boot=0
 sai_pfc_dlr_init_capability=0
 trunk_group_max_members=16
+sai_default_cpu_tx_tc=7
diff --git a/dockers/docker-fpm-frr/frr/bgpd/templates/sentinels/policies.conf.j2 b/dockers/docker-fpm-frr/frr/bgpd/templates/sentinels/policies.conf.j2
@@ -2,7 +2,7 @@
 ! template: bgpd/templates/sentinels/policies.conf.j2
 !
 {% if constants.bgp.sentinel_community is defined %}
-bgp community-list standard sentinel_community permit {{ constants.bgp.sentinel_community }}
+bgp community-list standard sentinel_community permit {{ constants.bgp.sentinel_community }} no-export
 !
 route-map FROM_BGP_SENTINEL permit 100
  match community sentinel_community

diff --git a/files/build/versions/build/build-sonic-slave-bullseye/versions-deb-bullseye b/files/build/versions/build/build-sonic-slave-bullseye/versions-deb-bullseye
@@ -44,6 +44,7 @@ linux-headers-5.10.0-18-2-common==5.10.140-1
 lldpd==1.0.4-1
 lm-sensors==1:3.6.0-7
 mft==4.25.0-62
+mlnx-sai==1.mlnx.SAIBuild2305.25.0.3
 net-tools==1.60+git20181103.0eebece-1
 protobuf-compiler==3.21.12-3
 python-thrift==0.11.0-4

diff --git a/files/build/versions/build/build-sonic-slave-bullseye/versions-deb-bullseye-arm64 b/files/build/versions/build/build-sonic-slave-bullseye/versions-deb-bullseye-arm64
@@ -1,3 +1 @@
-libnl-3-200==3.5.0-1
-libnl-route-3-200==3.5.0-1
 linux-headers-5.10.0-18-2-arm64==5.10.140-1
diff --git a/files/build/versions/build/build-sonic-slave-bullseye/versions-py3 b/files/build/versions/build/build-sonic-slave-bullseye/versions-py3
@@ -32,6 +32,6 @@ tabulate==0.8.2
 thrift==0.14.1
 toposort==1.6
 wcwidth==0.2.6
-websocket-client==1.6.1
+websocket-client==1.6.2
 www-authenticate==0.9.2
 xmltodict==0.12.0
diff --git a/files/build/versions/build/build-sonic-slave-bullseye/versions-py3-all-arm64 b/files/build/versions/build/build-sonic-slave-bullseye/versions-py3-all-arm64
diff --git a/files/build/versions/default/versions-git b/files/build/versions/default/versions-git
@@ -1,11 +1,11 @@
-https://chromium.googlesource.com/chromium/tools/depot_tools.git==b11693a5cab86ffe6be648fc39818daac33027d8
+https://chromium.googlesource.com/chromium/tools/depot_tools.git==b8164180d2c339940c99db74344c865e67ca064d
 https://github.com/aristanetworks/swi-tools.git==b5f087e4774168bf536360d43c9c509c8f14ad9f
 https://github.com/CESNET/libyang.git==8b0b910a2dcb7360cb5b0aaefbd1338271d50946
 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==c17be0b3fa498d773f852f444967267953bd71a3
-https://github.com/FreeRADIUS/freeradius-server.git==76816565aee52996c6873a06ff503d3dee2891d8
+https://github.com/flashrom/flashrom.git==d534100c0503bc9ff47d95456ceabbe644929b5d
+https://github.com/FreeRADIUS/freeradius-server.git==77b95a3f229355c722348fdbd9e623c51a24c65d
 https://github.com/FreeRADIUS/pam_radius.git==7d75a319e43d5e234b93f89cd461a11861d07b95
 https://github.com/jeroennijhof/pam_tacplus.git==4284d9016e64def2bb81d5f50f96dc3b59bfdc39
 https://github.com/jpirko/libteam.git==7cb5de8b01be132bd4150eff460bfd83296414b6
@@ -14,9 +14,9 @@ https://github.com/Marvell-switching/mrvl-prestera.git==63118c2a6b627e543f5556ba
 https://github.com/Mellanox/libpsample.git==62bb27d9a49424e45191eee81df7ce0d8c74e774
 https://github.com/p4lang/ptf.git==d2e2d8ad005a451ad11f9d21af50079a0552921a
 https://github.com/p4lang/scapy-vxlan.git==85ffe83da156568ee47a0750f638227e6e1d7479
-https://github.com/sflow/host-sflow==183dc2f51e5654727f1e0dd475c2672d839ac640
+https://github.com/sflow/host-sflow==b9a0015e65f4e0274b9a4904f141867cf2f8ef97
 https://github.com/sflow/sflowtool==219ab50bcfd9d9e714ff169eec31b2625933acb5
-https://github.com/thom311/libnl==b544a3c69c8a8adf330fb243069d705bde60109c
+https://github.com/thom311/libnl==0f60ab3917dae704b6bc889b45a25e932f4cbc3a
 https://salsa.debian.org/debian/libteam.git==48142125234a665ad5367b724af36a58fb484d3d
 https://salsa.debian.org/kernel-team/ethtool/==d0578651310379629399dde060577d4b9b0bcab1
 https://salsa.debian.org/kernel-team/initramfs-tools.git==cf964bfb4362019fd7fba1e839e403ff950dca8e

diff --git a/files/build/versions/default/versions-mirror b/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==20230820T000751Z
-debian-security==20230820T000216Z
+debian==20230827T000225Z
+debian-security==20230828T000133Z
 download.docker.com_linux_debian_dists_bullseye==2023-07-31T14:38:46Z
 download.docker.com_linux_debian_dists_buster==2023-07-31T14:38:46Z
 packages.microsoft.com_repos_sonic-dev_dists_jessie==2022-10-31T19:34:29Z
-packages.trafficmanager.net_snapshot_debian-security_20230820T000216Z_dists_bullseye-security==2023-08-18T21:55:32Z
-packages.trafficmanager.net_snapshot_debian-security_20230820T000216Z_dists_buster_updates==2023-08-18T21:55:32Z
-packages.trafficmanager.net_snapshot_debian_20230820T000751Z_dists_bullseye==2023-06-10T08:52:21Z
-packages.trafficmanager.net_snapshot_debian_20230820T000751Z_dists_bullseye-backports==2023-08-19T20:42:06Z
-packages.trafficmanager.net_snapshot_debian_20230820T000751Z_dists_bullseye-updates==2023-08-19T20:42:06Z
-packages.trafficmanager.net_snapshot_debian_20230820T000751Z_dists_buster==2023-06-10T08:53:33Z
-packages.trafficmanager.net_snapshot_debian_20230820T000751Z_dists_buster-backports==2023-08-19T20:42:06Z
-packages.trafficmanager.net_snapshot_debian_20230820T000751Z_dists_buster-updates==2023-06-10T08:55:10Z
+packages.trafficmanager.net_snapshot_debian-security_20230828T000133Z_dists_bullseye-security==2023-08-27T14:25:23Z
+packages.trafficmanager.net_snapshot_debian-security_20230828T000133Z_dists_buster_updates==2023-08-27T14:25:23Z
+packages.trafficmanager.net_snapshot_debian_20230827T000225Z_dists_bullseye==2023-06-10T08:52:21Z
+packages.trafficmanager.net_snapshot_debian_20230827T000225Z_dists_bullseye-backports==2023-08-26T20:19:59Z
+packages.trafficmanager.net_snapshot_debian_20230827T000225Z_dists_bullseye-updates==2023-08-26T20:19:59Z
+packages.trafficmanager.net_snapshot_debian_20230827T000225Z_dists_buster==2023-06-10T08:53:33Z
+packages.trafficmanager.net_snapshot_debian_20230827T000225Z_dists_buster-backports==2023-08-26T20:19:59Z
+packages.trafficmanager.net_snapshot_debian_20230827T000225Z_dists_buster-updates==2023-06-10T08:55:10Z
diff --git a/files/build/versions/default/versions-web b/files/build/versions/default/versions-web
@@ -36,8 +36,8 @@ https://download.docker.com/linux/debian/gpg==1afae06b34a13c1b3d9cb61a26285a15
 https://github.com/aristanetworks/sonic-firmware/raw/446f30ccd8626f904d89d5798da7294948e090a6/phy/phy-credo_1.0_amd64.deb==6c3d6c32477615cbe049b9161ce15bd5
 https://github.com/barefootnetworks/sonic-release-pkgs/raw/dev/bfnplatform_20221130_sai_1.11.0_deb11.deb==4a77e5f35b75ad7ce062f631581b40e2
 https://github.com/barefootnetworks/sonic-release-pkgs/raw/dev/bfnsdk_20221130_sai_1.11.0_deb11.deb==c2b0dfb4122dcdbd4af58826e2010640
-https://github.com/bazelbuild/bazelisk/releases/latest/download/bazelisk-linux-amd64==d9f6a4c3197625b1835b523697eb953e
-https://github.com/bazelbuild/bazelisk/releases/latest/download/bazelisk-linux-arm64==6105edb638de24bce2c368b8f8f698a4
+https://github.com/bazelbuild/bazelisk/releases/latest/download/bazelisk-linux-amd64==0334fd679ec178f14882b73ebc10d7d8
+https://github.com/bazelbuild/bazelisk/releases/latest/download/bazelisk-linux-arm64==e07f07d9f758cdcf57ba5d2ff9f3d491
 https://github.com/CentecNetworks/sonic-binaries/raw/master/amd64/sai/libsai-dev_1.11.0-1_amd64.deb==6a9e27b3830d96e980651de15b291933
 https://github.com/CentecNetworks/sonic-binaries/raw/master/amd64/sai/libsai_1.11.0-1_amd64.deb==8bd907c4baeacf6467c0794bee0d723c
 https://github.com/CentecNetworks/sonic-binaries/raw/master/amd64/third_party/advantech/_Susi4.so==5e1b8daef522c9da00af400abe25810b

diff --git a/files/build/versions/dockers/docker-sonic-mgmt-framework/versions-py3 b/files/build/versions/dockers/docker-sonic-mgmt-framework/versions-py3
@@ -18,7 +18,7 @@ openapi-schema-validator==0.4.4
 openapi-spec-validator==0.5.7
 pathable==0.4.3
 pkgutil_resolve_name==1.3.10
-protobuf==4.24.1
+protobuf==4.24.2
 pyrsistent==0.19.3
 python-dateutil==2.6.0
 requests==2.31.0

diff --git a/files/build/versions/dockers/docker-sonic-vs/versions-py3 b/files/build/versions/dockers/docker-sonic-vs/versions-py3
@@ -41,6 +41,6 @@ toposort==1.6
 typing_extensions==4.5.0
 urllib3==2.0.4
 wcwidth==0.2.6
-websocket-client==1.6.1
+websocket-client==1.6.2
 www-authenticate==0.9.2
 zipp==3.15.0
diff --git a/files/build/versions/dockers/sonic-slave-bullseye/versions-deb-bullseye b/files/build/versions/dockers/sonic-slave-bullseye/versions-deb-bullseye
@@ -39,7 +39,7 @@ byacc==20140715-1+b1
 bzip2==1.0.8-4
 bzip2-doc==1.0.8-4
 ca-certificates==20210119
-ca-certificates-java==20190909
+ca-certificates-java==20190909+deb11u1
 cdbs==0.4.163
 check==0.15.2-2
 chrpath==0.16-2+b1
@@ -1072,8 +1072,8 @@ librhash0==1.4.1-2
 librole-tiny-perl==2.002004-1
 librrd-dev==1.7.2-3+b7
 librrd8==1.7.2-3+b7
-librsvg2-2==2.50.3+dfsg-1
-librsvg2-common==2.50.3+dfsg-1
+librsvg2-2==2.50.3+dfsg-1+deb11u1
+librsvg2-common==2.50.3+dfsg-1+deb11u1
 librtmp1==2.4+20151223.gitfa8646d.1-2+b2
 librubberband2==1.9.0-1
 libruby2.7==2.7.4-1+deb11u1

diff --git a/files/build/versions/dockers/sonic-slave-buster/versions-deb-buster b/files/build/versions/dockers/sonic-slave-buster/versions-deb-buster
@@ -984,24 +984,24 @@ libpython3.7-minimal==3.7.3-2+deb10u5
 libpython3.7-stdlib==3.7.3-2+deb10u5
 libqdox-java==1.12.1-3
 libqdox2-java==2.0~M10-1
-libqt4-dbus==4:4.8.7+dfsg-18+deb10u1
-libqt4-declarative==4:4.8.7+dfsg-18+deb10u1
-libqt4-designer==4:4.8.7+dfsg-18+deb10u1
-libqt4-dev==4:4.8.7+dfsg-18+deb10u1
-libqt4-dev-bin==4:4.8.7+dfsg-18+deb10u1
-libqt4-help==4:4.8.7+dfsg-18+deb10u1
-libqt4-network==4:4.8.7+dfsg-18+deb10u1
-libqt4-opengl==4:4.8.7+dfsg-18+deb10u1
-libqt4-opengl-dev==4:4.8.7+dfsg-18+deb10u1
-libqt4-qt3support==4:4.8.7+dfsg-18+deb10u1
-libqt4-script==4:4.8.7+dfsg-18+deb10u1
-libqt4-scripttools==4:4.8.7+dfsg-18+deb10u1
-libqt4-sql==4:4.8.7+dfsg-18+deb10u1
-libqt4-sql-mysql==4:4.8.7+dfsg-18+deb10u1
-libqt4-svg==4:4.8.7+dfsg-18+deb10u1
-libqt4-test==4:4.8.7+dfsg-18+deb10u1
-libqt4-xml==4:4.8.7+dfsg-18+deb10u1
-libqt4-xmlpatterns==4:4.8.7+dfsg-18+deb10u1
+libqt4-dbus==4:4.8.7+dfsg-18+deb10u2
+libqt4-declarative==4:4.8.7+dfsg-18+deb10u2
+libqt4-designer==4:4.8.7+dfsg-18+deb10u2
+libqt4-dev==4:4.8.7+dfsg-18+deb10u2
+libqt4-dev-bin==4:4.8.7+dfsg-18+deb10u2
+libqt4-help==4:4.8.7+dfsg-18+deb10u2
+libqt4-network==4:4.8.7+dfsg-18+deb10u2
+libqt4-opengl==4:4.8.7+dfsg-18+deb10u2
+libqt4-opengl-dev==4:4.8.7+dfsg-18+deb10u2
+libqt4-qt3support==4:4.8.7+dfsg-18+deb10u2
+libqt4-script==4:4.8.7+dfsg-18+deb10u2
+libqt4-scripttools==4:4.8.7+dfsg-18+deb10u2
+libqt4-sql==4:4.8.7+dfsg-18+deb10u2
+libqt4-sql-mysql==4:4.8.7+dfsg-18+deb10u2
+libqt4-svg==4:4.8.7+dfsg-18+deb10u2
+libqt4-test==4:4.8.7+dfsg-18+deb10u2
+libqt4-xml==4:4.8.7+dfsg-18+deb10u2
+libqt4-xmlpatterns==4:4.8.7+dfsg-18+deb10u2
 libqt5concurrent5==5.11.3+dfsg1-1+deb10u5
 libqt5core5a==5.11.3+dfsg1-1+deb10u5
 libqt5dbus5==5.11.3+dfsg1-1+deb10u5
@@ -1016,9 +1016,9 @@ libqt5svg5==5.11.3-2
 libqt5test5==5.11.3+dfsg1-1+deb10u5
 libqt5widgets5==5.11.3+dfsg1-1+deb10u5
 libqt5xml5==5.11.3+dfsg1-1+deb10u5
-libqtcore4==4:4.8.7+dfsg-18+deb10u1
-libqtdbus4==4:4.8.7+dfsg-18+deb10u1
-libqtgui4==4:4.8.7+dfsg-18+deb10u1
+libqtcore4==4:4.8.7+dfsg-18+deb10u2
+libqtdbus4==4:4.8.7+dfsg-18+deb10u2
+libqtgui4==4:4.8.7+dfsg-18+deb10u2
 libquadmath0==8.3.0-6
 libraw1394-11==2.1.2-1+b1
 librdmacm1==22.1-1
@@ -1648,24 +1648,24 @@ python3.7==3.7.3-2+deb10u5
 python3.7-dbg==3.7.3-2+deb10u5
 python3.7-dev==3.7.3-2+deb10u5
 python3.7-minimal==3.7.3-2+deb10u5
-qdbus==4:4.8.7+dfsg-18+deb10u1
+qdbus==4:4.8.7+dfsg-18+deb10u2
 qemu-kvm==1:3.1+dfsg-8+deb10u10
 qemu-system-common==1:3.1+dfsg-8+deb10u10
 qemu-system-data==1:3.1+dfsg-8+deb10u10
 qemu-system-gui==1:3.1+dfsg-8+deb10u10
 qemu-system-x86==1:3.1+dfsg-8+deb10u10
 qemu-utils==1:3.1+dfsg-8+deb10u10
 qt-at-spi==0.4.0-9
-qt4-linguist-tools==4:4.8.7+dfsg-18+deb10u1
-qt4-qmake==4:4.8.7+dfsg-18+deb10u1
+qt4-linguist-tools==4:4.8.7+dfsg-18+deb10u2
+qt4-qmake==4:4.8.7+dfsg-18+deb10u2
 qt5-default==5.11.3+dfsg1-1+deb10u5
 qt5-gtk-platformtheme==5.11.3+dfsg1-1+deb10u5
 qt5-qmake==5.11.3+dfsg1-1+deb10u5
 qt5-qmake-bin==5.11.3+dfsg1-1+deb10u5
 qtbase5-dev==5.11.3+dfsg1-1+deb10u5
 qtbase5-dev-tools==5.11.3+dfsg1-1+deb10u5
 qtchooser==66-2
-qtcore4-l10n==4:4.8.7+dfsg-18+deb10u1
+qtcore4-l10n==4:4.8.7+dfsg-18+deb10u2
 qttranslations5-l10n==5.11.3-2
 quilt==0.65-3
 rake==12.3.1-3+deb10u1

diff --git a/files/build/versions/host-image/versions-py3 b/files/build/versions/host-image/versions-py3
@@ -72,7 +72,7 @@ toposort==1.6
 urllib3==2.0.4
 watchdog==0.10.3
 wcwidth==0.2.6
-websocket-client==1.6.1
+websocket-client==1.6.2
 wheel==0.35.1
 www-authenticate==0.9.2
 xmltodict==0.12.0
diff --git a/files/build_templates/sonic_version.yml.j2 b/files/build_templates/sonic_version.yml.j2
@@ -30,3 +30,8 @@ built_by: {{ built_by }}
 asan: 'yes'
 {% endif -%}
 sonic_os_version: {{ sonic_os_version }}
+{% if SECURE_UPGRADE_MODE == "dev" or SECURE_UPGRADE_MODE == "prod" -%}
+secure_boot_image: 'yes'
+{% else -%}
+secure_boot_image: 'no'
+{% endif -%}
diff --git a/platform/broadcom/platform-modules-ufispace.mk b/platform/broadcom/platform-modules-ufispace.mk
@@ -14,7 +14,7 @@ export UFISPACE_S6301_56ST_PLATFORM_MODULE_VERSION
 
 UFISPACE_S9300_32D_PLATFORM_MODULE = sonic-platform-ufispace-s9300-32d_$(UFISPACE_S9300_32D_PLATFORM_MODULE_VERSION)_amd64.deb
 $(UFISPACE_S9300_32D_PLATFORM_MODULE)_SRC_PATH = $(PLATFORM_PATH)/sonic-platform-modules-ufispace
-$(UFISPACE_S9300_32D_PLATFORM_MODULE)_DEPENDS += $(LINUX_HEADERS) $(LINUX_HEADERS_COMMON)
+$(UFISPACE_S9300_32D_PLATFORM_MODULE)_DEPENDS += $(LINUX_HEADERS) $(LINUX_HEADERS_COMMON) $(PDDF_PLATFORM_MODULE_SYM)
 $(UFISPACE_S9300_32D_PLATFORM_MODULE)_PLATFORM = x86_64-ufispace_s9300_32d-r0
 SONIC_DPKG_DEBS += $(UFISPACE_S9300_32D_PLATFORM_MODULE)
 

diff --git a/platform/mellanox/mlnx-fw-upgrade.j2 b/platform/mellanox/mlnx-fw-upgrade.j2
@@ -1,4 +1,4 @@
-{#
+{#-
     Copyright (c) 2020-2023 NVIDIA CORPORATION & AFFILIATES.
     Apache-2.0
     Licensed under the Apache License, Version 2.0 (the "License");
@@ -10,7 +10,7 @@
     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.
-#}
+-#}
 #!/bin/bash
 
 declare -r SCRIPT_NAME="$(basename "$0")"