Skip to content

Commit

Permalink
Merge pull request sonic-net#150 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 Oct 31, 2023
2 parents 67d0589 + a3f2da2 commit c022ef3
Show file tree
Hide file tree
Showing 57 changed files with 575 additions and 594 deletions.
51 changes: 20 additions & 31 deletions files/build/versions/build/build-sonic-slave-bullseye/versions-deb-bullseye
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
applibs==1.mlnx.4.5.4206
applibs-dev==1.mlnx.4.5.4206
iproute2-dev==1.mlnx.4.5.4206
isc-dhcp-relay==4.4.1-2.3+deb11u2
applibs==1.mlnx.4.5.4318
applibs-dev==1.mlnx.4.5.4318
iproute2-dev==1.mlnx.4.5.4318
kernel-mft-dkms==4.22.1-15
libhiredis-dev==0.14.1-1
libhiredis0.14==0.14.1-1
Expand All @@ -13,8 +12,8 @@ libnl-genl-3-dev==3.5.0-1
libnl-nf-3-200==3.5.0-1
libnl-nf-3-dev==3.5.0-1
libnl-route-3-dev==3.5.0-1
libsaibcm==7.1.54.4-3
libsaibcm-dev==7.1.54.4-3
libsaibcm==7.1.62.4
libsaibcm-dev==7.1.62.4
libsaimetadata==1.0.0
libsaimetadata-dev==1.0.0
libsairedis==1.0.0
Expand All @@ -37,38 +36,28 @@ libyang-cpp==1.0.73
libyang-dev==1.0.73
linux-headers-5.10.0-18-2-amd64==5.10.140-1
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.22.1-15
mlnx-sai==1.mlnx.SAIBuild2205.24.0.2
mlnx-sai==1.mlnx.SAIBuild2205.25.1.2
net-tools==1.60+git20181103.0eebece-1
python-thrift==0.11.0-4
python3-swsscommon==1.0.0
python3-thrift==0.14.1
python3-yang==1.0.73
sonic-dhcp6relay==1.0.0-0
sonic-dhcpmon==1.0.0-0
sonic-linkmgrd==1.0.0-1
sonic-mgmt-common==1.0.0
sonic-mgmt-common-codegen==1.0.0
sonic-platform-pddf==1.1
sonic-platform-pddf-sym==1.1
swss==1.0.0
sx-acl-helper==1.mlnx.4.5.4206
sx-acl-helper-dev==1.mlnx.4.5.4206
sx-complib==1.mlnx.4.5.4206
sx-complib-dev==1.mlnx.4.5.4206
sx-examples==1.mlnx.4.5.4206
sx-examples-dev==1.mlnx.4.5.4206
sx-gen-utils==1.mlnx.4.5.4206
sx-gen-utils-dev==1.mlnx.4.5.4206
sx-scew==1.mlnx.4.5.4206
sx-scew-dev==1.mlnx.4.5.4206
sxd-libs==1.mlnx.4.5.4206
sxd-libs-dev==1.mlnx.4.5.4206
syncd==1.0.0
syncd-vs==1.0.0
sx-acl-helper==1.mlnx.4.5.4318
sx-acl-helper-dev==1.mlnx.4.5.4318
sx-complib==1.mlnx.4.5.4318
sx-complib-dev==1.mlnx.4.5.4318
sx-examples==1.mlnx.4.5.4318
sx-examples-dev==1.mlnx.4.5.4318
sx-gen-utils==1.mlnx.4.5.4318
sx-gen-utils-dev==1.mlnx.4.5.4318
sx-scew==1.mlnx.4.5.4318
sx-scew-dev==1.mlnx.4.5.4318
sxd-libs==1.mlnx.4.5.4318
sxd-libs-dev==1.mlnx.4.5.4318
thrift-compiler==0.14.1
wjh-libs==1.mlnx.4.5.4206
wjh-libs-dev==1.mlnx.4.5.4206
wpasupplicant==2:2.9.0-14
wjh-libs==1.mlnx.4.5.4318
wjh-libs-dev==1.mlnx.4.5.4318
3 changes: 2 additions & 1 deletion files/build/versions/build/build-sonic-slave-bullseye/versions-deb-bullseye-armhf
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
libnl-3-200==3.5.0-1
libnl-route-3-200==3.5.0-1
linux-headers-5.10.0-18-2-armmp==5.10.140-1
linux-headers-5.10.0-18-2-armmp==5.10.140-1
mrvllibsai==1.10.2-5
3 changes: 1 addition & 2 deletions files/build/versions/build/build-sonic-slave-bullseye/versions-py3-all-arm64
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
bitarray==1.5.3
click==7.0
requests==2.31.0
zipp==1.2.0
requests==2.31.0
3 changes: 1 addition & 2 deletions files/build/versions/build/build-sonic-slave-bullseye/versions-py3-all-armhf
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
bitarray==1.5.3
click==7.0
requests==2.31.0
zipp==1.2.0
requests==2.31.0
4 changes: 0 additions & 4 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 @@ -33,8 +33,4 @@ python3-thrift==0.14.1
python3-yang==1.0.73
sonic-mgmt-common==1.0.0
sonic-mgmt-common-codegen==1.0.0
sonic-mgmt-framework==1.0-01
swss==1.0.0
syncd==1.0.0
syncd-vs==1.0.0
thrift-compiler==0.11.0-4
24 changes: 12 additions & 12 deletions files/build/versions/default/versions-docker
View file
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
amd64:amd64/debian:bullseye==sha256:9d23db14fbdc095689c423af56b9525538de139a1bbe950b4f0467698fb874d2
amd64:amd64/debian:buster==sha256:d774a984460a74973e6ce4d1f87ab90f2818e41fcdd4802bcbdc4e0b67f9dadf
amd64:debian:bullseye==sha256:54d33aaad0bc936a9a40d856764c7bc35c0afaa9cab51f88bb95f6cd8004438d
amd64:debian:buster==sha256:484cc8ab0d73f513e3f9bacd03424eb081bd90f594d7ebde42587843fdc242f3
arm64:arm64v8/debian:bullseye==sha256:eefb45317844a131035d89384dbbe3858a0c22f6b7884e56648bd6b22d206a8a
arm64:arm64v8/debian:buster==sha256:de3b447d1ed18aabf08e36086037e7a78883ab3b25cb2b7fb014f7873391fe81
arm64:debian:bullseye==sha256:54d33aaad0bc936a9a40d856764c7bc35c0afaa9cab51f88bb95f6cd8004438d
arm64:debian:buster==sha256:484cc8ab0d73f513e3f9bacd03424eb081bd90f594d7ebde42587843fdc242f3
armhf:arm32v7/debian:bullseye==sha256:19973da79531feade9ed259004c735d0458285f1db9a16bd9d76a954b261c4ab
armhf:arm32v7/debian:buster==sha256:b6dc71e7be8b027386c8562e72ae8b78ee2db29093787e5268b18d42900a2d12
armhf:debian:bullseye==sha256:54d33aaad0bc936a9a40d856764c7bc35c0afaa9cab51f88bb95f6cd8004438d
armhf:debian:buster==sha256:484cc8ab0d73f513e3f9bacd03424eb081bd90f594d7ebde42587843fdc242f3
amd64:amd64/debian:bullseye==sha256:3da0c9fb1282040a13e26074dc1712f656fc2fa6d8d2e264612e5c7266f17653
amd64:amd64/debian:buster==sha256:88a98482ebe4b8ef20104c844d74ac59a7241e8782c9ea3a1c1d47503dbbbddb
amd64:debian:bullseye==sha256:c141beaa9e0767774221cc82efe3a6712a1cc4f75d2699334dfd9a28a6f7357b
amd64:debian:buster==sha256:853b9ec779e55f670cbdcb5e15bfb778b5be2c5c61fc8c655638b7a977d273c6
arm64:arm64v8/debian:bullseye==sha256:7a89d1fd045f797f2f34dd778bdf19335587357c3603859f2048f4c0285b06a8
arm64:arm64v8/debian:buster==sha256:22d2604df80a9385e2dd191b518bb33b7204805e01fbc80621aac7441f8dd0fd
arm64:debian:bullseye==sha256:c141beaa9e0767774221cc82efe3a6712a1cc4f75d2699334dfd9a28a6f7357b
arm64:debian:buster==sha256:853b9ec779e55f670cbdcb5e15bfb778b5be2c5c61fc8c655638b7a977d273c6
armhf:arm32v7/debian:bullseye==sha256:6879eee9d653dfa6d92b36fa682482facf009a5434036afdba78b488ea1b7e62
armhf:arm32v7/debian:buster==sha256:68111b72aab43dcb684b0b4a3dc0926fcbb43f6f6c1f3a370ea6619ec7228d08
armhf:debian:bullseye==sha256:c141beaa9e0767774221cc82efe3a6712a1cc4f75d2699334dfd9a28a6f7357b
armhf:debian:buster==sha256:853b9ec779e55f670cbdcb5e15bfb778b5be2c5c61fc8c655638b7a977d273c6
20 changes: 10 additions & 10 deletions files/build/versions/default/versions-git
View file
Original file line number Diff line number Diff line change
@@ -1,22 +1,22 @@
https://chromium.googlesource.com/chromium/tools/depot_tools.git==d95084e85101b865a8f1d213b6fbe3c11384e82f
https://chromium.googlesource.com/chromium/tools/depot_tools.git==c7628f780970136892e71d9de0dee072a1982dc9
https://github.com/aristanetworks/swi-tools.git==b5f087e4774168bf536360d43c9c509c8f14ad9f
https://github.com/CESNET/libyang.git==8b0b910a2dcb7360cb5b0aaefbd1338271d50946
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==9ccbf1cf434e9ec0206b8121c6f1bbf9cf506864
https://github.com/FreeRADIUS/freeradius-server.git==c70b9b212586f1c7c135fab6a6f8f24fa260092c
https://github.com/flashrom/flashrom.git==1dd7c88f41e49a076a189154928030d37ca00d26
https://github.com/FreeRADIUS/freeradius-server.git==9bf966d8c506a15c07aa8413b744116a3b0faa39
https://github.com/FreeRADIUS/pam_radius.git==7d75a319e43d5e234b93f89cd461a11861d07b95
https://github.com/jeroennijhof/pam_tacplus.git==4284d9016e64def2bb81d5f50f96dc3b59bfdc39
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==63118c2a6b627e543f5556baa27eee1ec6cd7a2b
https://github.com/Marvell-switching/mrvl-prestera.git==8f9bcdaf58406c71a9038aea834fc8255de59848
https://github.com/Mellanox/libpsample.git==62bb27d9a49424e45191eee81df7ce0d8c74e774
https://github.com/opencomputeproject/SAI.git==af31a8ffcc7dd7e30da99c77426fd8ef6eb308b0
https://github.com/opencomputeproject/SAI.git==f981a1f618ff84c28f75f8185ccad6dd73bf2bb4
https://github.com/p4lang/scapy-vxlan.git==85ffe83da156568ee47a0750f638227e6e1d7479
https://github.com/sflow/host-sflow==d1453b32e3c4828f88045107272064c7bb1d1fbe
https://github.com/sflow/sflowtool==219ab50bcfd9d9e714ff169eec31b2625933acb5
https://github.com/thom311/libnl==052a97cb6554386c70d531e7c1b34a6afa1dbeb0
https://github.com/sflow/host-sflow==6296a172c2c3879126298dc66994d38e68956185
https://github.com/sflow/sflowtool==2b622f99d36254884507d9137e6e99020db260cb
https://github.com/thom311/libnl==a735989cff5576fa2a8f9188eccf1fb30832f426
https://salsa.debian.org/debian/libteam.git==48142125234a665ad5367b724af36a58fb484d3d
https://salsa.debian.org/kernel-team/ethtool/==895b011970dffae1b34fd3f80fc6f62e6284d55c
https://salsa.debian.org/kernel-team/initramfs-tools.git==cf964bfb4362019fd7fba1e839e403ff950dca8e
Expand Down
24 changes: 12 additions & 12 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==20230926T000233Z
debian-security==20230926T000228Z
download.docker.com_linux_debian_dists_bullseye==2023-09-15T23:15:08Z
download.docker.com_linux_debian_dists_buster==2023-09-15T23:15:08Z
debian==20231029T000252Z
debian-security==20231029T000253Z
download.docker.com_linux_debian_dists_bullseye==2023-10-26T15:36:36Z
download.docker.com_linux_debian_dists_buster==2023-10-26T15:36:37Z
packages.microsoft.com_repos_sonic-dev_dists_jessie==2022-10-31T19:34:29Z
packages.trafficmanager.net_snapshot_debian-security_20230926T000228Z_dists_bullseye-security==2023-09-25T20:32:52Z
packages.trafficmanager.net_snapshot_debian-security_20230926T000228Z_dists_buster_updates==2023-09-25T20:32:52Z
packages.trafficmanager.net_snapshot_debian_20230926T000233Z_dists_bullseye==2023-06-10T08:52:21Z
packages.trafficmanager.net_snapshot_debian_20230926T000233Z_dists_bullseye-backports==2023-09-25T20:30:28Z
packages.trafficmanager.net_snapshot_debian_20230926T000233Z_dists_bullseye-updates==2023-09-25T20:30:28Z
packages.trafficmanager.net_snapshot_debian_20230926T000233Z_dists_buster==2023-06-10T08:53:33Z
packages.trafficmanager.net_snapshot_debian_20230926T000233Z_dists_buster-backports==2023-09-25T20:30:28Z
packages.trafficmanager.net_snapshot_debian_20230926T000233Z_dists_buster-updates==2023-06-10T08:55:10Z
packages.trafficmanager.net_snapshot_debian-security_20231029T000253Z_dists_bullseye-security==2023-10-28T15:03:10Z
packages.trafficmanager.net_snapshot_debian-security_20231029T000253Z_dists_buster_updates==2023-10-28T15:03:10Z
packages.trafficmanager.net_snapshot_debian_20231029T000252Z_dists_bullseye==2023-10-07T11:07:16Z
packages.trafficmanager.net_snapshot_debian_20231029T000252Z_dists_bullseye-backports==2023-10-28T20:16:40Z
packages.trafficmanager.net_snapshot_debian_20231029T000252Z_dists_bullseye-updates==2023-10-28T20:16:40Z
packages.trafficmanager.net_snapshot_debian_20231029T000252Z_dists_buster==2023-06-10T08:53:33Z
packages.trafficmanager.net_snapshot_debian_20231029T000252Z_dists_buster-backports==2023-10-28T20:16:40Z
packages.trafficmanager.net_snapshot_debian_20231029T000252Z_dists_buster-updates==2023-06-10T08:55:10Z
Loading

0 comments on commit c022ef3

Please sign in to comment.