Skip to content

Commit

Permalink
Merge branch '202205' of https://github.com/sonic-net/sonic-buildimage …
Browse files Browse the repository at this point in the history 
…into 202205
  • Loading branch information
@mssonicbld
mssonicbld committed Jul 14, 2024
2 parents 91e01c7 + 9556367 commit 252faa2
Show file tree
Hide file tree
Showing 59 changed files with 622 additions and 585 deletions.
4 changes: 4 additions & 0 deletions Makefile.work
View file
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,11 @@ SHELL = /bin/bash
USER := $(shell id -un)
PWD := $(shell pwd)
USER_LC := $(shell echo $(USER) | tr A-Z a-z)
ifneq ($(DEFAULT_CONTAINER_REGISTRY),)
DOCKER_MACHINE := $(shell docker run --rm $(DEFAULT_CONTAINER_REGISTRY)/debian:buster uname -m)
else
DOCKER_MACHINE := $(shell docker run --rm debian:buster uname -m)
endif

comma := ,

Expand Down
34 changes: 17 additions & 17 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,6 +1,6 @@
applibs==1.mlnx.4.5.4318
applibs-dev==1.mlnx.4.5.4318
iproute2-dev==1.mlnx.4.5.4318
applibs==1.mlnx.4.5.4414
applibs-dev==1.mlnx.4.5.4414
iproute2-dev==1.mlnx.4.5.4414
kernel-mft-dkms==4.22.1-410
libhiredis-dev==0.14.1-1
libhiredis0.14==0.14.1-1
Expand Down Expand Up @@ -46,18 +46,18 @@ sonic-mgmt-common==1.0.0
sonic-mgmt-common-codegen==1.0.0
sonic-platform-pddf==1.1
sonic-platform-pddf-sym==1.1
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
sx-acl-helper==1.mlnx.4.5.4414
sx-acl-helper-dev==1.mlnx.4.5.4414
sx-complib==1.mlnx.4.5.4414
sx-complib-dev==1.mlnx.4.5.4414
sx-examples==1.mlnx.4.5.4414
sx-examples-dev==1.mlnx.4.5.4414
sx-gen-utils==1.mlnx.4.5.4414
sx-gen-utils-dev==1.mlnx.4.5.4414
sx-scew==1.mlnx.4.5.4414
sx-scew-dev==1.mlnx.4.5.4414
sxd-libs==1.mlnx.4.5.4414
sxd-libs-dev==1.mlnx.4.5.4414
thrift-compiler==0.14.1
wjh-libs==1.mlnx.4.5.4318
wjh-libs-dev==1.mlnx.4.5.4318
wjh-libs==1.mlnx.4.5.4414
wjh-libs-dev==1.mlnx.4.5.4414
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:4cb3f4198e4af2d03dffe6bfa4f3686773596494ef298f3882553d52e885634b
amd64:amd64/debian:buster==sha256:d39357a2a8840e450e387df33a5aaf8f0c8f99e388a0e18169f3dd240fc2393d
amd64:debian:bullseye==sha256:71cb300d5448af821aedfe63afd55ba05f45a6a79f00dcd131b96b780bb99fe4
amd64:debian:buster==sha256:defa5d214292f2aaf7905d3e4bcdf8f628019feb63e7c8746df563d1a941f8d7
arm64:arm64v8/debian:bullseye==sha256:c4a762841d008c85d809f0981c47e2a490c43483e4a169e17afa2dc83d18b2b1
arm64:arm64v8/debian:buster==sha256:7d6cb4b56f1230b8692ed0c5fa5fa838ddd7ebd436a6463a6e9b29d1aa4c6e24
arm64:debian:bullseye==sha256:71cb300d5448af821aedfe63afd55ba05f45a6a79f00dcd131b96b780bb99fe4
arm64:debian:buster==sha256:defa5d214292f2aaf7905d3e4bcdf8f628019feb63e7c8746df563d1a941f8d7
armhf:arm32v7/debian:bullseye==sha256:70dcc7f2c51acbeaff85f700d9c1ef936371e60bdec8da15729c19503ef1fb8f
armhf:arm32v7/debian:buster==sha256:d984bf6bd66a53445e82ca3e6ae8d3c40a866c053339acfd5f3fa705a7092b90
armhf:debian:bullseye==sha256:71cb300d5448af821aedfe63afd55ba05f45a6a79f00dcd131b96b780bb99fe4
armhf:debian:buster==sha256:defa5d214292f2aaf7905d3e4bcdf8f628019feb63e7c8746df563d1a941f8d7
amd64:amd64/debian:bullseye==sha256:38fb0f1618bfa65b0cf1dd279293ebc70ef94aab2f2dc49274a2efc6ee29880e
amd64:amd64/debian:buster==sha256:255eec9d157d35e00a81a45f1e958fd19437d504139e8eb4ea6cc380ea741ed4
amd64:debian:bullseye==sha256:f860cec7ccaf31b42cd60b6a409f9dad9510ea27fca9c2864741087b4298a1e3
amd64:debian:buster==sha256:bce46a1c39574f98c845df4a5acc6c70c211df5a6182e428c1155c33317d4920
arm64:arm64v8/debian:bullseye==sha256:284d075b0fd0350198c79fcb19b9b0fccac6ade8ada1b1309aee35dd223fc802
arm64:arm64v8/debian:buster==sha256:4d104dd705ba3cba521271fae2d7259e4bc078c5f4855de32dab30acc9a5d3c5
arm64:debian:bullseye==sha256:f860cec7ccaf31b42cd60b6a409f9dad9510ea27fca9c2864741087b4298a1e3
arm64:debian:buster==sha256:bce46a1c39574f98c845df4a5acc6c70c211df5a6182e428c1155c33317d4920
armhf:arm32v7/debian:bullseye==sha256:c1205d95cc1479322f5c34df0a98f62ede571d041cb02a48ccca34209b3f7be9
armhf:arm32v7/debian:buster==sha256:540d61b391864b97f3ee3d9d0ded73d21e35b23c3db56c6400ac789118d0f47c
armhf:debian:bullseye==sha256:f860cec7ccaf31b42cd60b6a409f9dad9510ea27fca9c2864741087b4298a1e3
armhf:debian:buster==sha256:bce46a1c39574f98c845df4a5acc6c70c211df5a6182e428c1155c33317d4920
28 changes: 14 additions & 14 deletions files/build/versions/default/versions-git
View file
Original file line number Diff line number Diff line change
@@ -1,24 +1,24 @@
https://chromium.googlesource.com/chromium/tools/depot_tools.git==46cb7d0aca592cd20ddc2f6cb16ee386b2abbf0d
https://chromium.googlesource.com/chromium/tools/depot_tools.git==6708d95ec6d819098093cd57c746636a5bb9a4ea
https://github.com/aristanetworks/swi-tools.git==b5f087e4774168bf536360d43c9c509c8f14ad9f
https://github.com/CESNET/libyang.git==fc4dbd923e044006c93df020590a1e5a8656c09e
https://github.com/CESNET/libyang.git==4c733412e7173219166be7053940326a92699765
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==a21be9153abe50ae26cd833db62d9493e7eadf54
https://github.com/FreeRADIUS/freeradius-server.git==dc9a7be42b905e48a2b7c7e8d15816ade6dd337f
https://github.com/FreeRADIUS/pam_radius.git==53c0cfff686ab48ae3bac5449d5461b6e1b83d27
https://github.com/jeroennijhof/pam_tacplus.git==b89dba44b58ec7fdc9b5365b982aa4a316484a3c
https://github.com/flashrom/flashrom.git==643ae4d1fcb9b3bda6f35e8ff6f5b71b1104f600
https://github.com/FreeRADIUS/freeradius-server.git==66cf26be5e195b56c70288c98a3e62680ff38154
https://github.com/FreeRADIUS/pam_radius.git==d802da75cbfc3062ae1b18d0bf26ac2a030ffdaa
https://github.com/jeroennijhof/pam_tacplus.git==b839c440e33c36eced9dcbc287fcfe6237c4c4ce
https://github.com/jpirko/libteam.git==8b843e93cee1dab61fb79b01791201cdad45e1d1
https://github.com/lguohan/gnxi.git==3adf8b97755b49947e465b5a14645f11e79fa0cd
https://github.com/Marvell-switching/mrvl-prestera.git==22ac73bff81451571002df88e5a39cf390a4d8cd
https://github.com/Marvell-switching/mrvl-prestera.git==5834b7338ff9ac6f03d45ab85568048be1f62199
https://github.com/Mellanox/libpsample.git==62bb27d9a49424e45191eee81df7ce0d8c74e774
https://github.com/opencomputeproject/SAI.git==7bffa33c7ad27960fe8c6baabf3605a2edd5f2d4
https://github.com/opencomputeproject/SAI.git==c93e463f643c55d47f14d26acdbc4d18d682f932
https://github.com/p4lang/scapy-vxlan.git==85ffe83da156568ee47a0750f638227e6e1d7479
https://github.com/sflow/host-sflow==6f50c161d3dc2b78c66b1f8cd69fcd7957e2730f
https://github.com/sflow/sflowtool==c1eeb55ad6bfd76283833614a8296f635627e1db
https://github.com/thom311/libnl==8693347fe9c47d08ce5899602ab4f208c1249619
https://github.com/sflow/host-sflow==6edc82d62a1cf0f7fb821587af67e5520624f50d
https://github.com/sflow/sflowtool==c42c49cb80b927a4c02e54fc26430417f18f4833
https://github.com/thom311/libnl==49f7822961f5bc6b18cd2a2d3f3b8d2ab0896d3f
https://salsa.debian.org/debian/libteam.git==48142125234a665ad5367b724af36a58fb484d3d
https://salsa.debian.org/kernel-team/ethtool/==8374ab341998bc3345a328a20651d278ae58504e
https://salsa.debian.org/kernel-team/initramfs-tools.git==cf964bfb4362019fd7fba1e839e403ff950dca8e
https://salsa.debian.org/kernel-team/ethtool/==836e3ba5df7a4bb6deb6e3bb40e0fd2712b3db12
https://salsa.debian.org/kernel-team/initramfs-tools.git==3436c177b9f362de9687a3afb1b3c7273899db80
https://salsa.debian.org/sk-guest/monit.git==c9da7ebb1f35dfba17b50b5969a6e75e29cbec0d
https://salsa.debian.org/ssh-team/openssh.git==1d67ef8053a0ea5e9a57c0e6ad33604d17e95456
https://salsa.debian.org/ssh-team/openssh.git==d150d0d69246f55c711684078f47f999a4bfd6bc
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==20240120T000223Z
debian-security==20240120T000222Z
download.docker.com_linux_debian_dists_bullseye==2024-01-19T10:37:46Z
download.docker.com_linux_debian_dists_buster==2024-01-19T10:37:46Z
debian==20240519T000308Z
debian-security==20240519T000258Z
download.docker.com_linux_debian_dists_bullseye==2024-05-16T12:25:40Z
download.docker.com_linux_debian_dists_buster==2024-05-16T12:25:40Z
packages.microsoft.com_repos_sonic-dev_dists_jessie==2022-10-31T19:34:29Z
packages.trafficmanager.net_snapshot_debian-security_20240120T000222Z_dists_bullseye-security==2024-01-19T06:53:47Z
packages.trafficmanager.net_snapshot_debian-security_20240120T000222Z_dists_buster_updates==2024-01-19T06:53:46Z
packages.trafficmanager.net_snapshot_debian_20240120T000223Z_dists_bullseye==2023-10-07T11:07:16Z
packages.trafficmanager.net_snapshot_debian_20240120T000223Z_dists_bullseye-backports==2024-01-19T20:15:58Z
packages.trafficmanager.net_snapshot_debian_20240120T000223Z_dists_bullseye-updates==2024-01-19T20:15:58Z
packages.trafficmanager.net_snapshot_debian_20240120T000223Z_dists_buster==2023-06-10T08:53:33Z
packages.trafficmanager.net_snapshot_debian_20240120T000223Z_dists_buster-backports==2024-01-19T20:15:58Z
packages.trafficmanager.net_snapshot_debian_20240120T000223Z_dists_buster-updates==2023-06-10T08:55:10Z
packages.trafficmanager.net_snapshot_debian-security_20240519T000258Z_dists_bullseye-security==2024-05-17T18:44:06Z
packages.trafficmanager.net_snapshot_debian-security_20240519T000258Z_dists_buster_updates==2024-05-17T18:44:07Z
packages.trafficmanager.net_snapshot_debian_20240519T000308Z_dists_bullseye==2024-02-10T12:40:37Z
packages.trafficmanager.net_snapshot_debian_20240519T000308Z_dists_bullseye-backports==2024-05-18T20:11:44Z
packages.trafficmanager.net_snapshot_debian_20240519T000308Z_dists_bullseye-updates==2024-05-18T20:11:43Z
packages.trafficmanager.net_snapshot_debian_20240519T000308Z_dists_buster==2023-06-10T08:53:33Z
packages.trafficmanager.net_snapshot_debian_20240519T000308Z_dists_buster-backports==2024-03-09T20:54:54Z
packages.trafficmanager.net_snapshot_debian_20240519T000308Z_dists_buster-updates==2023-06-10T08:55:10Z
Loading

0 comments on commit 252faa2

Please sign in to comment.