From 763fcd7eeb28a2338900843fe6bbc163be1aac04 Mon Sep 17 00:00:00 2001 From: mssonicbld <79238446+mssonicbld@users.noreply.github.com> Date: Fri, 16 Jul 2021 22:34:02 +0800 Subject: [PATCH] [ci/build]: Upgrade SONiC package versions (#8199) --- .../versions-deb-buster | 1 - .../build-sonic-slave-buster/versions-git | 2 +- files/build/versions/default/versions-git | 4 ++-- .../docker-syncd-mlnx/versions-deb-buster | 21 ------------------- .../dockers/sonic-slave-buster/versions-git | 2 +- .../sonic-slave-stretch/versions-deb-stretch | 12 +++++------ .../dockers/sonic-slave-stretch/versions-git | 2 +- 7 files changed, 11 insertions(+), 33 deletions(-) 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 353fd5222f..92730cde7a 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 @@ -77,7 +77,6 @@ linux-headers-4.19.0-12-2-amd64==4.19.152-1 linux-headers-4.19.0-12-2-common==4.19.152-1 lldpd==1.0.4-1 lm-sensors==1:3.5.0-3 -mft==4.16.0-105 pango1.0-tools==1.42.4-8~deb10u1 python-swsscommon==1.0.0 python-thrift==0.11.0-4 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 c4d4b15a58..92747005c1 100644 --- a/files/build/versions/build/build-sonic-slave-buster/versions-git +++ b/files/build/versions/build/build-sonic-slave-buster/versions-git @@ -8,7 +8,7 @@ https://github.com/sflow/sflowtool==4be2a17b36a3b9796c280b117b8b786323a84ae8 https://github.com/thom311/libnl==5f395029ad01f05448cd1c7e0ddd8085d758c98a https://salsa.debian.org/debian/libteam.git==f8808df228b00873926b5e7b998ad8b61368d4c5 https://salsa.debian.org/dhcp-team/isc-dhcp.git==d0d58776805d720029619ea06df5c57706eecd5a -https://salsa.debian.org/kernel-team/ethtool/==1d3939b7fe0142d97e8ecaf591ae95e9ef76ae60 +https://salsa.debian.org/kernel-team/ethtool/==b1728187be85b69393e7a3ac536102d62e130939 https://salsa.debian.org/kernel-team/initramfs-tools.git==40e544e13611c1b2690eb99a8096fc16c1b9c74e https://salsa.debian.org/sk-guest/monit.git==c9da7ebb1f35dfba17b50b5969a6e75e29cbec0d https://salsa.debian.org/ssh-team/openssh.git==d57879aa12227e73fb8aaec57262f65a4900af27 \ No newline at end of file diff --git a/files/build/versions/default/versions-git b/files/build/versions/default/versions-git index 94487b18b9..c069cfa8a3 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==1606c25b44d7a3daab69e8ce0806c3c02780cf01 +https://chromium.googlesource.com/chromium/tools/depot_tools.git==bbd562b2c1a220e0484807aaa78e43382d9837b3 https://github.com/aristanetworks/swi-tools.git==2ec0a0579b81edd3ff1c1288d73de309819ada0c https://github.com/CESNET/libyang.git==6f74fd18e5ace7d8f1ae6c1c1c2b7442dc263b22 https://github.com/daveolson53/libnss-tacplus.git==19008ab68d9d504aa58eb34d5f564755a1613b8b @@ -12,7 +12,7 @@ https://github.com/sflow/sflowtool==4be2a17b36a3b9796c280b117b8b786323a84ae8 https://github.com/thom311/libnl==5f395029ad01f05448cd1c7e0ddd8085d758c98a https://salsa.debian.org/debian/libteam.git==f8808df228b00873926b5e7b998ad8b61368d4c5 https://salsa.debian.org/dhcp-team/isc-dhcp.git==d0d58776805d720029619ea06df5c57706eecd5a -https://salsa.debian.org/kernel-team/ethtool/==1d3939b7fe0142d97e8ecaf591ae95e9ef76ae60 +https://salsa.debian.org/kernel-team/ethtool/==b1728187be85b69393e7a3ac536102d62e130939 https://salsa.debian.org/kernel-team/initramfs-tools.git==40e544e13611c1b2690eb99a8096fc16c1b9c74e https://salsa.debian.org/sk-guest/monit.git==c9da7ebb1f35dfba17b50b5969a6e75e29cbec0d https://salsa.debian.org/ssh-team/openssh.git==d57879aa12227e73fb8aaec57262f65a4900af27 \ No newline at end of file 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 36ee60a321..36d2582226 100644 --- a/files/build/versions/dockers/docker-syncd-mlnx/versions-deb-buster +++ b/files/build/versions/dockers/docker-syncd-mlnx/versions-deb-buster @@ -1,22 +1,11 @@ applibs==1.mlnx.4.4.3216 applibs-dev==1.mlnx.4.4.3216 -gdb==8.2.1-2+b3 -gdbserver==8.2.1-2+b3 iproute2==1.mlnx.4.4.3216 iproute2-dev==1.mlnx.4.4.3216 -libbabeltrace1==1.5.6-2+deb10u1 -libbsd0==0.9.1-2+deb10u1 libc-dev-bin==2.28-10 libc6-dev==2.28-10 -libdw1==0.176-1.1 -libedit2==3.1-20181209-1 -libelf1==0.176-1.1 libexpat1-dev==2.2.6-2+deb10u1 -libglib2.0-0==2.58.3-2+deb10u3 -libgpm2==1.20.7-5 libicu63==63.1-6+deb10u1 -libipt2==2.0-2 -libpopt0==1.16-12 libpython-dev==2.7.16-1 libpython-stdlib==2.7.16-1 libpython2-dev==2.7.16-1 @@ -26,16 +15,11 @@ libpython2.7-dev==2.7.16-2+deb10u1 libpython2.7-minimal==2.7.16-2+deb10u1 libpython2.7-stdlib==2.7.16-2+deb10u1 libsaimetadata==1.0.0 -libsaimetadata-dbg==1.0.0 libsairedis==1.0.0 -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.194-2 mft==4.16.0-105 mlnx-sai==1.mlnx.SAIRel1.18.3.0 -openssh-client==1:7.9p1-10+deb10u2 python==2.7.16-1 python-dev==2.7.16-1 python-minimal==2.7.16-1 @@ -48,8 +32,6 @@ python2-minimal==2.7.16-1 python2.7==2.7.16-2+deb10u1 python2.7-dev==2.7.16-2+deb10u1 python2.7-minimal==2.7.16-2+deb10u1 -sshpass==1.06-1 -strace==4.26-0.2 sx-acl-helper==1.mlnx.4.4.3216 sx-acl-helper-dev==1.mlnx.4.4.3216 sx-complib==1.mlnx.4.4.3216 @@ -63,8 +45,5 @@ sx-scew-dev==1.mlnx.4.4.3216 sxd-libs==1.mlnx.4.4.3216 sxd-libs-dev==1.mlnx.4.4.3216 syncd==1.0.0 -syncd-dbg==1.0.0 -vim==2:8.1.0875-5 -vim-runtime==2:8.1.0875-5 wjh-libs==1.mlnx.4.4.3216 wjh-libs-dev==1.mlnx.4.4.3216 \ No newline at end of file diff --git a/files/build/versions/dockers/sonic-slave-buster/versions-git b/files/build/versions/dockers/sonic-slave-buster/versions-git index 84db3d8559..7f32200f52 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==1606c25b44d7a3daab69e8ce0806c3c02780cf01 +https://chromium.googlesource.com/chromium/tools/depot_tools.git==1e982d5727bb51c8da2da13e5aeec02fd0b94632 https://github.com/aristanetworks/swi-tools.git==2ec0a0579b81edd3ff1c1288d73de309819ada0c \ No newline at end of file diff --git a/files/build/versions/dockers/sonic-slave-stretch/versions-deb-stretch b/files/build/versions/dockers/sonic-slave-stretch/versions-deb-stretch index fa2e3500a9..7e8937ec05 100644 --- a/files/build/versions/dockers/sonic-slave-stretch/versions-deb-stretch +++ b/files/build/versions/dockers/sonic-slave-stretch/versions-deb-stretch @@ -1204,12 +1204,12 @@ php-text-template==1.2.1-2 php-timer==1.0.8-1 php-token-stream==1.4.8-2 php-xml==1:7.0+49 -php7.0-cli==7.0.33-0+deb9u10 -php7.0-common==7.0.33-0+deb9u10 -php7.0-json==7.0.33-0+deb9u10 -php7.0-opcache==7.0.33-0+deb9u10 -php7.0-readline==7.0.33-0+deb9u10 -php7.0-xml==7.0.33-0+deb9u10 +php7.0-cli==7.0.33-0+deb9u11 +php7.0-common==7.0.33-0+deb9u11 +php7.0-json==7.0.33-0+deb9u11 +php7.0-opcache==7.0.33-0+deb9u11 +php7.0-readline==7.0.33-0+deb9u11 +php7.0-xml==7.0.33-0+deb9u11 phpunit==5.4.6-2~deb9u1 phpunit-code-unit-reverse-lookup==1.0.0-2 phpunit-comparator==1.2.0-2 diff --git a/files/build/versions/dockers/sonic-slave-stretch/versions-git b/files/build/versions/dockers/sonic-slave-stretch/versions-git index 84db3d8559..43f411ae09 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==1606c25b44d7a3daab69e8ce0806c3c02780cf01 +https://chromium.googlesource.com/chromium/tools/depot_tools.git==bbd562b2c1a220e0484807aaa78e43382d9837b3 https://github.com/aristanetworks/swi-tools.git==2ec0a0579b81edd3ff1c1288d73de309819ada0c \ No newline at end of file