Resolve Merge Conflicts Between sonic-net 202505 and sonic-buildimage-msft 202506 to enable superproject sync

build_debian.sh

@@ -120,8 +120,7 @@ sudo LANG=C chroot $FILESYSTEM_ROOT mount
 ## Pointing apt to public apt mirrors and getting latest packages, needed for latest security updates
 scripts/build_mirror_config.sh files/apt $CONFIGURED_ARCH $IMAGE_DISTRO
 sudo cp files/apt/sources.list.$CONFIGURED_ARCH $FILESYSTEM_ROOT/etc/apt/sources.list
-sudo cp files/apt/apt-retries-count $FILESYSTEM_ROOT/etc/apt/apt.conf.d/
-sudo cp files/apt/apt.conf.d/{81norecommends,apt-{clean,gzip-indexes,no-languages},no-check-valid-until} $FILESYSTEM_ROOT/etc/apt/apt.conf.d/
+sudo cp files/apt/apt.conf.d/{81norecommends,apt-{clean,gzip-indexes,no-languages,timeout-n-retries},no-check-valid-until} $FILESYSTEM_ROOT/etc/apt/apt.conf.d/
 
 ## Note: set lang to prevent locale warnings in your chroot
 sudo LANG=C chroot $FILESYSTEM_ROOT apt-get -y update

device/arista/x86_64-arista_7060x6_64pe/platform.json

