From 1c4364222d22074c2ff773257e6392f0d895e0eb Mon Sep 17 00:00:00 2001 From: mssonicbld <79238446+mssonicbld@users.noreply.github.com> Date: Fri, 11 Mar 2022 23:13:09 +0800 Subject: [PATCH] [ci/build]: Upgrade SONiC package versions (#10214) --- .../versions/build/build-sonic-slave-buster/versions-git | 4 ++-- files/build/versions/default/versions-git | 6 +++--- .../docker-config-engine-buster/versions-deb-buster-arm64 | 2 +- .../docker-config-engine-buster/versions-deb-buster-armhf | 2 +- .../dockers/docker-sonic-mgmt-framework/versions-py3 | 2 +- .../versions/dockers/docker-syncd-bfn/versions-deb-buster | 2 +- .../versions/dockers/docker-syncd-brcm/versions-deb-buster | 2 +- .../dockers/docker-syncd-centec-rpc/versions-deb-buster | 2 +- .../versions/dockers/docker-syncd-mlnx/versions-deb-buster | 2 +- .../dockers/sonic-slave-buster/versions-deb-buster-arm64 | 3 +++ .../dockers/sonic-slave-buster/versions-deb-buster-armhf | 5 ++++- .../build/versions/dockers/sonic-slave-buster/versions-git | 2 -- .../build/versions/dockers/sonic-slave-stretch/versions-git | 2 -- files/build/versions/host-image/versions-deb-buster | 2 +- files/build/versions/host-image/versions-deb-buster-armhf | 2 +- 15 files changed, 21 insertions(+), 19 deletions(-) delete mode 100644 files/build/versions/dockers/sonic-slave-buster/versions-git delete mode 100644 files/build/versions/dockers/sonic-slave-stretch/versions-git 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 c5349c6fd6..c3f489c09f 100644 --- a/files/build/versions/build/build-sonic-slave-buster/versions-git +++ b/files/build/versions/build/build-sonic-slave-buster/versions-git @@ -3,9 +3,9 @@ https://github.com/daveolson53/libnss-tacplus.git==19008ab68d9d504aa58eb34d5f564 https://github.com/jeroennijhof/pam_tacplus.git==b8e07ac27c11b86779ae9698fcafee0c89fc83f5 https://github.com/jpirko/libteam.git==69a7494bb77dc10bb27076add07b380dbd778592 https://github.com/Mellanox/libpsample.git==62bb27d9a49424e45191eee81df7ce0d8c74e774 -https://github.com/sflow/host-sflow==0b9ceab2ed6060654ffcad82a8272cafd915003c +https://github.com/sflow/host-sflow==40861df030db8ba2097122698ba9ac9efe3408f4 https://github.com/sflow/sflowtool==4be2a17b36a3b9796c280b117b8b786323a84ae8 -https://github.com/thom311/libnl==3bf0a9c211b5e22d805632541d1e5c07e6134922 +https://github.com/thom311/libnl==ed76b9ac92d47e59f54d4dec97d426902859b7cc https://salsa.debian.org/debian/libteam.git==f8808df228b00873926b5e7b998ad8b61368d4c5 https://salsa.debian.org/dhcp-team/isc-dhcp.git==b13135d7f6e61724e7b9a54b53e4e8b916ff21aa https://salsa.debian.org/kernel-team/ethtool/==2533ffaac6fd59cece2ffb49d67b9f00b7b902f7 diff --git a/files/build/versions/default/versions-git b/files/build/versions/default/versions-git index 56c889a309..b43dd9d823 100644 --- a/files/build/versions/default/versions-git +++ b/files/build/versions/default/versions-git @@ -1,4 +1,4 @@ -https://chromium.googlesource.com/chromium/tools/depot_tools.git==8edc960e9acbaedbff28e323e77a4129817266b3 +https://chromium.googlesource.com/chromium/tools/depot_tools.git==c848a4ed332e79a654cb4ee7ef29acd796f7147d https://github.com/aristanetworks/swi-tools.git==e938746c694e4eaa4cf4126981382c9c8372db24 https://github.com/CESNET/libyang.git==a531aef42741b25b0343b64db5cf9ffd7a823e90 https://github.com/daveolson53/libnss-tacplus.git==19008ab68d9d504aa58eb34d5f564755a1613b8b @@ -9,9 +9,9 @@ https://github.com/lguohan/gnxi.git==53901aba9ead82be21f1408a601b6266dcf1e3e4 https://github.com/Marvell-switching/mrvl-prestera.git==21a100e01b2ab00229da35dd178d9b294c66303f https://github.com/Mellanox/libpsample.git==62bb27d9a49424e45191eee81df7ce0d8c74e774 https://github.com/p4lang/scapy-vxlan.git==85ffe83da156568ee47a0750f638227e6e1d7479 -https://github.com/sflow/host-sflow==0b9ceab2ed6060654ffcad82a8272cafd915003c +https://github.com/sflow/host-sflow==40861df030db8ba2097122698ba9ac9efe3408f4 https://github.com/sflow/sflowtool==4be2a17b36a3b9796c280b117b8b786323a84ae8 -https://github.com/thom311/libnl==3bf0a9c211b5e22d805632541d1e5c07e6134922 +https://github.com/thom311/libnl==ed76b9ac92d47e59f54d4dec97d426902859b7cc https://salsa.debian.org/debian/libteam.git==f8808df228b00873926b5e7b998ad8b61368d4c5 https://salsa.debian.org/dhcp-team/isc-dhcp.git==b13135d7f6e61724e7b9a54b53e4e8b916ff21aa https://salsa.debian.org/kernel-team/ethtool/==2533ffaac6fd59cece2ffb49d67b9f00b7b902f7 diff --git a/files/build/versions/dockers/docker-config-engine-buster/versions-deb-buster-arm64 b/files/build/versions/dockers/docker-config-engine-buster/versions-deb-buster-arm64 index e19bef5ea5..c30de49019 100644 --- a/files/build/versions/dockers/docker-config-engine-buster/versions-deb-buster-arm64 +++ b/files/build/versions/dockers/docker-config-engine-buster/versions-deb-buster-arm64 @@ -7,5 +7,5 @@ libxml2==2.9.4+dfsg1-7+deb10u2 libxml2-dev==2.9.4+dfsg1-7+deb10u2 libxslt1-dev==1.1.32-2.2~deb10u1 libxslt1.1==1.1.32-2.2~deb10u1 -linux-libc-dev==4.19.208-1 +linux-libc-dev==4.19.232-1 zlib1g-dev==1:1.2.11.dfsg-1 \ No newline at end of file diff --git a/files/build/versions/dockers/docker-config-engine-buster/versions-deb-buster-armhf b/files/build/versions/dockers/docker-config-engine-buster/versions-deb-buster-armhf index e19bef5ea5..c30de49019 100644 --- a/files/build/versions/dockers/docker-config-engine-buster/versions-deb-buster-armhf +++ b/files/build/versions/dockers/docker-config-engine-buster/versions-deb-buster-armhf @@ -7,5 +7,5 @@ libxml2==2.9.4+dfsg1-7+deb10u2 libxml2-dev==2.9.4+dfsg1-7+deb10u2 libxslt1-dev==1.1.32-2.2~deb10u1 libxslt1.1==1.1.32-2.2~deb10u1 -linux-libc-dev==4.19.208-1 +linux-libc-dev==4.19.232-1 zlib1g-dev==1:1.2.11.dfsg-1 \ No newline at end of file diff --git a/files/build/versions/dockers/docker-sonic-mgmt-framework/versions-py3 b/files/build/versions/dockers/docker-sonic-mgmt-framework/versions-py3 index f6b6e3be72..5bac9d63af 100644 --- a/files/build/versions/dockers/docker-sonic-mgmt-framework/versions-py3 +++ b/files/build/versions/dockers/docker-sonic-mgmt-framework/versions-py3 @@ -11,7 +11,7 @@ idna==3.3 importlib-metadata==4.11.2 importlib-resources==5.4.0 inflection==0.5.1 -itsdangerous==2.1.0 +itsdangerous==2.1.1 jsonschema==4.4.0 openapi-schema-validator==0.2.3 openapi-spec-validator==0.4.0 diff --git a/files/build/versions/dockers/docker-syncd-bfn/versions-deb-buster b/files/build/versions/dockers/docker-syncd-bfn/versions-deb-buster index ea05a4841b..8ea45c8822 100644 --- a/files/build/versions/dockers/docker-syncd-bfn/versions-deb-buster +++ b/files/build/versions/dockers/docker-syncd-bfn/versions-deb-buster @@ -19,5 +19,5 @@ libunwind8==1.2.1-10~deb10u1 libusb-1.0-0==2:1.0.22-2 libusb-1.0-0-dev==2:1.0.22-2 libxml2==2.9.4+dfsg1-7+deb10u2 -linux-libc-dev==4.19.208-1 +linux-libc-dev==4.19.232-1 syncd==1.0.0 \ No newline at end of file diff --git a/files/build/versions/dockers/docker-syncd-brcm/versions-deb-buster b/files/build/versions/dockers/docker-syncd-brcm/versions-deb-buster index 773410b51c..5fb3bd87db 100644 --- a/files/build/versions/dockers/docker-syncd-brcm/versions-deb-buster +++ b/files/build/versions/dockers/docker-syncd-brcm/versions-deb-buster @@ -25,7 +25,7 @@ libswsscommon-dbg==1.0.0 libunwind8==1.2.1-10~deb10u1 libyaml-0-2==0.2.1-1 libyaml-dev==0.2.1-1 -linux-libc-dev==4.19.208-1 +linux-libc-dev==4.19.232-1 openssh-client==1:7.9p1-10+deb10u2 sshpass==1.06-1 strace==4.26-0.2 diff --git a/files/build/versions/dockers/docker-syncd-centec-rpc/versions-deb-buster b/files/build/versions/dockers/docker-syncd-centec-rpc/versions-deb-buster index b50eb2a2e9..30d02e2b3d 100644 --- a/files/build/versions/dockers/docker-syncd-centec-rpc/versions-deb-buster +++ b/files/build/versions/dockers/docker-syncd-centec-rpc/versions-deb-buster @@ -54,7 +54,7 @@ libtsan0==8.3.0-6 libubsan1==8.3.0-6 libuv1==1.24.1-1+deb10u1 libxml2==2.9.4+dfsg1-7+deb10u2 -linux-libc-dev==4.19.208-1 +linux-libc-dev==4.19.232-1 make==4.2.1-1.2 patch==2.7.6-3+deb10u1 python==2.7.16-1 diff --git a/files/build/versions/dockers/docker-syncd-mlnx/versions-deb-buster b/files/build/versions/dockers/docker-syncd-mlnx/versions-deb-buster index 1611279d32..fd7fd1e6bc 100644 --- a/files/build/versions/dockers/docker-syncd-mlnx/versions-deb-buster +++ b/files/build/versions/dockers/docker-syncd-mlnx/versions-deb-buster @@ -32,7 +32,7 @@ libsairedis-dbg==1.0.0 libswsscommon-dbg==1.0.0 libunwind8==1.2.1-10~deb10u1 libxml2==2.9.4+dfsg1-7+deb10u2 -linux-libc-dev==4.19.208-1 +linux-libc-dev==4.19.232-1 mft==4.18.1-16 mlnx-sai==1.mlnx.SAIRel1.20.2.6 openssh-client==1:7.9p1-10+deb10u2 diff --git a/files/build/versions/dockers/sonic-slave-buster/versions-deb-buster-arm64 b/files/build/versions/dockers/sonic-slave-buster/versions-deb-buster-arm64 index e7bffb7be0..feff0a2b31 100644 --- a/files/build/versions/dockers/sonic-slave-buster/versions-deb-buster-arm64 +++ b/files/build/versions/dockers/sonic-slave-buster/versions-deb-buster-arm64 @@ -1,7 +1,10 @@ binutils-aarch64-linux-gnu==2.31.1-16 +containerd.io==1.5.10-1 libdrm-etnaviv1==2.4.97-1 libdrm-freedreno1==2.4.97-1 libdrm-tegra0==2.4.97-1 libtext-iconv-perl==1.7-5+b6 libxslt1-dev==1.1.32-2.2~deb10u1 +linux-kbuild-4.19==4.19.232-1 +linux-libc-dev==4.19.232-1 nodejs==14.19.0-deb-1nodesource1 \ No newline at end of file diff --git a/files/build/versions/dockers/sonic-slave-buster/versions-deb-buster-armhf b/files/build/versions/dockers/sonic-slave-buster/versions-deb-buster-armhf index 88a35d23cb..510c58ac10 100644 --- a/files/build/versions/dockers/sonic-slave-buster/versions-deb-buster-armhf +++ b/files/build/versions/dockers/sonic-slave-buster/versions-deb-buster-armhf @@ -1,4 +1,5 @@ binutils-arm-linux-gnueabihf==2.31.1-16 +containerd.io==1.5.10-1 libclang-6.0-dev==1:6.0.1-10 libclang-7-dev==1:7.0.1-8+deb10u2 libclang-common-6.0-dev==1:6.0.1-10 @@ -99,7 +100,9 @@ libunicode-linebreak-perl==0.0.20190101-1 libxapian-dev==1.4.11-1 libxslt1-dev==1.1.32-2.2~deb10u1 libyaml-tiny-perl==1.73-1 -linux-compiler-gcc-8-arm==4.19.208-1 +linux-compiler-gcc-8-arm==4.19.232-1 +linux-kbuild-4.19==4.19.232-1 +linux-libc-dev==4.19.232-1 llvm-6.0==1:6.0.1-10 llvm-6.0-dev==1:6.0.1-10 llvm-6.0-runtime==1:6.0.1-10 diff --git a/files/build/versions/dockers/sonic-slave-buster/versions-git b/files/build/versions/dockers/sonic-slave-buster/versions-git deleted file mode 100644 index b029d6eada..0000000000 --- a/files/build/versions/dockers/sonic-slave-buster/versions-git +++ /dev/null @@ -1,2 +0,0 @@ -https://chromium.googlesource.com/chromium/tools/depot_tools.git==8edc960e9acbaedbff28e323e77a4129817266b3 -https://github.com/aristanetworks/swi-tools.git==e938746c694e4eaa4cf4126981382c9c8372db24 \ 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 deleted file mode 100644 index b029d6eada..0000000000 --- a/files/build/versions/dockers/sonic-slave-stretch/versions-git +++ /dev/null @@ -1,2 +0,0 @@ -https://chromium.googlesource.com/chromium/tools/depot_tools.git==8edc960e9acbaedbff28e323e77a4129817266b3 -https://github.com/aristanetworks/swi-tools.git==e938746c694e4eaa4cf4126981382c9c8372db24 \ No newline at end of file diff --git a/files/build/versions/host-image/versions-deb-buster b/files/build/versions/host-image/versions-deb-buster index dc223e070b..6e658d5ef9 100644 --- a/files/build/versions/host-image/versions-deb-buster +++ b/files/build/versions/host-image/versions-deb-buster @@ -9,7 +9,7 @@ busybox==1:1.30.1-4 ca-certificates==20200601~deb10u2 cgroup-tools==0.41-8.1 conntrack==1:1.4.5-2 -containerd.io==1.4.13-1 +containerd.io==1.5.10-1 cpio==2.12+dfsg-9 cron==3.0pl1-134+deb10u1 curl==7.64.0-4+deb10u2 diff --git a/files/build/versions/host-image/versions-deb-buster-armhf b/files/build/versions/host-image/versions-deb-buster-armhf index 2ddcd36987..9818aed5ad 100644 --- a/files/build/versions/host-image/versions-deb-buster-armhf +++ b/files/build/versions/host-image/versions-deb-buster-armhf @@ -13,7 +13,7 @@ libxml2-dev==2.9.4+dfsg1-7+deb10u2 libxslt1-dev==1.1.32-2.2~deb10u1 libxslt1.1==1.1.32-2.2~deb10u1 linux-image-4.19.0-12-2-armmp==4.19.152-1 -linux-libc-dev==4.19.208-1 +linux-libc-dev==4.19.232-1 mrvlprestera==1.0 squashfs-tools==1:4.3-12+deb10u1 tzdata==2021a-0+deb10u3