Skip to content

Commit ce4dd07

Browse files
jostar-yangjostar-yang
authored
Merge branch '202012' into as7712_20210827_api2_202012br
2 parents 6040594 + 8970425 commit ce4dd07

File tree

89 files changed

+634
-257
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

89 files changed

+634
-257
lines changed

‎.azure-pipelines/azure-pipelines-download-certificate.yml

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
parameters:
2+
- name: connectionName
3+
type: string
4+
default: sonic-dev-connection
5+
- name: kevaultName
6+
type: string
7+
default: sonic-kv
8+
- name: certificateName
9+
type: string
10+
default: sonic-secure-boot
11+
12+
steps:
13+
- task: AzureKeyVault@2
14+
inputs:
15+
connectedServiceName: ${{ parameters.connectionName }}
16+
keyVaultName: ${{ parameters.kevaultName }}
17+
secretsFilter: ${{ parameters.certificateName }}
18+
19+
- script: |
20+
set -e
21+
TMP_FILE=$(mktemp)
22+
echo "$CERTIFICATE" | base64 -d > $TMP_FILE
23+
sudo mkdir -p /etc/certificates
24+
mkdir -p $(Build.StagingDirectory)/target
25+
# Save the public key
26+
openssl pkcs12 -in $TMP_FILE -clcerts --nokeys -nodes -passin pass: | sed -z -e "s/.*\(-----BEGIN CERTIFICATE\)/\1/" > $(SIGNING_CERT)
27+
# Save the private key
28+
openssl pkcs12 -in $TMP_FILE -nocerts -nodes -passin pass: | sed -z -e "s/.*\(-----BEGIN PRIVATE KEY\)/\1/" | sudo tee $(SIGNING_KEY) 1>/dev/null
29+
ls -lt $(SIGNING_CERT) $(SIGNING_KEY)
30+
rm $TMP_FILE
31+
env:
32+
CERTIFICATE: $(${{ parameters.certificateName }})
33+
displayName: "Save certificate"

‎.azure-pipelines/azure-pipelines-image-template.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,10 @@ jobs:
5353
- publish: $(Build.ArtifactStagingDirectory)
5454
artifact: 'sonic-buildimage.$(GROUP_NAME)$(GROUP_EXTNAME)'
5555
displayName: "Archive sonic image"
56+
- publish: $(Build.ArtifactStagingDirectory)
57+
condition: failed()
58+
artifact: 'sonic-buildimage.$(GROUP_NAME)$(GROUP_EXTNAME)$(System.JobAttempt)'
59+
displayName: "Archive failed sonic image"
5660
- ${{ parameters.postSteps }}
5761
- template: cleanup.yml
5862
jobGroups: ${{ parameters.jobGroups }}

‎.azure-pipelines/official-build-cisco-8000.yml

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,17 @@ resources:
2222
name: Cisco-8000-sonic/platform-cisco-8000
2323
endpoint: cisco-connection
2424

25+
2526
variables:
2627
- group: SONIC-AKV-STROAGE-1
2728
- name: StorageSASKey
2829
value: $(sonicstorage-SasToken)
30+
- name: SONIC_ENABLE_SECUREBOOT_SIGNATURE
31+
value: y
32+
- name: SIGNING_KEY
33+
value: /etc/certificates/sonic-secure-boot-private.pem
34+
- name: SIGNING_CERT
35+
value: $(Build.StagingDirectory)/target/sonic-secure-boot-public.pem
2936

3037
stages:
3138
- stage: Build
@@ -41,6 +48,7 @@ stages:
4148
parameters:
4249
buildOptions: 'USERNAME=admin SONIC_BUILD_JOBS=$(nproc) ${{ variables.VERSION_CONTROL_OPTIONS }}'
4350
preSteps:
51+
- template: azure-pipelines-download-certificate.yml
4452
- checkout: self
4553
submodules: recursive
4654
path: s
@@ -90,5 +98,10 @@ stages:
9098
StorageSASKey: $(StorageSASKey)
9199
condition: ne(variables['Build.Reason'], 'PullRequest')
92100
displayName: "Override cisco sai packages"
101+
- script: |
102+
echo "SONIC_ENABLE_SECUREBOOT_SIGNATURE := y" >> rules/config.user
103+
echo "SIGNING_KEY := $(SIGNING_KEY)" >> rules/config.user
104+
echo "SIGNING_CERT := $(SIGNING_CERT)" >> rules/config.user
105+
displayName: "Enable secure boot signature"
93106
jobGroups:
94107
- name: cisco-8000