@@ -110,6 +110,14 @@
             {
                 "name": "Management Card Inlet",
                 "controllable": false
+            },
+            {
+                "name": "TH5 Diode 1",
+                "controllable": false
+            },
+            {
+                "name": "TH5 Diode 2",
+                "controllable": false
             }
         ],
         "sfps": [

device/arista/x86_64-arista_7060x6_64pe/sensors.conf

@@ -5,8 +5,6 @@ bus "i2c-29" "SCD 0000:03:00.0 SMBus master 1 bus 4"
 chip "max6581-i2c-25-4d"
     ignore temp5
     ignore temp6
-    ignore temp7
-    ignore temp8
 
 chip "nvme-pci-0400"
     # TODO: sensors complaining about tempX_min and tempX_max

device/arista/x86_64-arista_7060x6_64pe_b/platform.json

@@ -118,6 +118,14 @@
             {
                 "name": "Management Card Inlet",
                 "controllable": false
+            },
+            {
+                "name": "TH5 Diode 1",
+                "controllable": false
+            },
+            {
+                "name": "TH5 Diode 2",
+                "controllable": false
             }
         ],
         "sfps": [

device/arista/x86_64-arista_7060x6_64pe_b/sensors.conf

@@ -5,8 +5,6 @@ bus "i2c-31" "SCD 0000:08:00.0 SMBus master 1 bus 4"
 chip "max6581-i2c-27-4d"
     ignore temp5
     ignore temp6
-    ignore temp7
-    ignore temp8
 
 chip "nvme-pci-0400"
     # TODO: sensors complaining about tempX_min and tempX_max

dockers/docker-base-bookworm/Dockerfile.j2

@@ -28,8 +28,10 @@ ENV DEBIAN_FRONTEND=noninteractive
 # Configure data sources for apt/dpkg
 COPY ["dpkg_01_drop", "/etc/dpkg/dpkg.cfg.d/01_drop"]
 COPY ["sources.list.{{ CONFIGURED_ARCH }}", "/etc/apt/sources.list"]
-COPY ["no_install_recommend_suggest", "/etc/apt/apt.conf.d"]
-COPY ["no-check-valid-until", "/etc/apt/apt.conf.d"]
+COPY ["files/apt/apt.conf.d/", "/etc/apt/apt.conf.d/"]
+# Install certificates by disabling the peer verification
+RUN apt -o Acquire::https::Verify-Peer=false update && \
+    apt -o Acquire::https::Verify-Peer=false install -y ca-certificates
 
 # Update apt cache and
 # pre-install fundamental packages

dockers/docker-fpm-frr/base_image_files/prefix_list

@@ -32,17 +32,37 @@ check_root_privileges() {
     fi
 }
 
-# Function to check if the device is supported device with type spine routers and subtype UpstreamLC
-check_spine_router() {
-    type=$(sonic-cfggen -d -v DEVICE_METADATA.localhost.type)
-    subtype=$(sonic-cfggen -d -v DEVICE_METADATA.localhost.subtype)
-
-    # only supported on UpstreamLC or UpperSpineRouter
-    if [[ ("$type" == "SpineRouter" && "$subtype" == "UpstreamLC") || "$type" == "UpperSpineRouter" ]]; then
-        return
+# Function to check if the device is a supported device type
+DEVICE_TYPE=""
+DEVICE_SUBTYPE=""
+
+read_device_metadata() {
+    if [[ -z "$DEVICE_TYPE" ]]; then
+        DEVICE_TYPE=$(sonic-cfggen -d -v DEVICE_METADATA.localhost.type)
+        DEVICE_SUBTYPE=$(sonic-cfggen -d -v DEVICE_METADATA.localhost.subtype)
     fi
+}
 
-    echo "Operation is only supported on Upstream SpineRouter." >&2
+declare -A prefix_type_devices
+prefix_type_devices=(
+    ["ANCHOR_PREFIX"]="SpineRouter:UpstreamLC UpperSpineRouter"
+    ["SUPPRESS_PREFIX"]=""
+)
+
+validate_device_for_type() {
+    local prefix_type=$1
+    local allowed="${prefix_type_devices[$prefix_type]}"
+    [[ -z "$allowed" ]] && return
+    read_device_metadata
+    local device_id="$DEVICE_TYPE:$DEVICE_SUBTYPE"
+    for entry in $allowed; do
+        if [[ "$entry" == *":"* ]]; then
+            [[ "$device_id" == "$entry" ]] && return
+        else
+            [[ "$DEVICE_TYPE" == "$entry" ]] && return
+        fi
+    done
+    echo "Prefix type '$prefix_type' is not supported on device type '$DEVICE_TYPE' (subtype: '$DEVICE_SUBTYPE')." >&2
     exit 1
 }
 
@@ -147,7 +167,7 @@ handle_prefix_list_single() {
 }
 
 prefix_list_operations=("add" "remove" "status")
-supported_prefix_types=("ANCHOR_PREFIX")
+supported_prefix_types=("ANCHOR_PREFIX" "SUPPRESS_PREFIX")
 # Main script execution
 if [[ "$1" == "-h" || "$1" == "--help" ]]; then
     display_help
@@ -156,10 +176,12 @@ fi
 if [ "$1" != "status" ]; then
     check_root_privileges
 fi
-check_spine_router
 skip_chassis_supervisor
 
 validate_operation $1 $2
+if [[ "$1" == "add" || "$1" == "remove" ]]; then
+    validate_device_for_type "$2"
+fi
 
 # Read SONiC immutable variables
 [ -f /etc/sonic/sonic-environment ] && . /etc/sonic/sonic-environment

dockers/docker-fpm-frr/frr/bgpd/suppress_prefix/add_suppress_prefix.conf.j2

@@ -0,0 +1 @@
+{{ data.ipv }} prefix-list {{ data.prefix_list_name }} permit {{ data.prefix }}

dockers/docker-fpm-frr/frr/bgpd/suppress_prefix/del_suppress_prefix.conf.j2

@@ -0,0 +1 @@
+no {{ data.ipv }} prefix-list {{ data.prefix_list_name }} permit {{ data.prefix }}

dockers/docker-platform-monitor/Dockerfile.j2

@@ -44,7 +44,7 @@ RUN apt-get install -y -t bookworm-backports \
 # install any dependencies required by the Arista sonic_platform package.
 # TODO: eliminate the need to install these explicitly.
 RUN pip3 install grpcio==1.51.1 \
-        grpcio-tools==1.51.1
+        grpcio-tools==1.51.1 --no-build-isolation
 
 # Barefoot platform vendors' sonic_platform packages import these Python libraries
 RUN pip3 install thrift==0.13.0 netifaces

dockers/docker-ptf-sai/Dockerfile.j2

@@ -45,9 +45,8 @@ RUN dpkg -r python-ptf
 RUN pip3 install setuptools==51.0.0
 {% endif %}
 # Install new ptf package
-RUN git clone https://github.com/p4lang/ptf.git \
-        && cd ptf                               \
-        && python3 setup.py install --single-version-externally-managed --record /tmp/ptf_install.txt
+RUN pip3 install git+https://github.com/p4lang/ptf.git \
+        && pip3 show -f ptf > /tmp/ptf_install.txt
 
 run echo "declare -x LANG=\"C.UTF-8\"" >> /root/.bashrc
 run echo "declare -x LC_ALL=\"C.UTF-8\"" >> /root/.bashrc