Skip to content

Commit

Permalink
Merge pull request sonic-net#179 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 authored Dec 7, 2023
2 parents a7b284b + 57da267 commit e4854fe
Show file tree
Hide file tree
Showing 8 changed files with 35 additions and 31 deletions.
12 changes: 6 additions & 6 deletions files/build/versions/default/versions-git
Original file line number Diff line number Diff line change
@@ -1,24 +1,24 @@
https://chromium.googlesource.com/chromium/tools/depot_tools.git==0acc468d8b47c5665bf75677923c54c96c772b88
https://chromium.googlesource.com/chromium/tools/depot_tools.git==963000950bc08f9dca9dde2d7a40e71079d606ae
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==bda8361453077a6db2f895eccd345f17bfabfb94
https://github.com/FreeRADIUS/freeradius-server.git==863a3f2342568bfdfcf16f12177178bb14c74b4b
https://github.com/flashrom/flashrom.git==9a570318bbb816c6f6587b64d82c986678703495
https://github.com/FreeRADIUS/freeradius-server.git==d7d0e5f502179b5a70183ad95488cd6aec65a66e
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==bf5ff3d4d7757beb22a502be64da92e4680a7691
https://github.com/opencomputeproject/SAI.git==25ef69febf44e4a8fc07a9aed4dfc691c13e8f3a
https://github.com/p4lang/scapy-vxlan.git==85ffe83da156568ee47a0750f638227e6e1d7479
https://github.com/sflow/host-sflow==571c86a6189ba6b51fd58cd7a6ccd9ab0421ab14
https://github.com/sflow/sflowtool==2b622f99d36254884507d9137e6e99020db260cb
https://github.com/thom311/libnl==cd4016bab267e6984693032338c8f43232ff6a3e
https://github.com/thom311/libnl==bdf83151326e365f137fe0e36dc9b1b7aeb1cf33
https://salsa.debian.org/debian/libteam.git==48142125234a665ad5367b724af36a58fb484d3d
https://salsa.debian.org/kernel-team/ethtool/==5d4d4a9cb16fd20f5e6f9df7b60a331a958ede7e
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
20 changes: 10 additions & 10 deletions files/build/versions/default/versions-mirror
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==20231128T000236Z
debian-security==20231128T000230Z
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
packages.microsoft.com_repos_sonic-dev_dists_jessie==2022-10-31T19:34:29Z
packages.trafficmanager.net_snapshot_debian-security_20231128T000230Z_dists_bullseye-security==2023-11-27T23:33:08Z
packages.trafficmanager.net_snapshot_debian-security_20231128T000230Z_dists_buster_updates==2023-11-27T23:33:10Z
packages.trafficmanager.net_snapshot_debian_20231128T000236Z_dists_bullseye==2023-10-07T11:07:16Z
packages.trafficmanager.net_snapshot_debian_20231128T000236Z_dists_bullseye-backports==2023-11-27T20:16:12Z
packages.trafficmanager.net_snapshot_debian_20231128T000236Z_dists_bullseye-updates==2023-11-27T20:16:11Z
packages.trafficmanager.net_snapshot_debian_20231128T000236Z_dists_buster==2023-06-10T08:53:33Z
packages.trafficmanager.net_snapshot_debian_20231128T000236Z_dists_buster-backports==2023-11-27T20:16:12Z
packages.trafficmanager.net_snapshot_debian_20231128T000236Z_dists_buster-updates==2023-06-10T08:55:10Z
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
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ libmpdec3==2.5.1-1
libmpfr6==4.1.0-3
libncurses6==6.2+20201114-2+deb11u2
libncursesw6==6.2+20201114-2+deb11u2
libnghttp2-14==1.43.0-1
libnghttp2-14==1.43.0-1+deb11u1
libnorm1==1.5.9+dfsg-2
libnsl-dev==1.3.0-2
libonig5==6.9.6-1.1
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,8 @@ libldap-common==2.4.47+dfsg-3+deb10u7
liblognorm5==2.0.5-1
liblua5.1-0==5.1.5-8.1+b2
libmpdec2==2.4.2-2
libncurses6==6.1+20181013-2+deb10u4
libncurses6==6.1+20181013-2+deb10u5
libncursesw6==6.1+20181013-2+deb10u5
libnghttp2-14==1.36.0-2+deb10u2
libnorm1==1.5.8+dfsg2-1
libonig5==6.9.1-1
Expand All @@ -43,6 +44,7 @@ libsodium23==1.0.17-1
libsqlite3-0==3.27.2-3+deb10u2
libssh2-1==1.8.0-2.1+deb10u1
libssl1.1==1.1.1n-0+deb10u6
libtinfo6==6.1+20181013-2+deb10u5
libwrap0==7.6.q-28
libzmq5==4.3.1-4+deb10u2
lsb-base==10.2019051400
Expand Down
12 changes: 6 additions & 6 deletions files/build/versions/dockers/docker-ptf/versions-deb-buster
Original file line number Diff line number Diff line change
Expand Up @@ -219,8 +219,8 @@ libmpc3==1.1.0-1
libmpdec2==2.4.2-2
libmpfr6==4.0.2-1
libmpx2==8.3.0-6
libncurses6==6.1+20181013-2+deb10u4
libncursesw6==6.1+20181013-2+deb10u3
libncurses6==6.1+20181013-2+deb10u5
libncursesw6==6.1+20181013-2+deb10u5
libnet-dbus-perl==1.1.0-5+b1
libnet-http-perl==6.18-1
libnet-smtp-ssl-perl==1.04-1
Expand Down Expand Up @@ -309,7 +309,7 @@ libthrift-0.11.0==0.11.0-4
libtie-ixhash-perl==1.23-2
libtiff5==4.1.0+git191117-2~deb10u8
libtimedate-perl==2.3000-2+deb10u1
libtinfo6==6.1+20181013-2+deb10u3
libtinfo6==6.1+20181013-2+deb10u5
libtk8.6==8.6.9-2
libtry-tiny-perl==0.30-1
libtsan0==8.3.0-6
Expand Down Expand Up @@ -379,9 +379,9 @@ make==4.2.1-1.2
manpages==4.16-2
manpages-dev==4.16-2
mime-support==3.62
ncurses-base==6.1+20181013-2+deb10u3
ncurses-bin==6.1+20181013-2+deb10u3
ncurses-term==6.1+20181013-2+deb10u4
ncurses-base==6.1+20181013-2+deb10u5
ncurses-bin==6.1+20181013-2+deb10u5
ncurses-term==6.1+20181013-2+deb10u5
net-tools==1.60+git20180626.aebd88e-1
netbase==5.6
ntp==1:4.2.8p12+dfsg-4
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -862,7 +862,7 @@ libnfnetlink0==1.0.1-3+b1
libnftables1==0.9.8-3.1+deb11u1
libnftnl-dev==1.1.9-1
libnftnl11==1.1.9-1
libnghttp2-14==1.43.0-1
libnghttp2-14==1.43.0-1+deb11u1
libnl-3-200==3.4.0-1+b1
libnl-route-3-200==3.4.0-1+b1
libnorm-dev==1.5.9+dfsg-2
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -433,7 +433,7 @@ libdbus-glib-1-2==0.110-4
libdbus-glib-1-dev==0.110-4
libdbus-glib-1-dev-bin==0.110-4
libdconf1==0.30.1-2
libde265-0==1.0.11-0+deb10u4
libde265-0==1.0.11-0+deb10u5
libdebhelper-perl==13.3.3~bpo10+1
libdevel-callchecker-perl==0.008-1
libdevel-caller-perl==2.06-2+b1
Expand Down Expand Up @@ -809,9 +809,10 @@ libnamespace-autoclean-perl==0.28-1
libnamespace-clean-perl==0.27-1
libnanomsg-dev==1.1.5+dfsg-1
libnanomsg5==1.1.5+dfsg-1
libncurses-dev==6.1+20181013-2+deb10u4
libncurses5-dev==6.1+20181013-2+deb10u4
libncurses6==6.1+20181013-2+deb10u4
libncurses-dev==6.1+20181013-2+deb10u5
libncurses5-dev==6.1+20181013-2+deb10u5
libncurses6==6.1+20181013-2+deb10u5
libncursesw6==6.1+20181013-2+deb10u5
libnet-dbus-perl==1.1.0-5+b1
libnet-dns-perl==1.19-1
libnet-dns-sec-perl==1.11-1
Expand Down Expand Up @@ -1141,6 +1142,7 @@ libtheora0==1.1.1+dfsg.1-15
libtie-ixhash-perl==1.23-2
libtiff5==4.1.0+git191117-2~deb10u8
libtimedate-perl==2.3000-2+deb10u1
libtinfo6==6.1+20181013-2+deb10u5
libtinyxml2-6a==7.0.0+dfsg-1
libtinyxml2-dev==7.0.0+dfsg-1
libtk8.6==8.6.9-2
Expand Down Expand Up @@ -1389,7 +1391,7 @@ mesa-vdpau-drivers==18.3.6-2+deb10u1
mime-support==3.62
module-assistant==0.11.10
mysql-common==5.8+1.0.5
ncurses-term==6.1+20181013-2+deb10u4
ncurses-term==6.1+20181013-2+deb10u5
netbase==5.6
netpbm==2:10.0-15.3+b2
nettle-dev==3.4.1-1+deb10u1
Expand Down
2 changes: 1 addition & 1 deletion files/build/versions/host-image/versions-deb-bullseye
Original file line number Diff line number Diff line change
Expand Up @@ -209,7 +209,7 @@ libnet1==1.1.6+dfsg-3.1
libnetfilter-conntrack3==1.0.8-3
libnfnetlink0==1.0.1-3+b1
libnftnl11==1.1.9-1
libnghttp2-14==1.43.0-1
libnghttp2-14==1.43.0-1+deb11u1
libnl-3-200==3.5.0-1
libnl-cli-3-200==3.5.0-1
libnl-genl-3-200==3.5.0-1
Expand Down

0 comments on commit e4854fe

Please sign in to comment.