‎Makefile.cache

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -183,7 +183,7 @@ define GET_MOD_DEP_SHA
183183
$(if $($(1)_DEP_FILES_MISSING), $(warning "[ DPKG ] Dependecy file(s) are not found for $(1) : $($(1)_DEP_FILES_MISSING)))
184184

185185
# Include package dependencies hash values into package hash calculation
186-
$(eval $(1)_DEP_PKGS_SHA := $(foreach dfile,$(1)_MOD_DEP_PKGS,$(dfile)_DEP_MOD_SHA $(dfile)_MOD_HASH))
186+
$(eval $(1)_DEP_PKGS_SHA := $(foreach dfile,$($(1)_MOD_DEP_PKGS),$($(dfile)_DEP_MOD_SHA) $($(dfile)_MOD_HASH)))
187187

188188
$(eval $(1)_DEP_MOD_SHA := $(shell bash -c "git hash-object $($(1)_DEP_MOD_SHA_FILES) && echo $($(1)_DEP_PKGS_SHA)" \
189189
| sha1sum | awk '{print substr($$1,0,23);}'))

‎build_debian.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -610,5 +610,5 @@ fi
610610
pushd $FILESYSTEM_ROOT && sudo tar czf $OLDPWD/$FILESYSTEM_DOCKERFS -C ${DOCKERFS_PATH}var/lib/docker .; popd
611611

612612
## Compress together with /boot, /var/lib/docker and $PLATFORM_DIR as an installer payload zip file
613-
pushd $FILESYSTEM_ROOT && sudo zip $OLDPWD/$ONIE_INSTALLER_PAYLOAD -r boot/ $PLATFORM_DIR/; popd
613+
pushd $FILESYSTEM_ROOT && sudo zip --symlinks $OLDPWD/$ONIE_INSTALLER_PAYLOAD -r boot/ $PLATFORM_DIR/; popd
614614
sudo zip -g -n .squashfs:.gz $ONIE_INSTALLER_PAYLOAD $FILESYSTEM_SQUASHFS $FILESYSTEM_DOCKERFS

‎device/arista/x86_64-arista_7050cx3_32s/Arista-7050CX3-32S-C32/td3-a7050cx3-32s-32x100G.config.bcm

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ host_as_route_disable=1
66
use_all_splithorizon_groups=1
77
riot_enable=1
88
sai_tunnel_support=1
9+
sai_tunnel_underlay_route_mode=1
910
riot_overlay_l3_intf_mem_size=4096
1011
riot_overlay_l3_egress_mem_size=32768
1112
l3_ecmp_levels=2
@@ -52,7 +53,7 @@ stable_size=0x5500000
5253
tdma_timeout_usec=15000000
5354
tslam_timeout_usec=15000000
5455
sai_optimized_mmu=1
55-
mmu_init_config="TD3-MSFT-T0-100G"
56+
mmu_init_config="TD3-MSFT-CUSTOM"
5657
buf.map.egress_pool0.ingress_pool=0
5758
buf.map.egress_pool1.ingress_pool=0
5859
buf.map.egress_pool2.ingress_pool=1

‎device/arista/x86_64-arista_7050cx3_32s/Arista-7050CX3-32S-D48C8/buffers_defaults_t0.j2

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
{%- macro generate_buffer_pool_and_profiles() %}
1212
"BUFFER_POOL": {
1313
"ingress_lossless_pool": {
14-
"size": "32669440",
14+
"size": "32689152",
1515
"type": "ingress",
1616
"mode": "dynamic",
1717
"xoff": "2058240"

‎device/arista/x86_64-arista_7050cx3_32s/Arista-7050CX3-32S-D48C8/td3-a7050cx3-32s-48x50G+8x100G.config.bcm

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ host_as_route_disable=1
66
use_all_splithorizon_groups=1
77
riot_enable=1
88
sai_tunnel_support=1
9+
sai_tunnel_underlay_route_mode=1
910
riot_overlay_l3_intf_mem_size=4096
1011
riot_overlay_l3_egress_mem_size=32768
1112
l3_ecmp_levels=2
@@ -52,7 +53,7 @@ stable_size=0x5500000
5253
tdma_timeout_usec=15000000
5354
tslam_timeout_usec=15000000
5455
sai_optimized_mmu=1
55-
mmu_init_config="TD3-MSFT-T0-50G"
56+
mmu_init_config="TD3-MSFT-CUSTOM"
5657
buf.map.egress_pool0.ingress_pool=0
5758
buf.map.egress_pool1.ingress_pool=0
5859
buf.map.egress_pool2.ingress_pool=1

‎device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-C64/config.bcm.j2

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
{%- set switch_subtype = DEVICE_METADATA['localhost']['subtype'] -%}
1313
{%- if 'dualtor' in switch_subtype.lower() %}
1414
{%- set IPinIP_sock = 'sai_tunnel_support=1
15+
sai_tunnel_underlay_route_mode=1
1516
host_as_route_disable=1
1617
l3_ecmp_levels=2' -%}
1718
{%- endif %}

‎device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-D108C8/config.bcm.j2

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
{%- set switch_subtype = DEVICE_METADATA['localhost']['subtype'] -%}
55
{%- if 'dualtor' in switch_subtype.lower() %}
66
{%- set IPinIP_sock = 'sai_tunnel_support=1
7+
sai_tunnel_underlay_route_mode=1
78
host_as_route_disable=1
89
l3_ecmp_levels=2' -%}
910
{%- endif %}

‎device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-D96C16/config.bcm.j2

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
{%- set switch_subtype = DEVICE_METADATA['localhost']['subtype'] -%}
55
{%- if 'dualtor' in switch_subtype.lower() %}
66
{%- set IPinIP_sock = 'sai_tunnel_support=1
7+
sai_tunnel_underlay_route_mode=1
78
host_as_route_disable=1
89
l3_ecmp_levels=2' -%}
910
{%- endif %}

‎device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-Q64/config.bcm.j2

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
{%- set switch_subtype = DEVICE_METADATA['localhost']['subtype'] -%}
1313
{%- if 'dualtor' in switch_subtype.lower() %}
1414
{%- set IPinIP_sock = 'sai_tunnel_support=1
15+
sai_tunnel_underlay_route_mode=1
1516
host_as_route_disable=1
1617
l3_ecmp_levels=2' -%}
1718
{%- endif %}

‎device/celestica/x86_64-cel_e1031-r0/Celestica-E1031-T48S4/helix4-e1031-48x1G+4x10G.config.bcm

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
sai_postinit_cmd_file=/usr/share/sonic/hwsku/sai_postinit_cmd.soc
2+
3+
ipv6_lpm_128b_enable=1
4+
15
# disables bcmALPMDH (ALPM distributed hitbit) thread. This thread is purely for debug purpose
26
l3_alpm_hit_skip=1
37

‎device/celestica/x86_64-cel_e1031-r0/Celestica-E1031-T48S4/sai_postinit_cmd.soc

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
setreg RTAG7_IPV4_TCP_UDP_HASH_FIELD_BMAP_2 IPV4_TCP_UDP_FIELD_BITMAP_A=0xf70

‎dockers/docker-sonic-telemetry/base_image_files/monit_telemetry

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,4 @@
22
## Monit configuration for telemetry container
33
###############################################################################
44
check program container_memory_telemetry with path "/usr/bin/memory_checker telemetry 419430400"
5-
if status == 3 for 10 times within 20 cycles then exec "/usr/bin/restart_service telemetry"
5+
if status == 3 for 10 times within 20 cycles then exec "/usr/bin/restart_service telemetry" repeat every 2 cycles

‎files/build/versions/build/build-sonic-slave-buster/versions-git

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
1-
https://github.com/CESNET/libyang.git==a0cc89516ab5eca84d01c85309f320a94752a64c
1+
https://github.com/CESNET/libyang.git==ab1058892ecdee4ac1742601729b15af286fb95e
22
https://github.com/daveolson53/libnss-tacplus.git==19008ab68d9d504aa58eb34d5f564755a1613b8b
33
https://github.com/jeroennijhof/pam_tacplus.git==b8e07ac27c11b86779ae9698fcafee0c89fc83f5
44
https://github.com/jpirko/libteam.git==69a7494bb77dc10bb27076add07b380dbd778592
55
https://github.com/Mellanox/libpsample.git==62bb27d9a49424e45191eee81df7ce0d8c74e774
66
https://github.com/sflow/host-sflow==2b8771aa7284d3b34cfc43fccba67649d30d0c64
77
https://github.com/sflow/sflowtool==4be2a17b36a3b9796c280b117b8b786323a84ae8
8-
https://github.com/thom311/libnl==855c02f332f0f79f6396318beee00cce7d4bbe4e
8+
https://github.com/thom311/libnl==2effffe7979dda638108fba26b763fa5acd6edac
99
https://salsa.debian.org/debian/libteam.git==f8808df228b00873926b5e7b998ad8b61368d4c5
1010
https://salsa.debian.org/dhcp-team/isc-dhcp.git==b13135d7f6e61724e7b9a54b53e4e8b916ff21aa
1111
https://salsa.debian.org/kernel-team/ethtool/==0d5304a5be80cc74bed8ed78002bf5df0d49f412
1212
https://salsa.debian.org/kernel-team/initramfs-tools.git==40e544e13611c1b2690eb99a8096fc16c1b9c74e
1313
https://salsa.debian.org/sk-guest/monit.git==c9da7ebb1f35dfba17b50b5969a6e75e29cbec0d
14-
https://salsa.debian.org/ssh-team/openssh.git==4afc478f0882b4d71e975a3a6814d64797da4621
14+
https://salsa.debian.org/ssh-team/openssh.git==de790f931452a2dcb4490d074d5a16ab8456a523

‎files/build/versions/build/build-sonic-slave-buster/versions-py3

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ click==7.0
33
docker==5.0.3
44
ijson==2.6.1
55
ipaddress==1.0.23
6-
jsondiff==1.3.1
6+
jsondiff==2.0.0
77
jsonschema==2.6.0
88
natsort==6.2.1
99
netaddr==0.8.0

‎files/build/versions/default/versions-docker

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1-
amd64:amd64/debian:buster==sha256:96cabb5c2fe5309bf5d477ba3e83ba9b716c8bdbf97f3a26817b6a4a8da59a4a
2-
amd64:amd64/debian:stretch==sha256:54ae51f9db21d4e8d71f2a234fd0180d10dc7c78b76256002d30be3f07453ab9
3-
amd64:debian:buster==sha256:1b236b48c1ef66fa08535a5153266f4959bf58f948db3e68f7d678b651d8e33a
4-
amd64:debian:stretch==sha256:a8cc1744bbdd5266678e3e8b3e6387e45c053218438897e86876f2eb104e5534
5-
arm64:arm64v8/debian:buster==sha256:a6b19c21082133146302e33c31b8aca9c313044b6cfe3dda041867fcd9d86fd9
6-
arm64:debian:buster==sha256:1b236b48c1ef66fa08535a5153266f4959bf58f948db3e68f7d678b651d8e33a
7-
arm64:debian:stretch==sha256:a8cc1744bbdd5266678e3e8b3e6387e45c053218438897e86876f2eb104e5534
8-
armhf:arm32v7/debian:buster==sha256:2aa990397ec8d077cf5bc38ab05991dedb512f334a42366c167e1a5571ffdea1
9-
armhf:debian:buster==sha256:1b236b48c1ef66fa08535a5153266f4959bf58f948db3e68f7d678b651d8e33a
10-
armhf:debian:stretch==sha256:a8cc1744bbdd5266678e3e8b3e6387e45c053218438897e86876f2eb104e5534
1+
amd64:amd64/debian:buster==sha256:40dd1c1b1c36eac161ab63b6ce3a57d56ad79a667a37717a31721bac3f30aaf9
2+
amd64:amd64/debian:stretch==sha256:75383204de7da8eb4bb2724e5fb8dae2910ee78938ade4d35ed8afec19a90b0b
3+
amd64:debian:buster==sha256:ebe4b9831fb22dfa778de4ffcb8ea0ad69b5d782d4e86cab14cc1fded5d8e761
4+
amd64:debian:stretch==sha256:cebe6e1c30384958d471467e231f740e8f0fd92cbfd2a435a186e9bada3aee1c
5+
arm64:arm64v8/debian:buster==sha256:bf508d976de85857fd69e5da1f67d89f59ab3bc9f60b578ce24eee43047faf23
6+
arm64:debian:buster==sha256:ebe4b9831fb22dfa778de4ffcb8ea0ad69b5d782d4e86cab14cc1fded5d8e761
7+
arm64:debian:stretch==sha256:cebe6e1c30384958d471467e231f740e8f0fd92cbfd2a435a186e9bada3aee1c
8+
armhf:arm32v7/debian:buster==sha256:8e9f24e8010ba995daf25c6fafe8ea5c1914428cc29df867ffc034375d769a43
9+
armhf:debian:buster==sha256:ebe4b9831fb22dfa778de4ffcb8ea0ad69b5d782d4e86cab14cc1fded5d8e761
10+
armhf:debian:stretch==sha256:cebe6e1c30384958d471467e231f740e8f0fd92cbfd2a435a186e9bada3aee1c

‎files/build/versions/default/versions-git

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
https://chromium.googlesource.com/chromium/tools/depot_tools.git==b8a4c0ba657c8fd85e6ca552e210d419a9920f93
2-
https://github.com/aristanetworks/swi-tools.git==e938746c694e4eaa4cf4126981382c9c8372db24
3-
https://github.com/CESNET/libyang.git==a0cc89516ab5eca84d01c85309f320a94752a64c
1+
https://chromium.googlesource.com/chromium/tools/depot_tools.git==87172073a6c87178dca378501fd56c52f6f76a4a
2+
https://github.com/aristanetworks/swi-tools.git==b5f087e4774168bf536360d43c9c509c8f14ad9f
3+
https://github.com/CESNET/libyang.git==ab1058892ecdee4ac1742601729b15af286fb95e
44
https://github.com/daveolson53/libnss-tacplus.git==19008ab68d9d504aa58eb34d5f564755a1613b8b
55
https://github.com/dyninc/OpenBFDD.git==e35f43ad8d2b3f084e96a84c392528a90d05a287
66
https://github.com/jeroennijhof/pam_tacplus.git==b8e07ac27c11b86779ae9698fcafee0c89fc83f5
@@ -11,10 +11,10 @@ https://github.com/Mellanox/libpsample.git==62bb27d9a49424e45191eee81df7ce0d8c74
1111
https://github.com/p4lang/scapy-vxlan.git==85ffe83da156568ee47a0750f638227e6e1d7479
1212
https://github.com/sflow/host-sflow==2b8771aa7284d3b34cfc43fccba67649d30d0c64
1313
https://github.com/sflow/sflowtool==4be2a17b36a3b9796c280b117b8b786323a84ae8
14-
https://github.com/thom311/libnl==855c02f332f0f79f6396318beee00cce7d4bbe4e
14+
https://github.com/thom311/libnl==2effffe7979dda638108fba26b763fa5acd6edac
1515
https://salsa.debian.org/debian/libteam.git==f8808df228b00873926b5e7b998ad8b61368d4c5
1616
https://salsa.debian.org/dhcp-team/isc-dhcp.git==b13135d7f6e61724e7b9a54b53e4e8b916ff21aa
1717
https://salsa.debian.org/kernel-team/ethtool/==0d5304a5be80cc74bed8ed78002bf5df0d49f412
1818
https://salsa.debian.org/kernel-team/initramfs-tools.git==40e544e13611c1b2690eb99a8096fc16c1b9c74e
1919
https://salsa.debian.org/sk-guest/monit.git==c9da7ebb1f35dfba17b50b5969a6e75e29cbec0d
20-
https://salsa.debian.org/ssh-team/openssh.git==4afc478f0882b4d71e975a3a6814d64797da4621
20+
https://salsa.debian.org/ssh-team/openssh.git==de790f931452a2dcb4490d074d5a16ab8456a523

‎files/build/versions/default/versions-web

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ https://deb.nodesource.com/gpgkey/nodesource.gpg.key==003b51a89a133b5db4cca98b2d
2121
https://deb.nodesource.com/node_10.x/dists/stretch/Release==22738118af583db3bfad39d6fcb4fa5a
2222
https://deb.nodesource.com/node_14.x/dists/buster/Release==3084d51335d332e66f0d81a42079516d
2323
https://deb.nodesource.com/setup_10.x==6742c0148159980e8f6e886df1f8bbe1
24-
https://deb.nodesource.com/setup_14.x==e678ff76caf1620bc1cc5162517a8f4b
24+
https://deb.nodesource.com/setup_14.x==88aded33099764ca8f810f72f3c9a173
2525
https://download.docker.com/linux/debian/gpg==1afae06b34a13c1b3d9cb61a26285a15
2626
https://github.com/barefootnetworks/sonic-release-pkgs/raw/dev/bfnplatform_20220221_sai.1.7.1_deb10.deb==65de37f7834823ba69ab5e55acc5c5f4
2727
https://github.com/barefootnetworks/sonic-release-pkgs/raw/dev/bfnsdk_20220221_sai.1.7.1_deb10.deb==75df8156b85467b501dc67f1914d6ed7
@@ -31,7 +31,7 @@ https://github.com/CumulusNetworks/ifupdown2/archive/1.2.8-1.tar.gz==12f45e90d23
3131
https://github.com/Innovium/SONiC/raw/master/debian/202012/ipd.deb==d1b2262ddb4171aae2ff3c3e7dbf52f7
3232
https://github.com/Innovium/SONiC/raw/master/debian/202012/isai.deb==3f495ebff53f8d419a55b6315dfa5200
3333
https://github.com/Innovium/SONiC/raw/master/debian/202012/saihdr.deb==0f72c8abff5b8ca3f144f7bde88bebc0
34-
https://github.com/Marvell-switching/sonic-marvell-binaries/raw/master/armhf/sai-plugin/mrvllibsai_1.7.1-7_armhf.deb==385730df69b8d1f9e13d341f78f7b934
34+
https://github.com/Marvell-switching/sonic-marvell-binaries/raw/master/armhf/sai-plugin/mrvllibsai_1.7.1-8_armhf.deb==74bd3c57609f226ecea5badcb1d55190
3535
https://github.com/nanomsg/nanomsg/archive/1.0.0.tar.gz==6f56ef28c93cee644e8c4aaaef7cfb55
3636
https://github.com/NephosInc/SONiC/raw/master/sai/libsainps-dev_3.0.0_sai_1.5.0_06a67d_amd64.deb==64931041f82533e2a05e003ed9d878c8
3737
https://github.com/NephosInc/SONiC/raw/master/sai/libsainps_3.0.0_sai_1.5.0_06a67d_amd64.deb==385b84051259ebb2580522a990cca161

‎files/build/versions/dockers/docker-config-engine-buster/versions-deb-buster

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,4 +48,4 @@ patch==2.7.6-3+deb10u1
4848
python3-dev==3.7.3-1
4949
python3-swsscommon==1.0.0
5050
python3.7-dev==3.7.3-2+deb10u3
51-
xz-utils==5.2.4-1
51+
xz-utils==5.2.4-1+deb10u1

‎files/build/versions/dockers/docker-config-engine-buster/versions-deb-buster-arm64

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,5 +8,4 @@ libxml2-dev==2.9.4+dfsg1-7+deb10u3
88
libxslt1-dev==1.1.32-2.2~deb10u1
99
libxslt1.1==1.1.32-2.2~deb10u1
1010
pkg-config==0.29-6
11-
zlib1g==1:1.2.11.dfsg-1+deb10u1
1211
zlib1g-dev==1:1.2.11.dfsg-1+deb10u1

‎files/build/versions/dockers/docker-config-engine-buster/versions-deb-buster-armhf

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,5 +8,4 @@ libxml2-dev==2.9.4+dfsg1-7+deb10u3
88
libxslt1-dev==1.1.32-2.2~deb10u1
99
libxslt1.1==1.1.32-2.2~deb10u1
1010
pkg-config==0.29-6
11-
zlib1g==1:1.2.11.dfsg-1+deb10u1
1211
zlib1g-dev==1:1.2.11.dfsg-1+deb10u1

‎files/build/versions/dockers/docker-config-engine-buster/versions-py3

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,5 +8,5 @@ pyangbind==0.8.1
88
pyyaml==5.4.1
99
redis==3.5.3
1010
redis-dump-load==1.1
11-
regex==2022.3.15
11+
regex==2022.4.24
1212
six==1.16.0

‎files/build/versions/dockers/docker-config-engine-stretch/versions-deb-stretch

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,4 +43,4 @@ patch==2.7.5-1+deb9u2
4343
python-dev==2.7.13-2
4444
python-swsscommon==1.0.0
4545
python2.7-dev==2.7.13-2+deb9u6
46-
xz-utils==5.2.2-1.2+b1
46+
xz-utils==5.2.2-1.2+deb9u1

‎files/build/versions/dockers/docker-orchagent/versions-py3

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,2 @@
11
netifaces==0.10.9
2-
pyroute2==0.5.14
3-
scapy==2.4.4
2+
pyroute2==0.5.14

‎files/build/versions/dockers/docker-ptf/versions-deb-stretch

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ libfastjson4==0.99.4-1
7171
libffi-dev==3.2.1-6
7272
libffi6==3.2.1-6
7373
libfile-fcntllock-perl==0.22-3+b2
74-
libfribidi0==0.19.7-1+deb9u1
74+
libfribidi0==0.19.7-1+deb9u2
7575
libgc1c2==1:7.4.2-8+deb9u1
7676
libgcc-6-dev==6.3.0-18+deb9u1
7777
libgdbm3==1.8.3-14
@@ -169,7 +169,7 @@ libxau6==1:1.0.8-1
169169
libxcb1==1.12-1
170170
libxdmcp6==1:1.1.2-3
171171
libxext6==2:1.3.3-1+b2
172-
libxml2==2.9.4+dfsg1-2.2+deb9u5
172+
libxml2==2.9.4+dfsg1-2.2+deb9u6
173173
libxmuu1==2:1.1.2-2
174174
linux-libc-dev==4.9.303-1
175175
logrotate==3.11.0-0.1
@@ -227,7 +227,6 @@ tcpdump==4.9.3-1~deb9u2
227227
telnet==0.17-41
228228
tmux==2.3-4
229229
traceroute==1:2.1.0-2
230-
tzdata==2021a-0+deb9u3
231230
ucf==3.0036
232231
unzip==6.0-21+deb9u2
233232
vim==2:8.0.0197-4+deb9u5
@@ -238,5 +237,4 @@ xauth==1:1.0.9-1+b2
238237
xdg-user-dirs==0.15-2+b1
239238
xml-core==0.17
240239
xxd==2:8.0.0197-4+deb9u5
241-
xz-utils==5.2.2-1.2+b1
242-
zlib1g==1:1.2.8.dfsg-5+deb9u1
240+
xz-utils==5.2.2-1.2+deb9u1

‎files/build/versions/dockers/docker-ptf/versions-py2

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ markupsafe==1.1.1
2525
netaddr==0.8.0
2626
nnpy==1.4.2
2727
oslo.config==2.1.0
28-
paramiko==2.10.3
28+
paramiko==2.10.4
2929
pathlib2==2.3.7.post1
3030
pbr==2.0.0
3131
pexpect==4.8.0

‎files/build/versions/dockers/docker-sonic-mgmt-framework/versions-py3

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,18 +9,18 @@ grpcio==1.44.0
99
grpcio-tools==1.20.0
1010
idna==3.3
1111
importlib-metadata==4.11.3
12-
importlib-resources==5.6.0
12+
importlib-resources==5.7.1
1313
inflection==0.5.1
1414
itsdangerous==2.1.2
1515
jsonschema==4.4.0
1616
openapi-schema-validator==0.2.3
1717
openapi-spec-validator==0.4.0
18-
protobuf==3.20.0
18+
protobuf==3.20.1
1919
pyrsistent==0.18.1
2020
python-dateutil==2.6.0
2121
requests==2.27.1
2222
six==1.11.0
23-
typing_extensions==4.1.1
23+
typing_extensions==4.2.0
2424
urllib3==1.26.5
2525
werkzeug==2.1.1
2626
zipp==3.8.0

0 commit comments

Comments
 (0)