Skip to content

Commit

Permalink
Merge pull request #71 from mssonicbld/sonicbld/202205-merge
Browse files Browse the repository at this point in the history 
[code sync] Merge code from sonic-net/sonic-buildimage:202205 to 202205
  • Loading branch information
@mssonicbld
mssonicbld authored Jul 23, 2023
2 parents bfc8199 + 4a97454 commit bd017a4
Show file tree
Hide file tree
Showing 19 changed files with 56 additions and 57 deletions.
4 changes: 2 additions & 2 deletions files/build/versions/build/build-sonic-slave-buster/versions-deb-buster
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -37,4 +37,4 @@ sonic-mgmt-framework==1.0-01
swss==1.0.0
syncd==1.0.0
syncd-vs==1.0.0
thrift-compiler==0.14.1
thrift-compiler==0.11.0-4
10 changes: 5 additions & 5 deletions files/build/versions/default/versions-git
View file
Original file line number Diff line number Diff line change
@@ -1,18 +1,18 @@
https://chromium.googlesource.com/chromium/tools/depot_tools.git==b389d031a263181c816b6609333a30bdecf4194b
https://chromium.googlesource.com/chromium/tools/depot_tools.git==d411904b84c0d9f539bbdc84e3d63f9f282c658b
https://github.com/aristanetworks/swi-tools.git==b5f087e4774168bf536360d43c9c509c8f14ad9f
https://github.com/CESNET/libyang.git==ea94c8b9f513f8a6ddc6ce1540fa41eaf4c8922a
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==ea54723cf86b8c2f670371e93d66593acea0749e
https://github.com/FreeRADIUS/freeradius-server.git==93654401bbd801f7c4fcb5e30036f14419bb1789
https://github.com/flashrom/flashrom.git==2b692d78c2ab8cb1ba68516cb4bd2ceae80d8936
https://github.com/FreeRADIUS/freeradius-server.git==a932b1c482fecc8b9f948e68470e52fb699eee9a
https://github.com/FreeRADIUS/pam_radius.git==8d373539bb9f13b0abfe8bcae0095a930a00fad0
https://github.com/jeroennijhof/pam_tacplus.git==4284d9016e64def2bb81d5f50f96dc3b59bfdc39
https://github.com/jpirko/libteam.git==7cb5de8b01be132bd4150eff460bfd83296414b6
https://github.com/lguohan/gnxi.git==b85e4ab565df4472fdcfcded2a53e6bf57aa493f
https://github.com/Marvell-switching/mrvl-prestera.git==179c08b0544db0b3a95a843e31266e00a68fb4b0
https://github.com/Mellanox/libpsample.git==62bb27d9a49424e45191eee81df7ce0d8c74e774
https://github.com/opencomputeproject/SAI.git==ef4b8b4176f2e213dcdd524e7951f08a0b2cef23
https://github.com/opencomputeproject/SAI.git==e15cc853cd099d1f73f8c34cf626b83ee6604769
https://github.com/p4lang/scapy-vxlan.git==85ffe83da156568ee47a0750f638227e6e1d7479
https://github.com/sflow/host-sflow==4dc68a95fa57758119d76e42965b32493ffd7094
https://github.com/sflow/sflowtool==4ce1223bb4c2cd0cbb1dd688dc0914561fcbb6c4
Expand All @@ -21,4 +21,4 @@ https://salsa.debian.org/debian/libteam.git==48142125234a665ad5367b724af36a58fb4
https://salsa.debian.org/kernel-team/ethtool/==d0578651310379629399dde060577d4b9b0bcab1
https://salsa.debian.org/kernel-team/initramfs-tools.git==193dfbb7929e518976f89f6c8dd9201982e56f80
https://salsa.debian.org/sk-guest/monit.git==c9da7ebb1f35dfba17b50b5969a6e75e29cbec0d
https://salsa.debian.org/ssh-team/openssh.git==74d15e80b8730335a9b13469ca6cafe4c1c8e485
https://salsa.debian.org/ssh-team/openssh.git==d9a514f93f17d22766cfe760e25254ef13cb5eb1
20 changes: 10 additions & 10 deletions files/build/versions/default/versions-mirror
View file
Original file line number Diff line number Diff line change
@@ -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==20230716T000128Z
debian-security==20230716T000215Z
debian==20230722T000117Z
debian-security==20230722T000118Z
download.docker.com_linux_debian_dists_bullseye==2023-07-07T20:10:57Z
download.docker.com_linux_debian_dists_buster==2023-07-07T20:10:57Z
packages.microsoft.com_repos_sonic-dev_dists_jessie==2022-10-31T19:34:29Z
packages.trafficmanager.net_snapshot_debian-security_20230716T000215Z_dists_bullseye-security==2023-07-14T23:42:45Z
packages.trafficmanager.net_snapshot_debian-security_20230716T000215Z_dists_buster_updates==2023-07-14T23:42:45Z
packages.trafficmanager.net_snapshot_debian_20230716T000128Z_dists_bullseye==2023-06-10T08:52:21Z
packages.trafficmanager.net_snapshot_debian_20230716T000128Z_dists_bullseye-backports==2023-07-15T20:35:32Z
packages.trafficmanager.net_snapshot_debian_20230716T000128Z_dists_bullseye-updates==2023-07-15T20:35:32Z
packages.trafficmanager.net_snapshot_debian_20230716T000128Z_dists_buster==2023-06-10T08:53:33Z
packages.trafficmanager.net_snapshot_debian_20230716T000128Z_dists_buster-backports==2023-07-15T20:35:32Z
packages.trafficmanager.net_snapshot_debian_20230716T000128Z_dists_buster-updates==2023-06-10T08:55:10Z
packages.trafficmanager.net_snapshot_debian-security_20230722T000118Z_dists_bullseye-security==2023-07-21T05:05:42Z
packages.trafficmanager.net_snapshot_debian-security_20230722T000118Z_dists_buster_updates==2023-07-21T05:05:42Z
packages.trafficmanager.net_snapshot_debian_20230722T000117Z_dists_bullseye==2023-06-10T08:52:21Z
packages.trafficmanager.net_snapshot_debian_20230722T000117Z_dists_bullseye-backports==2023-07-21T20:27:20Z
packages.trafficmanager.net_snapshot_debian_20230722T000117Z_dists_bullseye-updates==2023-07-21T20:27:20Z
packages.trafficmanager.net_snapshot_debian_20230722T000117Z_dists_buster==2023-06-10T08:53:33Z
packages.trafficmanager.net_snapshot_debian_20230722T000117Z_dists_buster-backports==2023-07-21T20:27:20Z
packages.trafficmanager.net_snapshot_debian_20230722T000117Z_dists_buster-updates==2023-06-10T08:55:10Z
2 changes: 1 addition & 1 deletion files/build/versions/default/versions-web
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ https://deb.debian.org/debian/pool/main/k/kdump-tools/kdump-tools_1.6.8.4.tar.xz
https://deb.nodesource.com/gpgkey/nodesource.gpg.key==003b51a89a133b5db4cca98b2dea3117
https://deb.nodesource.com/node_14.x/dists/bullseye/Release==6b7d50c433d129d4c6fd95bdf56070fa
https://deb.nodesource.com/node_14.x/dists/buster/Release==42875141604382f0abb4d047f645dfe1
https://deb.nodesource.com/setup_14.x==1c9de9348c0acd5f2ee422a6d0c333b3
https://deb.nodesource.com/setup_14.x==472c9614e7c6dd029f205890ed356a22
https://download.docker.com/linux/debian/gpg==1afae06b34a13c1b3d9cb61a26285a15
https://github.com/aristanetworks/sonic-firmware/raw/e89a1696954fd381e1e95edf208cffc97caf15d4/phy/phy-credo_1.0_amd64.deb==fc197598098d030526c08d55cdd3910f
https://github.com/barefootnetworks/sonic-release-pkgs/raw/dev/bfnplatform_20220408_sai_1.9.1_deb10.deb==890a53ca1374dfcf8c12091d74fd2ef8
Expand Down
2 changes: 1 addition & 1 deletion files/build/versions/dockers/docker-config-engine-bullseye/versions-deb-bullseye
View file
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ libtsan0==10.2.1-6
libubsan1==10.2.1-6
libyang==1.0.73
libyang-cpp==1.0.73
linux-libc-dev==5.10.179-1
linux-libc-dev==5.10.179-2
make==4.3-4.1
patch==2.7.6-7
python3-dev==3.9.2-3
Expand Down
1 change: 0 additions & 1 deletion files/build/versions/dockers/docker-dhcp-relay/versions-deb-bullseye
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ isc-dhcp-relay==4.4.1-2.3+deb11u2
isc-dhcp-relay-dbgsym==4.4.1-2.3+deb11u2
libbabeltrace1==1.5.8-1+b3
libboost-regex1.74.0==1.74.0-9
libboost-thread1.74.0==1.74.0-9
libcbor0==0.5.0+dfsg-2
libcurl3-gnutls==7.74.0-1.3+deb11u7
libdebuginfod1==0.183-1
Expand Down
2 changes: 1 addition & 1 deletion files/build/versions/dockers/docker-gbsyncd-broncos/versions-deb-bullseye
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ libsource-highlight4v5==3.1.9-3+b1
libswsscommon-dbgsym==1.0.0
libtirpc-dev==1.3.1-1+deb11u1
libunwind8==1.3.2-2
linux-libc-dev==5.10.179-1
linux-libc-dev==5.10.179-2
openssh-client==1:8.4p1-5+deb11u1
sshpass==1.09-1+b1
strace==5.10-1
Expand Down
2 changes: 1 addition & 1 deletion files/build/versions/dockers/docker-orchagent/versions-deb-bullseye
View file
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ libtirpc-dev==1.3.1-1+deb11u1
libtsan0==10.2.1-6
libubsan1==10.2.1-6
libunwind8==1.3.2-2
linux-libc-dev==5.10.179-1
linux-libc-dev==5.10.179-2
make==4.3-4.1
ndisc6==1.0.4-2
ndppd==0.2.5-6
Expand Down
2 changes: 1 addition & 1 deletion files/build/versions/dockers/docker-platform-monitor/versions-deb-bullseye
View file
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@ libxdmcp6==1:1.1.2-3
libxext6==2:1.3.3-1.1
libxml2==2.9.10+dfsg-6.7+deb11u4
libxrender1==1:0.9.10-1
linux-libc-dev==5.10.179-1
linux-libc-dev==5.10.179-2
lm-sensors==1:3.6.0-7
lm-sensors-dbgsym==1:3.6.0-7
make==4.3-4.1
Expand Down
2 changes: 1 addition & 1 deletion files/build/versions/dockers/docker-saiserverv2-mlnx/versions-deb-bullseye
View file
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ libuv1==1.40.0-2
libxml2==2.9.10+dfsg-6.7+deb11u4
libxml2-utils==2.9.10+dfsg-6.7+deb11u4
libxslt1.1==1.1.34-4+deb11u1
linux-libc-dev==5.10.179-1
linux-libc-dev==5.10.179-2
mailcap==3.69
make==4.3-4.1
mft==4.22.1-15
Expand Down
2 changes: 1 addition & 1 deletion files/build/versions/dockers/docker-snmp/versions-deb-bullseye
View file
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ libtirpc-dev==1.3.1-1+deb11u1
libtsan0==10.2.1-6
libubsan1==10.2.1-6
libunwind8==1.3.2-2
linux-libc-dev==5.10.179-1
linux-libc-dev==5.10.179-2
locales==2.31-13+deb11u6
make==4.3-4.1
openssh-client==1:8.4p1-5+deb11u1
Expand Down
2 changes: 1 addition & 1 deletion files/build/versions/dockers/docker-syncd-brcm-dnx-rpc/versions-deb-bullseye
View file
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ libtsan0==10.2.1-6
libubsan1==10.2.1-6
libuv1==1.40.0-2
libxml2==2.9.10+dfsg-6.7+deb11u4
linux-libc-dev==5.10.179-1
linux-libc-dev==5.10.179-2
mailcap==3.69
make==4.3-4.1
mime-support==3.66
Expand Down
2 changes: 1 addition & 1 deletion files/build/versions/dockers/docker-syncd-brcm-rpc/versions-deb-bullseye
View file
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ libtsan0==10.2.1-6
libubsan1==10.2.1-6
libuv1==1.40.0-2
libxml2==2.9.10+dfsg-6.7+deb11u4
linux-libc-dev==5.10.179-1
linux-libc-dev==5.10.179-2
mailcap==3.69
make==4.3-4.1
mime-support==3.66
Expand Down
2 changes: 1 addition & 1 deletion files/build/versions/dockers/docker-syncd-mlnx/versions-deb-bullseye
View file
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ libswsscommon-dbgsym==1.0.0
libtirpc-dev==1.3.1-1+deb11u1
libunwind8==1.3.2-2
libxml2==2.9.10+dfsg-6.7+deb11u4
linux-libc-dev==5.10.179-1
linux-libc-dev==5.10.179-2
mailcap==3.69
mft==4.22.1-15
mime-support==3.66
Expand Down
12 changes: 6 additions & 6 deletions files/build/versions/dockers/sonic-slave-bullseye/versions-deb-bullseye
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1364,12 +1364,12 @@ libzvbi0==0.2.35-18
libzzip-0-13==0.13.62-3.3+deb11u1
licensecheck==3.1.1-2
lintian==2.104.0
linux-compiler-gcc-10-x86==5.10.179-1
linux-headers-5.10.0-23-amd64==5.10.179-1
linux-headers-5.10.0-23-common==5.10.179-1
linux-headers-amd64==5.10.179-1
linux-kbuild-5.10==5.10.179-1
linux-libc-dev==5.10.179-1
linux-compiler-gcc-10-x86==5.10.179-2
linux-headers-5.10.0-23-amd64==5.10.179-2
linux-headers-5.10.0-23-common==5.10.179-2
linux-headers-amd64==5.10.179-2
linux-kbuild-5.10==5.10.179-2
linux-libc-dev==5.10.179-2
linuxdoc-tools==0.9.82-1
llvm-11==1:11.0.1-2
llvm-11-dev==1:11.0.1-2
Expand Down
4 changes: 2 additions & 2 deletions files/build/versions/dockers/sonic-slave-bullseye/versions-deb-bullseye-arm64
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,6 @@ libgomp1-armhf-cross==10.2.1-6cross1
libstdc++6-armhf-cross==10.2.1-6cross1
libubsan1-armhf-cross==10.2.1-6cross1
libxslt1-dev==1.1.34-4+deb11u1
linux-headers-5.10.0-23-arm64==5.10.179-1
linux-headers-arm64==5.10.179-1
linux-headers-5.10.0-23-arm64==5.10.179-2
linux-headers-arm64==5.10.179-2
nodejs==14.21.3-deb-1nodesource1
6 changes: 3 additions & 3 deletions files/build/versions/dockers/sonic-slave-bullseye/versions-deb-bullseye-armhf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,9 +35,9 @@ libxapian-dev==1.4.18-3+deb11u1
libxslt1-dev==1.1.34-4+deb11u1
libxstring-perl==0.005-1+b1
libyaml-tiny-perl==1.73-1
linux-compiler-gcc-10-arm==5.10.179-1
linux-headers-5.10.0-23-armmp==5.10.179-1
linux-headers-armmp==5.10.179-1
linux-compiler-gcc-10-arm==5.10.179-2
linux-headers-5.10.0-23-armmp==5.10.179-2
linux-headers-armmp==5.10.179-2
mat2==0.12.1-2+deb11u1
nasm==2.15.05-1
nodejs==14.21.3-deb-1nodesource1
Expand Down
30 changes: 15 additions & 15 deletions files/build/versions/dockers/sonic-slave-buster/versions-deb-buster
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ autopoint==0.19.8.1-9
autotools-dev==20180224.1
bash-completion==1:2.8-6
bc==1.07.1-2+b1
bind9-host==1:9.11.5.P4+dfsg-5.1+deb10u8
bind9-host==1:9.11.5.P4+dfsg-5.1+deb10u9
binfmt-support==2.2.0-2
binutils==2.31.1-16
binutils-common==2.31.1-16
Expand Down Expand Up @@ -87,7 +87,7 @@ distro-info-data==0.41+deb10u7
dkms==2.6.1-4
dmeventd==2:1.02.155-3
dmsetup==2:1.02.155-3
dnsutils==1:9.11.5.P4+dfsg-5.1+deb10u8
dnsutils==1:9.11.5.P4+dfsg-5.1+deb10u9
docbook==4.5-6
docbook-dsssl==1.79-9.1
docbook-to-man==1:2.0.0-42
Expand Down Expand Up @@ -285,8 +285,8 @@ libbabeltrace-dev==1.5.6-2+deb10u1
libbabeltrace1==1.5.6-2+deb10u1
libbatik-java==1.10-2+deb10u2
libbdplus0==0.1.2-3
libbind-export-dev==1:9.11.5.P4+dfsg-5.1+deb10u8
libbind9-161==1:9.11.5.P4+dfsg-5.1+deb10u8
libbind-export-dev==1:9.11.5.P4+dfsg-5.1+deb10u9
libbind9-161==1:9.11.5.P4+dfsg-5.1+deb10u9
libbinutils==2.31.1-16
libbison-dev==2:3.3.2.dfsg-1
libbit-vector-perl==7.4-1+b5
Expand Down Expand Up @@ -450,8 +450,8 @@ libdist-checkconflicts-perl==0.11-1
libdistro-info-perl==0.21
libdjvulibre-text==3.5.27.1-10+deb10u1
libdjvulibre21==3.5.27.1-10+deb10u1
libdns-export1104==1:9.11.5.P4+dfsg-5.1+deb10u8
libdns1104==1:9.11.5.P4+dfsg-5.1+deb10u8
libdns-export1104==1:9.11.5.P4+dfsg-5.1+deb10u9
libdns1104==1:9.11.5.P4+dfsg-5.1+deb10u9
libdom4j-java==2.1.1-2
libdouble-conversion1==3.1.0-3
libdoxia-core-java==1.7-2
Expand Down Expand Up @@ -666,14 +666,14 @@ libipc-system-simple-perl==1.25-4
libipt2==2.0-2
libiptc-dev==1.8.2-4
libiptc0==1.8.2-4
libirs-export161==1:9.11.5.P4+dfsg-5.1+deb10u8
libirs161==1:9.11.5.P4+dfsg-5.1+deb10u8
libisc-export1100==1:9.11.5.P4+dfsg-5.1+deb10u8
libisc1100==1:9.11.5.P4+dfsg-5.1+deb10u8
libisccc-export161==1:9.11.5.P4+dfsg-5.1+deb10u8
libisccc161==1:9.11.5.P4+dfsg-5.1+deb10u8
libisccfg-export163==1:9.11.5.P4+dfsg-5.1+deb10u8
libisccfg163==1:9.11.5.P4+dfsg-5.1+deb10u8
libirs-export161==1:9.11.5.P4+dfsg-5.1+deb10u9
libirs161==1:9.11.5.P4+dfsg-5.1+deb10u9
libisc-export1100==1:9.11.5.P4+dfsg-5.1+deb10u9
libisc1100==1:9.11.5.P4+dfsg-5.1+deb10u9
libisccc-export161==1:9.11.5.P4+dfsg-5.1+deb10u9
libisccc161==1:9.11.5.P4+dfsg-5.1+deb10u9
libisccfg-export163==1:9.11.5.P4+dfsg-5.1+deb10u9
libisccfg163==1:9.11.5.P4+dfsg-5.1+deb10u9
libisl19==0.20-2
libitext1-java==1.4-7
libitm1==8.3.0-6
Expand Down Expand Up @@ -753,7 +753,7 @@ liblua5.1-0-dev==5.1.5-8.1+b2
liblvm2cmd2.03==2.03.02-3
liblwp-mediatypes-perl==6.02-1
liblwp-protocol-https-perl==6.07-2
liblwres161==1:9.11.5.P4+dfsg-5.1+deb10u8
liblwres161==1:9.11.5.P4+dfsg-5.1+deb10u9
liblzma-dev==5.2.4-1+deb10u1
liblzo2-2==2.10-0.1
liblzo2-dev==2.10-0.1
Expand Down
6 changes: 3 additions & 3 deletions files/build/versions/host-image/versions-deb-bullseye
View file
Original file line number Diff line number Diff line change
Expand Up @@ -305,9 +305,9 @@ libyang==1.0.73
libyang-cpp==1.0.73
linux-base==4.6
linux-image-5.10.0-18-2-amd64-unsigned==5.10.140-1
linux-libc-dev==5.10.179-1
linux-perf==5.10.179-1
linux-perf-5.10==5.10.179-1
linux-libc-dev==5.10.179-2
linux-perf==5.10.179-2
linux-perf-5.10==5.10.179-2
locales==2.31-13+deb11u6
logrotate==3.18.0-2+deb11u1
lsb-release==11.1.0
Expand Down

0 comments on commit bd017a4

Please sign in to comment.