From 1555ec30eeff6230072f7b4a875aa40f91db3b17 Mon Sep 17 00:00:00 2001 From: mssonicbld <79238446+mssonicbld@users.noreply.github.com> Date: Fri, 14 Oct 2022 16:08:25 +0800 Subject: [PATCH] [ci/build]: Upgrade SONiC package versions (#12390) --- .../build/build-sonic-slave-bullseye/versions-git | 4 ++-- .../build/build-sonic-slave-bullseye/versions-py3 | 2 +- .../build-sonic-slave-buster/versions-deb-buster | 6 ++++++ .../versions-deb-buster-arm64 | 4 ---- .../versions-deb-buster-armhf | 4 ---- .../build/build-sonic-slave-buster/versions-git | 2 +- .../build/build-sonic-slave-buster/versions-py2 | 2 ++ .../build-sonic-slave-buster/versions-py2-all-arm64 | 2 -- .../build-sonic-slave-buster/versions-py2-all-armhf | 2 -- .../build/build-sonic-slave-buster/versions-py3 | 2 +- files/build/versions/default/versions-git | 8 ++++---- .../dockers/docker-base-buster/versions-deb-buster | 2 +- .../versions/dockers/docker-ptf/versions-deb-buster | 8 ++++---- .../dockers/docker-sonic-vs/versions-deb-buster | 4 ++-- .../versions/dockers/docker-sonic-vs/versions-py3 | 2 +- .../dockers/sonic-slave-bullseye/versions-git | 2 +- .../dockers/sonic-slave-buster/versions-deb-buster | 12 ++++++------ .../versions/dockers/sonic-slave-buster/versions-git | 2 +- .../dockers/sonic-slave-stretch/versions-git | 2 +- files/build/versions/host-image/versions-py3 | 2 +- .../build/versions/host-image/versions-py3-all-arm64 | 1 + 21 files changed, 36 insertions(+), 39 deletions(-) delete mode 100644 files/build/versions/build/build-sonic-slave-buster/versions-deb-buster-arm64 delete mode 100644 files/build/versions/build/build-sonic-slave-buster/versions-deb-buster-armhf delete mode 100644 files/build/versions/build/build-sonic-slave-buster/versions-py2-all-arm64 delete mode 100644 files/build/versions/build/build-sonic-slave-buster/versions-py2-all-armhf create mode 100644 files/build/versions/host-image/versions-py3-all-arm64 diff --git a/files/build/versions/build/build-sonic-slave-bullseye/versions-git b/files/build/versions/build/build-sonic-slave-bullseye/versions-git index 222bc5b321..575810fa7b 100644 --- a/files/build/versions/build/build-sonic-slave-bullseye/versions-git +++ b/files/build/versions/build/build-sonic-slave-bullseye/versions-git @@ -1,8 +1,8 @@ https://github.com/CESNET/libyang.git==0c609c35080f523c9696db48976de8257d174102 https://github.com/daveolson53/audisp-tacplus.git==559c9f22edd4f2dea0ecedffb3ad9502b12a75b6 https://github.com/daveolson53/libnss-tacplus.git==19008ab68d9d504aa58eb34d5f564755a1613b8b -https://github.com/flashrom/flashrom.git==053d319141db5954ab1ad34cb9db61983d238134 -https://github.com/FreeRADIUS/freeradius-server.git==47591d492b3378b1f94f110370b51ff807ce70d2 +https://github.com/flashrom/flashrom.git==22e9313d908ce376be6686ebeb3f77828ea70c2e +https://github.com/FreeRADIUS/freeradius-server.git==50e92f2fb805b3c31beed7a383f8dea1895a98a6 https://github.com/FreeRADIUS/pam_radius.git==272f6420c5c01f9bdb27c98e5edb44de406f4631 https://github.com/jeroennijhof/pam_tacplus.git==453c7b6fc78eceeaaf39a59b6b87c124628f2fe8 https://github.com/thom311/libnl==cbafad9ddf24caef5230fef715d34f0539603be0 diff --git a/files/build/versions/build/build-sonic-slave-bullseye/versions-py3 b/files/build/versions/build/build-sonic-slave-bullseye/versions-py3 index b79aa7ab44..de518cbdc1 100644 --- a/files/build/versions/build/build-sonic-slave-bullseye/versions-py3 +++ b/files/build/versions/build/build-sonic-slave-bullseye/versions-py3 @@ -4,7 +4,7 @@ click-log==0.4.0 colorful==0.5.4 docker==6.0.0 docker-image-py==0.1.12 -enlighten==1.11.0 +enlighten==1.11.1 filelock==3.8.0 ijson==2.6.1 ipaddress==1.0.23 diff --git a/files/build/versions/build/build-sonic-slave-buster/versions-deb-buster b/files/build/versions/build/build-sonic-slave-buster/versions-deb-buster index 5346ea3723..763f046dd9 100644 --- a/files/build/versions/build/build-sonic-slave-buster/versions-deb-buster +++ b/files/build/versions/build/build-sonic-slave-buster/versions-deb-buster @@ -5,12 +5,16 @@ iproute2-dev==1.mlnx.4.5.2318 isc-dhcp-relay==4.4.1-2 libhiredis-dev==0.14.0-3~bpo9+1 libhiredis0.14==0.14.0-3~bpo9+1 +libnl-3-200==3.5.0-1 +libnl-3-dev==3.5.0-1 libnl-cli-3-200==3.5.0-1 libnl-cli-3-dev==3.5.0-1 libnl-genl-3-200==3.5.0-1 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-200==3.5.0-1 +libnl-route-3-dev==3.5.0-1 libsaimetadata==1.0.0 libsaimetadata-dev==1.0.0 libsairedis==1.0.0 @@ -30,8 +34,10 @@ libthrift0==0.14.1 libyang==1.0.73 libyang-cpp==1.0.73 libyang-dev==1.0.73 +libyang1==1.0.184-2 lldpd==1.0.4-1 lm-sensors==1:3.5.0-3 +mlnx-sai==1.mlnx.SAIRel1.21.2.1 python-swsscommon==1.0.0 python-thrift==0.11.0-4 python3-swsscommon==1.0.0 diff --git a/files/build/versions/build/build-sonic-slave-buster/versions-deb-buster-arm64 b/files/build/versions/build/build-sonic-slave-buster/versions-deb-buster-arm64 deleted file mode 100644 index 11fd3b48e9..0000000000 --- a/files/build/versions/build/build-sonic-slave-buster/versions-deb-buster-arm64 +++ /dev/null @@ -1,4 +0,0 @@ -libnl-3-200==3.5.0-1 -libnl-3-dev==3.5.0-1 -libnl-route-3-200==3.5.0-1 -libnl-route-3-dev==3.5.0-1 \ No newline at end of file diff --git a/files/build/versions/build/build-sonic-slave-buster/versions-deb-buster-armhf b/files/build/versions/build/build-sonic-slave-buster/versions-deb-buster-armhf deleted file mode 100644 index 11fd3b48e9..0000000000 --- a/files/build/versions/build/build-sonic-slave-buster/versions-deb-buster-armhf +++ /dev/null @@ -1,4 +0,0 @@ -libnl-3-200==3.5.0-1 -libnl-3-dev==3.5.0-1 -libnl-route-3-200==3.5.0-1 -libnl-route-3-dev==3.5.0-1 \ No newline at end of file diff --git a/files/build/versions/build/build-sonic-slave-buster/versions-git b/files/build/versions/build/build-sonic-slave-buster/versions-git index 0255c4137f..d3beaa50d7 100644 --- a/files/build/versions/build/build-sonic-slave-buster/versions-git +++ b/files/build/versions/build/build-sonic-slave-buster/versions-git @@ -5,5 +5,5 @@ https://github.com/sflow/host-sflow==f1ddde6580ae049e53cb9e25822d4c7d98a672cf https://github.com/sflow/sflowtool==5307b19399ffb0a1a873c9d09e78cb5011deaf6f https://github.com/thom311/libnl==cbafad9ddf24caef5230fef715d34f0539603be0 https://salsa.debian.org/debian/libteam.git==f8808df228b00873926b5e7b998ad8b61368d4c5 -https://salsa.debian.org/dhcp-team/isc-dhcp.git==18ecb042065e51e088b7470566526cd00e297c14 +https://salsa.debian.org/dhcp-team/isc-dhcp.git==70e30ef107fc3bc5a8c8a7c1a48d596e0669f44a https://salsa.debian.org/kernel-team/ethtool/==fb77fb17864600d7deb46729c28c677c7da367d5 \ No newline at end of file diff --git a/files/build/versions/build/build-sonic-slave-buster/versions-py2 b/files/build/versions/build/build-sonic-slave-buster/versions-py2 index e4ff7769f4..0eb7596a75 100644 --- a/files/build/versions/build/build-sonic-slave-buster/versions-py2 +++ b/files/build/versions/build/build-sonic-slave-buster/versions-py2 @@ -3,7 +3,9 @@ contextlib2==0.6.0.post1 functools32==3.2.3.post2 future==0.18.2 importlib-resources==3.3.1 +ipaddress==1.0.23 jsonschema==2.6.0 +lxml==4.6.3 natsort==6.2.1 netaddr==0.8.0 pyang==2.5.3 diff --git a/files/build/versions/build/build-sonic-slave-buster/versions-py2-all-arm64 b/files/build/versions/build/build-sonic-slave-buster/versions-py2-all-arm64 deleted file mode 100644 index 8492dcc267..0000000000 --- a/files/build/versions/build/build-sonic-slave-buster/versions-py2-all-arm64 +++ /dev/null @@ -1,2 +0,0 @@ -ipaddress==1.0.23 -lxml==4.6.3 \ No newline at end of file diff --git a/files/build/versions/build/build-sonic-slave-buster/versions-py2-all-armhf b/files/build/versions/build/build-sonic-slave-buster/versions-py2-all-armhf deleted file mode 100644 index 8492dcc267..0000000000 --- a/files/build/versions/build/build-sonic-slave-buster/versions-py2-all-armhf +++ /dev/null @@ -1,2 +0,0 @@ -ipaddress==1.0.23 -lxml==4.6.3 \ No newline at end of file diff --git a/files/build/versions/build/build-sonic-slave-buster/versions-py3 b/files/build/versions/build/build-sonic-slave-buster/versions-py3 index 644cc33202..405bbb0799 100644 --- a/files/build/versions/build/build-sonic-slave-buster/versions-py3 +++ b/files/build/versions/build/build-sonic-slave-buster/versions-py3 @@ -6,7 +6,7 @@ colorful==0.5.4 dbus-python==1.3.2 docker==6.0.0 docker-image-py==0.1.12 -enlighten==1.11.0 +enlighten==1.11.1 filelock==3.8.0 ijson==2.6.1 ipaddress==1.0.23 diff --git a/files/build/versions/default/versions-git b/files/build/versions/default/versions-git index 9d1db2cb12..f6e021a6ea 100644 --- a/files/build/versions/default/versions-git +++ b/files/build/versions/default/versions-git @@ -1,11 +1,11 @@ -https://chromium.googlesource.com/chromium/tools/depot_tools.git==17b26efb65199176f999fc4193a2350be03afc53 +https://chromium.googlesource.com/chromium/tools/depot_tools.git==7b1f933dc4ec81cd78d6287f2bc53d3b48eb512f https://github.com/aristanetworks/swi-tools.git==b5f087e4774168bf536360d43c9c509c8f14ad9f https://github.com/CESNET/libyang.git==0c609c35080f523c9696db48976de8257d174102 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==053d319141db5954ab1ad34cb9db61983d238134 -https://github.com/FreeRADIUS/freeradius-server.git==47591d492b3378b1f94f110370b51ff807ce70d2 +https://github.com/flashrom/flashrom.git==22e9313d908ce376be6686ebeb3f77828ea70c2e +https://github.com/FreeRADIUS/freeradius-server.git==50e92f2fb805b3c31beed7a383f8dea1895a98a6 https://github.com/FreeRADIUS/pam_radius.git==272f6420c5c01f9bdb27c98e5edb44de406f4631 https://github.com/jeroennijhof/pam_tacplus.git==453c7b6fc78eceeaaf39a59b6b87c124628f2fe8 https://github.com/jpirko/libteam.git==c32369829b2b1881e25fab85d74aa0b3ad017dcb @@ -17,7 +17,7 @@ https://github.com/sflow/host-sflow==f1ddde6580ae049e53cb9e25822d4c7d98a672cf https://github.com/sflow/sflowtool==5307b19399ffb0a1a873c9d09e78cb5011deaf6f https://github.com/thom311/libnl==cbafad9ddf24caef5230fef715d34f0539603be0 https://salsa.debian.org/debian/libteam.git==f8808df228b00873926b5e7b998ad8b61368d4c5 -https://salsa.debian.org/dhcp-team/isc-dhcp.git==18ecb042065e51e088b7470566526cd00e297c14 +https://salsa.debian.org/dhcp-team/isc-dhcp.git==70e30ef107fc3bc5a8c8a7c1a48d596e0669f44a https://salsa.debian.org/kernel-team/ethtool/==fb77fb17864600d7deb46729c28c677c7da367d5 https://salsa.debian.org/kernel-team/initramfs-tools.git==dd16eade69ef76b304a369fac2f6c0de508b855b https://salsa.debian.org/sk-guest/monit.git==c9da7ebb1f35dfba17b50b5969a6e75e29cbec0d diff --git a/files/build/versions/dockers/docker-base-buster/versions-deb-buster b/files/build/versions/dockers/docker-base-buster/versions-deb-buster index 5de2692548..aad5ba8c57 100644 --- a/files/build/versions/dockers/docker-base-buster/versions-deb-buster +++ b/files/build/versions/dockers/docker-base-buster/versions-deb-buster @@ -5,7 +5,7 @@ less==487-0.1+b1 libatomic1==8.3.0-6 libcurl4==7.64.0-4+deb10u3 libdaemon0==0.14-7 -libdbus-1-3==1.12.20-0+deb10u1 +libdbus-1-3==1.12.24-0+deb10u1 libestr0==0.1.10-2.1 libexpat1==2.2.6-2+deb10u5 libfastjson4==0.99.8-2 diff --git a/files/build/versions/dockers/docker-ptf/versions-deb-buster b/files/build/versions/dockers/docker-ptf/versions-deb-buster index 00f09f5f5e..cb1116627e 100644 --- a/files/build/versions/dockers/docker-ptf/versions-deb-buster +++ b/files/build/versions/dockers/docker-ptf/versions-deb-buster @@ -17,7 +17,7 @@ cpp==4:8.3.0-1 cpp-8==8.3.0-6 cron==3.0pl1-134+deb10u1 curl==7.64.0-4+deb10u3 -dbus==1.12.20-0+deb10u1 +dbus==1.12.24-0+deb10u1 dirmngr==2.2.12-1+deb10u2 dmsetup==2:1.02.155-3 dpkg-dev==1.19.8 @@ -32,8 +32,8 @@ g++-8==8.3.0-6 gcc==4:8.3.0-1 gcc-8==8.3.0-6 gdb==8.2.1-2+b3 -git==1:2.20.1-2+deb10u3 -git-man==1:2.20.1-2+deb10u3 +git==1:2.20.1-2+deb10u4 +git-man==1:2.20.1-2+deb10u4 gnupg==2.2.12-1+deb10u2 gnupg-l10n==2.2.12-1+deb10u2 gnupg-utils==2.2.12-1+deb10u2 @@ -72,7 +72,7 @@ libcryptsetup12==2:2.1.0-5+deb10u2 libcurl3-gnutls==7.64.0-4+deb10u3 libcurl4==7.64.0-4+deb10u3 libdaemon0==0.14-7 -libdbus-1-3==1.12.20-0+deb10u1 +libdbus-1-3==1.12.24-0+deb10u1 libdevmapper1.02.1==2:1.02.155-3 libdouble-conversion1==3.1.0-3 libdpkg-perl==1.19.8 diff --git a/files/build/versions/dockers/docker-sonic-vs/versions-deb-buster b/files/build/versions/dockers/docker-sonic-vs/versions-deb-buster index 55825c58d5..831eb74337 100644 --- a/files/build/versions/dockers/docker-sonic-vs/versions-deb-buster +++ b/files/build/versions/dockers/docker-sonic-vs/versions-deb-buster @@ -9,7 +9,7 @@ conntrack==1:1.4.5-2 cpp==4:8.3.0-1 cpp-8==8.3.0-6 cron==3.0pl1-134+deb10u1 -dbus==1.12.20-0+deb10u1 +dbus==1.12.24-0+deb10u1 dh-python==3.20190308 dirmngr==2.2.12-1+deb10u2 dmsetup==2:1.02.155-3 @@ -59,7 +59,7 @@ libcairo-script-interpreter2==1.16.0-4+deb10u1 libcairo2==1.16.0-4+deb10u1 libcairo2-dev==1.16.0-4+deb10u1 libcc1-0==8.3.0-6 -libdbus-1-dev==1.12.20-0+deb10u1 +libdbus-1-dev==1.12.24-0+deb10u1 libdevmapper1.02.1==2:1.02.155-3 libdouble-conversion1==3.1.0-3 libdpkg-perl==1.19.8 diff --git a/files/build/versions/dockers/docker-sonic-vs/versions-py3 b/files/build/versions/dockers/docker-sonic-vs/versions-py3 index 8f92bbe9b7..f6969274ef 100644 --- a/files/build/versions/dockers/docker-sonic-vs/versions-py3 +++ b/files/build/versions/dockers/docker-sonic-vs/versions-py3 @@ -7,7 +7,7 @@ colorful==0.5.4 dbus-python==1.3.2 docker==6.0.0 docker-image-py==0.1.12 -enlighten==1.11.0 +enlighten==1.11.1 filelock==3.8.0 idna==3.4 jsonpatch==1.32 diff --git a/files/build/versions/dockers/sonic-slave-bullseye/versions-git b/files/build/versions/dockers/sonic-slave-bullseye/versions-git index 78cb7fa918..c9a4ab3ca8 100644 --- a/files/build/versions/dockers/sonic-slave-bullseye/versions-git +++ b/files/build/versions/dockers/sonic-slave-bullseye/versions-git @@ -1,2 +1,2 @@ -https://chromium.googlesource.com/chromium/tools/depot_tools.git==17b26efb65199176f999fc4193a2350be03afc53 +https://chromium.googlesource.com/chromium/tools/depot_tools.git==17cf81d90a2b6eb122c6728eb843837ff88316d8 https://github.com/aristanetworks/swi-tools.git==b5f087e4774168bf536360d43c9c509c8f14ad9f \ No newline at end of file diff --git a/files/build/versions/dockers/sonic-slave-buster/versions-deb-buster b/files/build/versions/dockers/sonic-slave-buster/versions-deb-buster index 3cde99040e..e183d8a00a 100644 --- a/files/build/versions/dockers/sonic-slave-buster/versions-deb-buster +++ b/files/build/versions/dockers/sonic-slave-buster/versions-deb-buster @@ -60,8 +60,8 @@ cpp-8==8.3.0-6 cppcheck==1.86-1 cron==3.0pl1-134+deb10u1 curl==7.64.0-4+deb10u3 -dbus==1.12.20-0+deb10u1 -dbus-user-session==1.12.20-0+deb10u1 +dbus==1.12.24-0+deb10u1 +dbus-user-session==1.12.24-0+deb10u1 dconf-gsettings-backend==0.30.1-2 dconf-service==0.30.1-2 dctrl-tools==2.24-3 @@ -155,9 +155,9 @@ gir1.2-gtk-3.0==3.24.5-1 gir1.2-harfbuzz-0.0==2.3.1-1 gir1.2-packagekitglib-1.0==1.1.12-5 gir1.2-pango-1.0==1.42.4-8~deb10u1 -git==1:2.20.1-2+deb10u3 +git==1:2.20.1-2+deb10u4 git-buildpackage==0.9.14 -git-man==1:2.20.1-2+deb10u3 +git-man==1:2.20.1-2+deb10u4 glib-networking==2.58.0-2+deb10u2 glib-networking-common==2.58.0-2+deb10u2 glib-networking-services==2.58.0-2+deb10u2 @@ -428,8 +428,8 @@ libdatrie1==0.2.12-2 libdb-dev==5.3.1+nmu1 libdb5.3-dev==5.3.28+dfsg1-0.5 libdbi1==0.9.0-5 -libdbus-1-3==1.12.20-0+deb10u1 -libdbus-1-dev==1.12.20-0+deb10u1 +libdbus-1-3==1.12.24-0+deb10u1 +libdbus-1-dev==1.12.24-0+deb10u1 libdbus-glib-1-2==0.110-4 libdbus-glib-1-dev==0.110-4 libdbus-glib-1-dev-bin==0.110-4 diff --git a/files/build/versions/dockers/sonic-slave-buster/versions-git b/files/build/versions/dockers/sonic-slave-buster/versions-git index 78cb7fa918..208ffd97d9 100644 --- a/files/build/versions/dockers/sonic-slave-buster/versions-git +++ b/files/build/versions/dockers/sonic-slave-buster/versions-git @@ -1,2 +1,2 @@ -https://chromium.googlesource.com/chromium/tools/depot_tools.git==17b26efb65199176f999fc4193a2350be03afc53 +https://chromium.googlesource.com/chromium/tools/depot_tools.git==7b1f933dc4ec81cd78d6287f2bc53d3b48eb512f https://github.com/aristanetworks/swi-tools.git==b5f087e4774168bf536360d43c9c509c8f14ad9f \ No newline at end of file diff --git a/files/build/versions/dockers/sonic-slave-stretch/versions-git b/files/build/versions/dockers/sonic-slave-stretch/versions-git index 78cb7fa918..208ffd97d9 100644 --- a/files/build/versions/dockers/sonic-slave-stretch/versions-git +++ b/files/build/versions/dockers/sonic-slave-stretch/versions-git @@ -1,2 +1,2 @@ -https://chromium.googlesource.com/chromium/tools/depot_tools.git==17b26efb65199176f999fc4193a2350be03afc53 +https://chromium.googlesource.com/chromium/tools/depot_tools.git==7b1f933dc4ec81cd78d6287f2bc53d3b48eb512f https://github.com/aristanetworks/swi-tools.git==b5f087e4774168bf536360d43c9c509c8f14ad9f \ No newline at end of file diff --git a/files/build/versions/host-image/versions-py3 b/files/build/versions/host-image/versions-py3 index 540c5518cb..e6a0d332f1 100644 --- a/files/build/versions/host-image/versions-py3 +++ b/files/build/versions/host-image/versions-py3 @@ -12,7 +12,7 @@ colorful==0.5.4 cryptography==38.0.1 docker==5.0.3 docker-image-py==0.1.12 -enlighten==1.11.0 +enlighten==1.11.1 filelock==3.8.0 grpcio==1.39.0 grpcio-tools==1.39.0 diff --git a/files/build/versions/host-image/versions-py3-all-arm64 b/files/build/versions/host-image/versions-py3-all-arm64 new file mode 100644 index 0000000000..ccb8ac4ef2 --- /dev/null +++ b/files/build/versions/host-image/versions-py3-all-arm64 @@ -0,0 +1 @@ +cryptography==38.0.2 \ No newline at end of file