From cc17c7ac114c4dd22f3c047a3b4226441dcf5f7a Mon Sep 17 00:00:00 2001 From: mssonicbld <79238446+mssonicbld@users.noreply.github.com> Date: Sun, 26 Feb 2023 22:57:45 +0800 Subject: [PATCH 01/20] [ci/build]: Upgrade SONiC package versions (#13992) --- .../build-sonic-slave-buster/versions-git | 2 +- .../versions-deb-stretch | 3 + .../build-sonic-slave-stretch/versions-py2 | 15 +++- files/build/versions/default/versions-docker | 1 + files/build/versions/default/versions-git | 4 +- files/build/versions/default/versions-web | 4 + .../dockers/docker-base-buster/versions-py3 | 2 +- .../docker-base-stretch/versions-deb-stretch | 76 +++++++++++++++++++ .../dockers/docker-base-stretch/versions-py2 | 6 ++ .../versions-deb-stretch | 46 +++++++++++ .../docker-config-engine-stretch/versions-py2 | 22 ++++++ .../docker-sonic-mgmt-framework/versions-py3 | 2 +- .../docker-syncd-nephos/versions-deb-stretch | 29 +++++++ .../dockers/sonic-slave-buster/versions-git | 2 +- .../dockers/sonic-slave-stretch/versions-git | 2 +- .../versions/host-image/versions-deb-buster | 1 + 16 files changed, 209 insertions(+), 8 deletions(-) create mode 100644 files/build/versions/dockers/docker-base-stretch/versions-deb-stretch create mode 100644 files/build/versions/dockers/docker-base-stretch/versions-py2 create mode 100644 files/build/versions/dockers/docker-config-engine-stretch/versions-deb-stretch create mode 100644 files/build/versions/dockers/docker-config-engine-stretch/versions-py2 create mode 100644 files/build/versions/dockers/docker-syncd-nephos/versions-deb-stretch 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 04664a9abdc6..30fbbea95c09 100644 --- a/files/build/versions/build/build-sonic-slave-buster/versions-git +++ b/files/build/versions/build/build-sonic-slave-buster/versions-git @@ -3,7 +3,7 @@ https://github.com/daveolson53/libnss-tacplus.git==19008ab68d9d504aa58eb34d5f564 https://github.com/jeroennijhof/pam_tacplus.git==7908a7faa0205beda9ea198bdd3aa37868be6da2 https://github.com/jpirko/libteam.git==61e27812c1074a865d7e1a778c0ce442837c28d7 https://github.com/Mellanox/libpsample.git==62bb27d9a49424e45191eee81df7ce0d8c74e774 -https://github.com/sflow/host-sflow==7501810eaa9559f0d9d274a4ad935642114e18e8 +https://github.com/sflow/host-sflow==e026e2b57f3c7736a75cd1278f7867fb5e5006ee https://github.com/sflow/sflowtool==8c914e79ecb7930adcba2e5296041c3f9eb8e450 https://github.com/thom311/libnl==cbafad9ddf24caef5230fef715d34f0539603be0 https://salsa.debian.org/debian/libteam.git==48142125234a665ad5367b724af36a58fb484d3d diff --git a/files/build/versions/build/build-sonic-slave-stretch/versions-deb-stretch b/files/build/versions/build/build-sonic-slave-stretch/versions-deb-stretch index c3f79d28969b..af7a04c29723 100644 --- a/files/build/versions/build/build-sonic-slave-stretch/versions-deb-stretch +++ b/files/build/versions/build/build-sonic-slave-stretch/versions-deb-stretch @@ -10,6 +10,7 @@ libnl-nf-3-dev==3.5.0-1 libnl-route-3-dev==3.5.0-1 libsaimetadata==1.0.0 libsaimetadata-dev==1.0.0 +libsainps==1.5.0 libsairedis==1.0.0 libsaivs==1.0.0 libsaivs-dev==1.0.0 @@ -17,5 +18,7 @@ libswsscommon==1.0.0 libswsscommon-dev==1.0.0 libthrift-0.11.0==0.11.0-4 libthrift-dev==0.11.0-4 +python-swsscommon==1.0.0 python-thrift==0.11.0-4 +syncd==1.0.0 thrift-compiler==0.11.0-4 \ No newline at end of file diff --git a/files/build/versions/build/build-sonic-slave-stretch/versions-py2 b/files/build/versions/build/build-sonic-slave-stretch/versions-py2 index 40414e6f3143..7a0c6a834d5e 100644 --- a/files/build/versions/build/build-sonic-slave-stretch/versions-py2 +++ b/files/build/versions/build/build-sonic-slave-stretch/versions-py2 @@ -1,2 +1,15 @@ +bitarray==1.5.3 +contextlib2==0.6.0.post1 +future==0.18.3 +importlib-resources==3.3.1 +natsort==6.2.1 +netaddr==0.8.0 +pathlib2==2.3.7.post1 +pyang==2.5.3 +pyangbind==0.6.0 +redis==3.5.3 sairedis==1.0 -thrift==0.11.0 \ No newline at end of file +scandir==1.10.0 +singledispatch==3.7.0 +thrift==0.11.0 +zipp==1.2.0 \ No newline at end of file diff --git a/files/build/versions/default/versions-docker b/files/build/versions/default/versions-docker index 1c4402c80f9f..18e5f1f28729 100644 --- a/files/build/versions/default/versions-docker +++ b/files/build/versions/default/versions-docker @@ -1,4 +1,5 @@ amd64:amd64/debian:buster==sha256:b589ffbcc03bb272c9e0c0e699aedb2271a1ca65b2a3447057cbfd80d9eff9bf +amd64:amd64/debian:stretch==sha256:16ee3e11da473f6565ef94a715f1a38b3079e0664913be78869c336a71cb6085 amd64:debian:buster==sha256:233c3bbc892229c82da7231980d50adceba4db56a08c0b7053a4852782703459 amd64:debian:stretch==sha256:c5c5200ff1e9c73ffbf188b4a67eb1c91531b644856b4aefe86a58d2f0cb05be arm64:arm64v8/debian:buster==sha256:88d3e537769c4ef5bc7961ad5460739dacb29d266d178e6f9befbe900afeb9b9 diff --git a/files/build/versions/default/versions-git b/files/build/versions/default/versions-git index d25efb9a1cda..b05e34f9c2ff 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==27ac29f980eb459c7da5ddea20ec515d7c8627c9 +https://chromium.googlesource.com/chromium/tools/depot_tools.git==9144b67c7f037577516ebdfe220997560bd01e14 https://github.com/aristanetworks/swi-tools.git==b5f087e4774168bf536360d43c9c509c8f14ad9f https://github.com/CESNET/libyang.git==d57c8888922d1663508ad0f0a5b66f8ad600276d https://github.com/daveolson53/libnss-tacplus.git==19008ab68d9d504aa58eb34d5f564755a1613b8b @@ -9,7 +9,7 @@ https://github.com/lguohan/gnxi.git==f2b11e45b16ab13485ae14933f30c18ee6336499 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==7501810eaa9559f0d9d274a4ad935642114e18e8 +https://github.com/sflow/host-sflow==e026e2b57f3c7736a75cd1278f7867fb5e5006ee https://github.com/sflow/sflowtool==8c914e79ecb7930adcba2e5296041c3f9eb8e450 https://github.com/thom311/libnl==cbafad9ddf24caef5230fef715d34f0539603be0 https://salsa.debian.org/debian/libteam.git==48142125234a665ad5367b724af36a58fb484d3d diff --git a/files/build/versions/default/versions-web b/files/build/versions/default/versions-web index 75ca541b578d..e9cbe57caf53 100644 --- a/files/build/versions/default/versions-web +++ b/files/build/versions/default/versions-web @@ -32,6 +32,9 @@ https://github.com/Innovium/SONiC/raw/master/debian/202012/isai.deb==93d5a552bf3 https://github.com/Innovium/SONiC/raw/master/debian/202012/saihdr.deb==ac05a7ac58f537fc7e7c7f2f2ced4465 https://github.com/Marvell-switching/sonic-marvell-binaries/raw/master/armhf/sai-plugin/mrvllibsai_1.7.1-9_armhf.deb==b21b91609632e813443ccb00bf2d7c61 https://github.com/nanomsg/nanomsg/archive/1.0.0.tar.gz==6f56ef28c93cee644e8c4aaaef7cfb55 +https://github.com/NephosInc/SONiC/raw/master/sai/libsainps-dev_3.0.0_sai_1.5.0_06a67d_amd64.deb==64931041f82533e2a05e003ed9d878c8 +https://github.com/NephosInc/SONiC/raw/master/sai/libsainps_3.0.0_sai_1.5.0_06a67d_amd64.deb==385b84051259ebb2580522a990cca161 +https://github.com/NephosInc/SONiC/raw/master/sdk/npx_diag==a444c876aaf2a8b4c99238f15fbc13a0 https://raw.githubusercontent.com/p4lang/ptf/master/ptf_nn/ptf_nn_agent.py==628956b660575965429cec84b1778816 https://repo1.maven.org/maven2/io/swagger/swagger-codegen-cli/2.4.5/swagger-codegen-cli-2.4.5.jar==219f1453ff22482d9e080effbfa7fa81 https://sonicstorage.blob.core.windows.net/debian-security/pool/updates/main/l/linux/linux_4.19.152-1.debian.tar.xz==875d84b0edad0210c090195a8df4eb6c @@ -46,6 +49,7 @@ https://sonicstorage.blob.core.windows.net/debian/pool/main/liby/libyang/libyang https://sonicstorage.blob.core.windows.net/debian/pool/main/n/net-snmp/net-snmp_5.7.3+dfsg-5.debian.tar.xz==ad957e90207d0669beb2109e4e325def https://sonicstorage.blob.core.windows.net/debian/pool/main/n/net-snmp/net-snmp_5.7.3+dfsg-5.dsc==2443e4dffbdb020e7ab4f947a7904912 https://sonicstorage.blob.core.windows.net/debian/pool/main/n/net-snmp/net-snmp_5.7.3+dfsg.orig.tar.xz==6391ae27eb1ae34ff5530712bb1c4209 +https://sonicstorage.blob.core.windows.net/packages/20190307/dsserve?sv=2015-04-05&sr=b&sig=lk7BH3DtW%2F5ehc0Rkqfga%2BUCABI0UzQmDamBsZH9K6w%3D&se=2038-05-06T22%3A34%3A45Z&sp=r==f9d4b815ebb9be9f755dedca8a51170d https://sonicstorage.blob.core.windows.net/packages/cmake/cmake-data_3.13.2-1_bpo9%2B1_all.deb?st=2020-03-27T02%3A22%3A24Z&se=2100-03-26T19%3A00%3A00Z&sp=rl&sv=2018-03-28&sr=b&sig=Xby%2Bm3OZOjPB%2FSlDbHD65yDcPzAgoys%2FA3vK8RB4BzA%3D==147cf42f3a68f6d6f1e53d95a599a1af https://sonicstorage.blob.core.windows.net/packages/cmake/cmake_3.13.2-1_bpo9%2B1_amd64.deb?st=2020-03-27T02%3A27%3A21Z&se=2100-03-26T19%3A00%3A00Z&sp=rl&sv=2018-03-28&sr=b&sig=4MvmmDBQuicFEJYakLm7xCNU19yJ8GIP4ankFSnITKY%3D==e75c741e8b6918b8f03625e456fa0275 https://sonicstorage.blob.core.windows.net/packages/cmake/cmake_3.13.2-1_bpo9%2B1_arm64.deb?st=2020-03-27T02%3A28%3A38Z&se=2100-03-26T19%3A00%3A00Z&sp=rl&sv=2018-03-28&sr=b&sig=rrHMkLi29aI8yH6s52ILCY8VcEbNFrzYT2DmC5RwOgs%3D==9bcc989e6ed168717f67c07e79177d4a diff --git a/files/build/versions/dockers/docker-base-buster/versions-py3 b/files/build/versions/dockers/docker-base-buster/versions-py3 index 4602e8aa671e..cf6bd999d21e 100644 --- a/files/build/versions/dockers/docker-base-buster/versions-py3 +++ b/files/build/versions/dockers/docker-base-buster/versions-py3 @@ -3,4 +3,4 @@ jinja2==3.1.2 markupsafe==2.1.2 supervisor==4.2.1 supervisord-dependent-startup==1.4.0 -toposort==1.9 \ No newline at end of file +toposort==1.10 \ No newline at end of file diff --git a/files/build/versions/dockers/docker-base-stretch/versions-deb-stretch b/files/build/versions/dockers/docker-base-stretch/versions-deb-stretch new file mode 100644 index 000000000000..456ed031ac62 --- /dev/null +++ b/files/build/versions/dockers/docker-base-stretch/versions-deb-stretch @@ -0,0 +1,76 @@ +ca-certificates==20200601~deb9u2 +curl==7.52.1-5+deb9u16 +jq==1.5+dfsg-1.3 +less==481-2.1 +libatomic1==6.3.0-18+deb9u1 +libcurl3==7.52.1-5+deb9u16 +libdaemon0==0.14-6 +libdbus-1-3==1.10.32-0+deb9u1 +libestr0==0.1.10-2 +libexpat1==2.2.0-2+deb9u5 +libfastjson4==0.99.8-1~bpo9+1 +libffi6==3.2.1-6 +libgdbm3==1.8.3-14 +libgmp10==2:6.1.2+dfsg-1+deb9u1 +libgnutls30==3.5.8-5+deb9u6 +libgssapi-krb5-2==1.15-1+deb9u3 +libhiredis0.14==0.14.0-3~bpo9+1 +libhogweed4==3.3-1+deb9u1 +libidn2-0==0.16-1+deb9u1 +libjansson4==2.9-1 +libjemalloc1==3.6.0-9.1 +libjq1==1.5+dfsg-1.3 +libk5crypto3==1.15-1+deb9u3 +libkeyutils1==1.5.9-9 +libkrb5-3==1.15-1+deb9u3 +libkrb5support0==1.15-1+deb9u3 +libldap-2.4-2==2.4.44+dfsg-5+deb9u9 +libldap-common==2.4.44+dfsg-5+deb9u9 +liblognorm5==2.0.3-1~bpo9+1 +liblua5.1-0==5.1.5-8.1+b2 +libncurses5==6.0+20161126-1+deb9u2 +libnghttp2-14==1.18.1-1+deb9u2 +libonig4==6.1.3-2+deb9u2 +libp11-kit0==0.23.3-2+deb9u1 +libperl5.24==5.24.1-3+deb9u7 +libpgm-5.2-0==5.2.122~dfsg-2 +libprocps6==2:3.3.12-3+deb9u1 +libpsl5==0.17.0-3 +libpython-stdlib==2.7.13-2 +libpython2.7==2.7.13-2+deb9u6 +libpython2.7-minimal==2.7.13-2+deb9u6 +libpython2.7-stdlib==2.7.13-2+deb9u6 +libreadline7==7.0-3 +librtmp1==2.4+20151223.gitfa8646d.1-1+b1 +libsasl2-2==2.1.27~101-g0780600+dfsg-3+deb9u2 +libsasl2-modules-db==2.1.27~101-g0780600+dfsg-3+deb9u2 +libsodium18==1.0.11-2 +libsqlite3-0==3.16.2-5+deb9u3 +libssh2-1==1.7.0-1+deb9u2 +libssl1.0.2==1.0.2u-1~deb9u7 +libssl1.1==1.1.0l-1~deb9u6 +libtasn1-6==4.10-1.1+deb9u1 +libunistring0==0.9.6+really0.9.3-0.1 +libwrap0==7.6.q-26 +libzmq5==4.2.1-4+deb9u4 +lua-bitop==1.0.2-4 +lua-cjson==2.1.0+dfsg-2 +mime-support==3.60 +net-tools==1.60+git20161116.90da8a0-1 +openssl==1.1.0l-1~deb9u6 +perl==5.24.1-3+deb9u7 +perl-modules-5.24==5.24.1-3+deb9u7 +procps==2:3.3.12-3+deb9u1 +python==2.7.13-2 +python-minimal==2.7.13-2 +python-pip==9.0.1-2+deb9u2 +python-pip-whl==9.0.1-2+deb9u2 +python2.7==2.7.13-2+deb9u6 +python2.7-minimal==2.7.13-2+deb9u6 +readline-common==7.0-3 +redis-tools==5:6.0.6-1~bpo10+1 +rsyslog==8.1901.0-1~bpo9+1 +socat==1.7.3.1-2+deb9u1 +vim-common==2:8.0.0197-4+deb9u7 +vim-tiny==2:8.0.0197-4+deb9u7 +xxd==2:8.0.0197-4+deb9u7 \ No newline at end of file diff --git a/files/build/versions/dockers/docker-base-stretch/versions-py2 b/files/build/versions/dockers/docker-base-stretch/versions-py2 new file mode 100644 index 000000000000..888ec533991a --- /dev/null +++ b/files/build/versions/dockers/docker-base-stretch/versions-py2 @@ -0,0 +1,6 @@ +j2cli==0.3.10 +jinja2==2.11.3 +markupsafe==1.1.1 +supervisor==4.2.5 +supervisord-dependent-startup==1.4.0 +toposort==1.7 \ No newline at end of file diff --git a/files/build/versions/dockers/docker-config-engine-stretch/versions-deb-stretch b/files/build/versions/dockers/docker-config-engine-stretch/versions-deb-stretch new file mode 100644 index 000000000000..31dbc0f02747 --- /dev/null +++ b/files/build/versions/dockers/docker-config-engine-stretch/versions-deb-stretch @@ -0,0 +1,46 @@ +binutils==2.28-5 +build-essential==12.3 +bzip2==1.0.6-8.1 +cpp==4:6.3.0-4 +cpp-6==6.3.0-18+deb9u1 +dpkg-dev==1.18.26 +g++==4:6.3.0-4 +g++-6==6.3.0-18+deb9u1 +gcc==4:6.3.0-4 +gcc-6==6.3.0-18+deb9u1 +libasan3==6.3.0-18+deb9u1 +libatomic1==6.3.0-18+deb9u1 +libc-dev-bin==2.24-11+deb9u4 +libc6-dev==2.24-11+deb9u4 +libcc1-0==6.3.0-18+deb9u1 +libcilkrts5==6.3.0-18+deb9u1 +libdpkg-perl==1.18.26 +libexpat1-dev==2.2.0-2+deb9u5 +libgcc-6-dev==6.3.0-18+deb9u1 +libgomp1==6.3.0-18+deb9u1 +libhiredis0.14==0.14.0-3~bpo9+1 +libisl15==0.18-1 +libitm1==6.3.0-18+deb9u1 +liblsan0==6.3.0-18+deb9u1 +libmpc3==1.0.3-1+b2 +libmpfr4==3.1.5-1 +libmpx2==6.3.0-18+deb9u1 +libnl-3-200==3.5.0-1 +libnl-cli-3-200==3.5.0-1 +libnl-genl-3-200==3.5.0-1 +libnl-nf-3-200==3.5.0-1 +libnl-route-3-200==3.5.0-1 +libpython-dev==2.7.13-2 +libpython2.7-dev==2.7.13-2+deb9u6 +libquadmath0==6.3.0-18+deb9u1 +libstdc++-6-dev==6.3.0-18+deb9u1 +libswsscommon==1.0.0 +libtsan0==6.3.0-18+deb9u1 +libubsan0==6.3.0-18+deb9u1 +linux-libc-dev==4.9.320-2 +make==4.1-9.1 +patch==2.7.5-1+deb9u2 +python-dev==2.7.13-2 +python-swsscommon==1.0.0 +python2.7-dev==2.7.13-2+deb9u6 +xz-utils==5.2.2-1.2+deb9u1 \ No newline at end of file diff --git a/files/build/versions/dockers/docker-config-engine-stretch/versions-py2 b/files/build/versions/dockers/docker-config-engine-stretch/versions-py2 new file mode 100644 index 000000000000..ad70857eef4a --- /dev/null +++ b/files/build/versions/dockers/docker-config-engine-stretch/versions-py2 @@ -0,0 +1,22 @@ +bitarray==1.5.3 +contextlib2==0.6.0.post1 +future==0.18.3 +importlib-resources==3.3.1 +ipaddress==1.0.23 +lxml==4.6.3 +natsort==6.2.1 +netaddr==0.8.0 +pathlib2==2.3.7.post1 +pyang==2.5.3 +pyangbind==0.6.0 +pyyaml==5.4.1 +redis==3.5.3 +redis-dump-load==1.1 +scandir==1.10.0 +singledispatch==3.7.0 +six==1.16.0 +sonic-config-engine==1.0 +sonic-py-common==1.0 +swsssdk==2.0.1 +typing==3.10.0.0 +zipp==1.2.0 \ 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 159a1b98e2ae..e53395334666 100644 --- a/files/build/versions/dockers/docker-sonic-mgmt-framework/versions-py3 +++ b/files/build/versions/dockers/docker-sonic-mgmt-framework/versions-py3 @@ -28,4 +28,4 @@ six==1.11.0 typing_extensions==4.5.0 urllib3==1.26.5 werkzeug==2.2.3 -zipp==3.14.0 \ No newline at end of file +zipp==3.15.0 \ No newline at end of file diff --git a/files/build/versions/dockers/docker-syncd-nephos/versions-deb-stretch b/files/build/versions/dockers/docker-syncd-nephos/versions-deb-stretch new file mode 100644 index 000000000000..73159f281269 --- /dev/null +++ b/files/build/versions/dockers/docker-syncd-nephos/versions-deb-stretch @@ -0,0 +1,29 @@ +gdb==7.12-6 +gdbserver==7.12-6 +libbabeltrace-ctf1==1.5.1-1 +libbabeltrace1==1.5.1-1 +libbsd0==0.8.3-1+deb9u1 +libdw1==0.168-1+deb9u1 +libedit2==3.1-20160903-3 +libglib2.0-0==2.50.3-2+deb9u3 +libgpm2==1.20.4-6.2+b1 +libicu57==57.1-6+deb9u5 +libmpdec2==2.4.2-1 +libpopt0==1.16-10+b2 +libpython3.5==3.5.3-1+deb9u5 +libpython3.5-minimal==3.5.3-1+deb9u5 +libpython3.5-stdlib==3.5.3-1+deb9u5 +libsaimetadata==1.0.0 +libsaimetadata-dbg==1.0.0 +libsainps==1.5.0 +libsairedis==1.0.0 +libsairedis-dbg==1.0.0 +libswsscommon-dbg==1.0.0 +libxml2==2.9.4+dfsg1-2.2+deb9u7 +openssh-client==1:7.4p1-10+deb9u7 +sshpass==1.06-1 +strace==4.15-2 +syncd==1.0.0 +syncd-dbg==1.0.0 +vim==2:8.0.0197-4+deb9u7 +vim-runtime==2:8.0.0197-4+deb9u7 \ 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 5bee09a790bc..4a6d033a52cd 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==27ac29f980eb459c7da5ddea20ec515d7c8627c9 +https://chromium.googlesource.com/chromium/tools/depot_tools.git==9144b67c7f037577516ebdfe220997560bd01e14 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 5bee09a790bc..4a6d033a52cd 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==27ac29f980eb459c7da5ddea20ec515d7c8627c9 +https://chromium.googlesource.com/chromium/tools/depot_tools.git==9144b67c7f037577516ebdfe220997560bd01e14 https://github.com/aristanetworks/swi-tools.git==b5f087e4774168bf536360d43c9c509c8f14ad9f \ 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 25ffbf09d56e..e474032f1704 100644 --- a/files/build/versions/host-image/versions-deb-buster +++ b/files/build/versions/host-image/versions-deb-buster @@ -249,6 +249,7 @@ mtr-tiny==0.92-2 ncurses-base==6.1+20181013-2+deb10u3 ncurses-bin==6.1+20181013-2+deb10u3 ndisc6==1.0.4-1 +nephos-modules==1.0.1 net-tools==1.60+git20180626.aebd88e-1 netbase==5.6 netfilter-persistent==1.0.11+deb10u1 From f47024cdfd44293a9e35fdeb4aab61563e851468 Mon Sep 17 00:00:00 2001 From: Ikki Zhu <79439153+qnos@users.noreply.github.com> Date: Thu, 23 Feb 2023 02:55:55 +0800 Subject: [PATCH 02/20] add psu fans status led available config (#13926) Why I did it Seastone does not have the psu fans' status led, need to reflect it in platform.json. How I did it Set the psu fans status led available to false. How to verify it Verify it with platform_tests/api/test_psu_fans.py::TestPsuFans::test_set_fans_led case. --- device/celestica/x86_64-cel_seastone-r0/platform.json | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/device/celestica/x86_64-cel_seastone-r0/platform.json b/device/celestica/x86_64-cel_seastone-r0/platform.json index 6164c629611e..b1161e22d6fd 100644 --- a/device/celestica/x86_64-cel_seastone-r0/platform.json +++ b/device/celestica/x86_64-cel_seastone-r0/platform.json @@ -266,6 +266,9 @@ "name": "PSU-1 FAN-1", "speed": { "controllable": false + }, + "status_led": { + "available": false } } ] @@ -281,6 +284,9 @@ "name": "PSU-2 FAN-1", "speed": { "controllable": false + }, + "status_led": { + "available": false } } ] From 26b0e7f709a85a043cc0a037e29e26a0debe5c2f Mon Sep 17 00:00:00 2001 From: Saikrishna Arcot Date: Thu, 16 Feb 2023 19:13:39 -0800 Subject: [PATCH 03/20] Use tmpfs for /var/log on Arista 7050CX3-32S (#13805) This is to reduce writes to the SSD on the device. Signed-off-by: Saikrishna Arcot --- files/Aboot/boot0.j2 | 1 + 1 file changed, 1 insertion(+) diff --git a/files/Aboot/boot0.j2 b/files/Aboot/boot0.j2 index 3c95efe82c14..8b98d5e4b14b 100644 --- a/files/Aboot/boot0.j2 +++ b/files/Aboot/boot0.j2 @@ -516,6 +516,7 @@ write_platform_specific_cmdline() { fi if [ "$sid" = "Lodoga" ]; then aboot_machine=arista_7050cx3_32s + cmdline_add logs_inram=on fi if [ "$sid" = "Marysville" ]; then aboot_machine=arista_7050sx3_48yc8 From b7ef7fce16a056949975c22003928e137559e93b Mon Sep 17 00:00:00 2001 From: jhli-cisco <93410383+jhli-cisco@users.noreply.github.com> Date: Wed, 1 Mar 2023 16:05:11 -0800 Subject: [PATCH 04/20] Update cisco-8000.ini (#14009) #### Why I did it Update cisco platform module to 202012-v0.2.6 #### How I did it Update cisco-8000.ini --- platform/checkout/cisco-8000.ini | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/platform/checkout/cisco-8000.ini b/platform/checkout/cisco-8000.ini index 5d650b768418..ef1fcde7eac4 100644 --- a/platform/checkout/cisco-8000.ini +++ b/platform/checkout/cisco-8000.ini @@ -1,3 +1,3 @@ [module] repo=git@github.com:Cisco-8000-sonic/platform-cisco-8000.git -ref=202012-v0.2.5 +ref=202012-v0.2.6 From 3776ddb7c8fdeb6edba5ad2ac66d3656fd756e90 Mon Sep 17 00:00:00 2001 From: Zain Budhwani <99770260+zbud-msft@users.noreply.github.com> Date: Tue, 28 Feb 2023 15:56:54 -0800 Subject: [PATCH 05/20] Remove dialout as critical process (#14006) #### Why I did it Remove dialout as critical process as it is no longer used in prod. As part of future work, can remove dialout completely #### How I did it Remove from critical process list --- dockers/docker-sonic-telemetry/critical_processes | 1 - 1 file changed, 1 deletion(-) diff --git a/dockers/docker-sonic-telemetry/critical_processes b/dockers/docker-sonic-telemetry/critical_processes index 612a94d9edac..3baf6e268907 100644 --- a/dockers/docker-sonic-telemetry/critical_processes +++ b/dockers/docker-sonic-telemetry/critical_processes @@ -1,2 +1 @@ program:telemetry -program:dialout From be46225033e809b5c04b89e42a6115951892c325 Mon Sep 17 00:00:00 2001 From: Ikki Zhu <79439153+qnos@users.noreply.github.com> Date: Wed, 1 Mar 2023 14:35:53 +0800 Subject: [PATCH 06/20] [Seastone] fix dx010 qsfp eeprom data write issue (#13930) Why I did it Platform cases test_tx_disable, test_tx_disable_channel, test_power_override failed in dx010. How I did it Add i2c access algorithm for CPLD i2c adapters. How to verify it Verify it with platform_tests/api/test_sfp.py::TestSfpApi test cases. --- .../sonic_platform/sfp.py | 2 +- .../dx010/modules/dx010_cpld.c | 206 +++++++++++++++--- 2 files changed, 174 insertions(+), 34 deletions(-) diff --git a/device/celestica/x86_64-cel_seastone-r0/sonic_platform/sfp.py b/device/celestica/x86_64-cel_seastone-r0/sonic_platform/sfp.py index 3c14d7fb9a33..ff222d5599f8 100644 --- a/device/celestica/x86_64-cel_seastone-r0/sonic_platform/sfp.py +++ b/device/celestica/x86_64-cel_seastone-r0/sonic_platform/sfp.py @@ -1520,7 +1520,7 @@ def get_power_override(self): if dom_control_raw is not None: dom_control_data = sfpd_obj.parse_control_bytes( dom_control_raw, 0) - return ('On' == dom_control_data['data']['PowerOverride']) + return ('On' == dom_control_data['data']['PowerOverride']['value']) else: return False else: diff --git a/platform/broadcom/sonic-platform-modules-cel/dx010/modules/dx010_cpld.c b/platform/broadcom/sonic-platform-modules-cel/dx010/modules/dx010_cpld.c index d8142777c6e1..3cdfb3939558 100644 --- a/platform/broadcom/sonic-platform-modules-cel/dx010/modules/dx010_cpld.c +++ b/platform/broadcom/sonic-platform-modules-cel/dx010/modules/dx010_cpld.c @@ -1,7 +1,7 @@ /* * dx010_cpld.c - driver for SeaStone's CPLD * - * Copyright (C) 2017 Celestica Corp. + * Copyright (C) 2023 Celestica Corp. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -120,11 +120,11 @@ #define SSRR_ID_BANK2 0x296 #define SSRR_ID_BANK3 0x396 -#define HST_CNTL2_QUICK 0x00 -#define HST_CNTL2_BYTE 0x01 -#define HST_CNTL2_BYTE_DATA 0x02 -#define HST_CNTL2_WORD_DATA 0x03 -#define HST_CNTL2_BLOCK 0x05 +#define SSRR_MASTER_ERR 0x80 +#define SSRR_BUS_BUSY 0x40 + +#define I2C_BAUD_RATE_100K 0x40 + struct dx010_i2c_data { int portid; @@ -610,6 +610,166 @@ static int i2c_read_eeprom(struct i2c_adapter *a, u16 addr, return error; } + +/** + * Read/Write eeprom of CPLD connected QSFP device. + * @param a i2c adapter. + * @param addr address to read. + * @param new_data QSFP port number struct. + * @param rw read/write flag + * @param cmd i2c command. + * @param size access size + * @return 0 if not error, else the error code. + */ +static int dx010_cpld_i2c_access(struct i2c_adapter *a, u16 addr, + struct dx010_i2c_data *new_data, char rw, + u8 cmd, int size, union i2c_smbus_data *data) +{ + u32 reg; + int ioBase=0; + char byte; + char data_len = 0; + short temp; + short portid, opcode, devaddr, cmdbyte0, ssrr, writedata, readdata; + __u16 word_data; + __u8 byte_data; + int error = -EIO; + + mutex_lock(&cpld_data->cpld_lock); + + if (((new_data->portid >= PORT_BANK1_START) + && (new_data->portid <= PORT_BANK1_END)) + || (new_data->portid == PORT_SFPP1) + || (new_data->portid == PORT_SFPP2)) + { + portid = PORT_ID_BANK1; + opcode = OPCODE_ID_BANK1; + devaddr = DEVADDR_ID_BANK1; + cmdbyte0 = CMDBYT_ID_BANK1; + ssrr = SSRR_ID_BANK1; + writedata = WRITE_ID_BANK1; + readdata = READ_ID_BANK1; + }else if ((new_data->portid >= PORT_BANK2_START) && (new_data->portid <= PORT_BANK2_END)){ + portid = PORT_ID_BANK2; + opcode = OPCODE_ID_BANK2; + devaddr = DEVADDR_ID_BANK2; + cmdbyte0 = CMDBYT_ID_BANK2; + ssrr = SSRR_ID_BANK2; + writedata = WRITE_ID_BANK2; + readdata = READ_ID_BANK2; + }else if ((new_data->portid >= PORT_BANK3_START) && (new_data->portid <= PORT_BANK3_END)){ + portid = PORT_ID_BANK3; + opcode = OPCODE_ID_BANK3; + devaddr = DEVADDR_ID_BANK3; + cmdbyte0 = CMDBYT_ID_BANK3; + ssrr = SSRR_ID_BANK3; + writedata = WRITE_ID_BANK3; + readdata = READ_ID_BANK3; + }else{ + /* Invalid parameter! */ + error = -EINVAL; + goto exit; + } + + if (size == I2C_SMBUS_BYTE || size == I2C_SMBUS_BYTE_DATA) + data_len = 1; + else if (size == I2C_SMBUS_WORD_DATA) + data_len = 2; + else { + error = -EINVAL; + goto exit; + } + + while ((inb(ioBase + ssrr) & SSRR_BUS_BUSY)); + if ((inb(ioBase + ssrr) & SSRR_MASTER_ERR) == SSRR_MASTER_ERR) { + error = -EIO; + /* Read error reset the port */ + outb(0x00, ioBase + ssrr); + udelay(3000); + outb(0x01, ioBase + ssrr); + goto exit; + } + + byte = I2C_BAUD_RATE_100K + new_data->portid; + reg = cmd; + outb(byte, ioBase + portid); + outb(reg, ioBase + cmdbyte0); + byte = (data_len << 4) | 0x1; + outb(byte, ioBase + opcode); + addr = addr << 1; + if (rw == I2C_SMBUS_READ) + { + addr |= 0x01; + outb(addr, ioBase + devaddr); + while ((inb(ioBase + ssrr) & SSRR_BUS_BUSY)) + { + udelay(100); + } + + if ((inb(ioBase + ssrr) & SSRR_MASTER_ERR) == SSRR_MASTER_ERR) { + /* Read error reset the port */ + error = -EIO; + outb(0x00, ioBase + ssrr); + udelay(3000); + outb(0x01, ioBase + ssrr); + goto exit; + } + + temp = ioBase + readdata; + if (data_len == 1) + { + byte_data = inb(temp); + data->byte = byte_data; + } + else if (data_len == 2) + { + word_data = inb(temp); + word_data |= (inb(++temp) << 8); + data->word = word_data; + } + } + else // do i2c write + { + temp = ioBase + writedata; + if (data_len == 1) + { + byte_data = data->byte; + outb(byte_data, temp); + } + else if (data_len == 2) + { + word_data = data->word; + outb((word_data & 0xff), temp); + outb((word_data >> 4), (++temp)); + } + // write dev addr + outb(addr, ioBase + devaddr); + + // check bus access status + while ((inb(ioBase + ssrr) & SSRR_BUS_BUSY)) + { + udelay(100); + } + + if ((inb(ioBase + ssrr) & SSRR_MASTER_ERR) == SSRR_MASTER_ERR) { + /* Read error reset the port */ + error = -EIO; + outb(0x00, ioBase + ssrr); + udelay(3000); + outb(0x01, ioBase + ssrr); + goto exit; + } + } + + mutex_unlock(&cpld_data->cpld_lock); + return 0; + +exit: + mutex_unlock(&cpld_data->cpld_lock); + return error; +} + + static int dx010_i2c_access(struct i2c_adapter *a, u16 addr, unsigned short flags, char rw, u8 cmd, int size, union i2c_smbus_data *data) @@ -624,39 +784,19 @@ static int dx010_i2c_access(struct i2c_adapter *a, u16 addr, /* Map the size to what the chip understands */ switch (size) { - case I2C_SMBUS_QUICK: - size = HST_CNTL2_QUICK; - break; case I2C_SMBUS_BYTE: - size = HST_CNTL2_BYTE; - break; case I2C_SMBUS_BYTE_DATA: - size = HST_CNTL2_BYTE_DATA; - break; case I2C_SMBUS_WORD_DATA: - size = HST_CNTL2_WORD_DATA; - break; - case I2C_SMBUS_BLOCK_DATA: - size = HST_CNTL2_BLOCK; - break; - default: - dev_warn(&a->dev, "Unsupported transaction %d\n", size); - error = -EOPNOTSUPP; - goto Done; - } - - switch (size) { - case HST_CNTL2_BYTE: /* Result put in SMBHSTDAT0 */ - break; - case HST_CNTL2_BYTE_DATA: - break; - case HST_CNTL2_WORD_DATA: - if( 0 == i2c_read_eeprom(a,addr,new_data,cmd,data)){ + if(0 == dx010_cpld_i2c_access(a, addr, new_data, rw, cmd, size, data)){ error = 0; }else{ error = -EIO; } break; + default: + dev_warn(&a->dev, "Unsupported transaction %d\n", size); + error = -EOPNOTSUPP; + goto Done; } Done: @@ -790,6 +930,6 @@ module_init(cel_dx010_lpc_init); module_exit(cel_dx010_lpc_exit); MODULE_AUTHOR("Pradchaya P "); -MODULE_VERSION("1.0.1"); +MODULE_VERSION("1.0.2"); MODULE_DESCRIPTION("Celestica SeaStone DX010 LPC Driver"); -MODULE_LICENSE("GPL"); \ No newline at end of file +MODULE_LICENSE("GPL"); From 06be00525a7bc031ece9e1666d08351e798a433a Mon Sep 17 00:00:00 2001 From: mssonicbld <79238446+mssonicbld@users.noreply.github.com> Date: Sun, 5 Mar 2023 04:31:07 +0800 Subject: [PATCH 07/20] [ci/build]: Upgrade SONiC package versions (#14080) --- .../build-sonic-slave-buster/versions-deb-buster | 4 ++-- .../build/build-sonic-slave-buster/versions-git | 4 ++-- files/build/versions/default/versions-docker | 12 ++++++------ files/build/versions/default/versions-git | 6 +++--- files/build/versions/default/versions-web | 2 +- .../dockers/docker-syncd-mlnx/versions-deb-buster | 2 +- .../sonic-slave-buster/versions-deb-buster | 15 +++++++-------- .../dockers/sonic-slave-buster/versions-git | 2 +- .../dockers/sonic-slave-stretch/versions-git | 2 +- .../build/versions/host-image/versions-deb-buster | 6 +++--- files/build/versions/host-image/versions-py3 | 2 +- 11 files changed, 28 insertions(+), 29 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 b50fc2cab25f..240187a49344 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,7 +5,7 @@ innovium-sai==0.107.7 innovium-sai-headers==0.107.7 iproute2-dev==1.mlnx.4.5.3196 isc-dhcp-relay==4.4.1-2 -kernel-mft-dkms==4.18.0-106 +kernel-mft-dkms==4.21.0-100 libhiredis-dev==0.14.0-3~bpo9+1 libhiredis0.14==0.14.0-3~bpo9+1 libnl-cli-3-200==3.5.0-1 @@ -40,7 +40,7 @@ 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.18.0-106 +mft==4.21.0-100 python-swsscommon==1.0.0 python-thrift==0.11.0-4 python2-yang==1.0.73 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 30fbbea95c09..b3ec9dd33d5f 100644 --- a/files/build/versions/build/build-sonic-slave-buster/versions-git +++ b/files/build/versions/build/build-sonic-slave-buster/versions-git @@ -3,11 +3,11 @@ https://github.com/daveolson53/libnss-tacplus.git==19008ab68d9d504aa58eb34d5f564 https://github.com/jeroennijhof/pam_tacplus.git==7908a7faa0205beda9ea198bdd3aa37868be6da2 https://github.com/jpirko/libteam.git==61e27812c1074a865d7e1a778c0ce442837c28d7 https://github.com/Mellanox/libpsample.git==62bb27d9a49424e45191eee81df7ce0d8c74e774 -https://github.com/sflow/host-sflow==e026e2b57f3c7736a75cd1278f7867fb5e5006ee +https://github.com/sflow/host-sflow==b7d12c7fe18f2c4b2377f1b34c1e848d1a5ea16c https://github.com/sflow/sflowtool==8c914e79ecb7930adcba2e5296041c3f9eb8e450 https://github.com/thom311/libnl==cbafad9ddf24caef5230fef715d34f0539603be0 https://salsa.debian.org/debian/libteam.git==48142125234a665ad5367b724af36a58fb484d3d -https://salsa.debian.org/dhcp-team/isc-dhcp.git==1dca6def2766980a46540dd2d6c6765142966d9f +https://salsa.debian.org/dhcp-team/isc-dhcp.git==7a6f5a9d178439a56a8eb0cd4446329a8d5631ce https://salsa.debian.org/kernel-team/ethtool/==b24474c5f4cad2bb690ced33a3c7df397170a699 https://salsa.debian.org/kernel-team/initramfs-tools.git==40e544e13611c1b2690eb99a8096fc16c1b9c74e https://salsa.debian.org/sk-guest/monit.git==c9da7ebb1f35dfba17b50b5969a6e75e29cbec0d diff --git a/files/build/versions/default/versions-docker b/files/build/versions/default/versions-docker index 18e5f1f28729..fe8679513101 100644 --- a/files/build/versions/default/versions-docker +++ b/files/build/versions/default/versions-docker @@ -1,10 +1,10 @@ -amd64:amd64/debian:buster==sha256:b589ffbcc03bb272c9e0c0e699aedb2271a1ca65b2a3447057cbfd80d9eff9bf +amd64:amd64/debian:buster==sha256:c75d609d1d06a44ac87c52e9afe4102af856dd1c075f316b4d219f072af0b3b1 amd64:amd64/debian:stretch==sha256:16ee3e11da473f6565ef94a715f1a38b3079e0664913be78869c336a71cb6085 -amd64:debian:buster==sha256:233c3bbc892229c82da7231980d50adceba4db56a08c0b7053a4852782703459 +amd64:debian:buster==sha256:2d356e1e22c0902f88ef65cb7159ecd5a96feb62345747edfd4324b0d83a2923 amd64:debian:stretch==sha256:c5c5200ff1e9c73ffbf188b4a67eb1c91531b644856b4aefe86a58d2f0cb05be -arm64:arm64v8/debian:buster==sha256:88d3e537769c4ef5bc7961ad5460739dacb29d266d178e6f9befbe900afeb9b9 -arm64:debian:buster==sha256:233c3bbc892229c82da7231980d50adceba4db56a08c0b7053a4852782703459 +arm64:arm64v8/debian:buster==sha256:0100d882223b08bc979db07977fd493163c545abcac553086bba75a96aebe0bd +arm64:debian:buster==sha256:2d356e1e22c0902f88ef65cb7159ecd5a96feb62345747edfd4324b0d83a2923 arm64:debian:stretch==sha256:c5c5200ff1e9c73ffbf188b4a67eb1c91531b644856b4aefe86a58d2f0cb05be -armhf:arm32v7/debian:buster==sha256:d0a16ffa3bc4302a306263e5abffe04d0340ea964e0e037afef17a3e9765b48a -armhf:debian:buster==sha256:233c3bbc892229c82da7231980d50adceba4db56a08c0b7053a4852782703459 +armhf:arm32v7/debian:buster==sha256:43b845d5864322e89773a602535f5db85debe3356e50488c63dd99bf2cc16899 +armhf:debian:buster==sha256:2d356e1e22c0902f88ef65cb7159ecd5a96feb62345747edfd4324b0d83a2923 armhf:debian:stretch==sha256:c5c5200ff1e9c73ffbf188b4a67eb1c91531b644856b4aefe86a58d2f0cb05be \ No newline at end of file diff --git a/files/build/versions/default/versions-git b/files/build/versions/default/versions-git index b05e34f9c2ff..8983c0a4dfbb 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==9144b67c7f037577516ebdfe220997560bd01e14 +https://chromium.googlesource.com/chromium/tools/depot_tools.git==c962e86f7bafddfc582922dec44cf7a843228abb https://github.com/aristanetworks/swi-tools.git==b5f087e4774168bf536360d43c9c509c8f14ad9f https://github.com/CESNET/libyang.git==d57c8888922d1663508ad0f0a5b66f8ad600276d https://github.com/daveolson53/libnss-tacplus.git==19008ab68d9d504aa58eb34d5f564755a1613b8b @@ -9,11 +9,11 @@ https://github.com/lguohan/gnxi.git==f2b11e45b16ab13485ae14933f30c18ee6336499 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==e026e2b57f3c7736a75cd1278f7867fb5e5006ee +https://github.com/sflow/host-sflow==b7d12c7fe18f2c4b2377f1b34c1e848d1a5ea16c https://github.com/sflow/sflowtool==8c914e79ecb7930adcba2e5296041c3f9eb8e450 https://github.com/thom311/libnl==cbafad9ddf24caef5230fef715d34f0539603be0 https://salsa.debian.org/debian/libteam.git==48142125234a665ad5367b724af36a58fb484d3d -https://salsa.debian.org/dhcp-team/isc-dhcp.git==1dca6def2766980a46540dd2d6c6765142966d9f +https://salsa.debian.org/dhcp-team/isc-dhcp.git==7a6f5a9d178439a56a8eb0cd4446329a8d5631ce https://salsa.debian.org/kernel-team/ethtool/==b24474c5f4cad2bb690ced33a3c7df397170a699 https://salsa.debian.org/kernel-team/initramfs-tools.git==40e544e13611c1b2690eb99a8096fc16c1b9c74e https://salsa.debian.org/sk-guest/monit.git==c9da7ebb1f35dfba17b50b5969a6e75e29cbec0d diff --git a/files/build/versions/default/versions-web b/files/build/versions/default/versions-web index e9cbe57caf53..1e3b4714099c 100644 --- a/files/build/versions/default/versions-web +++ b/files/build/versions/default/versions-web @@ -14,7 +14,7 @@ http://deb.debian.org/debian/pool/main/n/ntp/ntp_4.2.8p12+dfsg.orig.tar.xz==7104 http://http.debian.net/debian/pool/main/h/hiredis/hiredis_0.14.0-3~bpo9+1.debian.tar.xz==ef340aedc6fd42c549cd503bffb498b2 http://http.debian.net/debian/pool/main/h/hiredis/hiredis_0.14.0-3~bpo9+1.dsc==be4ce11ef67268e59e4b6be587327c40 http://http.debian.net/debian/pool/main/h/hiredis/hiredis_0.14.0.orig.tar.gz==6d565680a4af0d2e261abbc3e3431b2b -http://www.mellanox.com/downloads/MFT/mft-4.18.0-106-x86_64-deb.tgz==83d169e43bc9fea43fa0d69a4f8c1398 +http://www.mellanox.com/downloads/MFT/mft-4.21.0-100-x86_64-deb.tgz==51efe115cbada1120fefe7e4c6958baf https://bootstrap.pypa.io/pip/2.7/get-pip.py==60e8267eb1b7bc71dc4843eb7bd294d3 https://deb.nodesource.com/gpgkey/nodesource.gpg.key==003b51a89a133b5db4cca98b2dea3117 https://deb.nodesource.com/node_10.x/dists/stretch/Release==22738118af583db3bfad39d6fcb4fa5a 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 0ba99a2e490c..410b6546b780 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 @@ libswsscommon-dbg==1.0.0 libunwind8==1.2.1-10~deb10u1 libxml2==2.9.4+dfsg1-7+deb10u5 linux-libc-dev==4.19.269-1 -mft==4.18.0-106 +mft==4.21.0-100 mlnx-sai==1.mlnx.SAIRel1.22.0.0 openssh-client==1:7.9p1-10+deb10u2 python==2.7.16-1 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 2c4d8dde3db8..a14b1ede742c 100644 --- a/files/build/versions/dockers/sonic-slave-buster/versions-deb-buster +++ b/files/build/versions/dockers/sonic-slave-buster/versions-deb-buster @@ -557,7 +557,6 @@ libgmpxx4ldbl==2:6.1.2+dfsg-4+deb10u1 libgnutls-dane0==3.6.7-4+deb10u10 libgnutls-openssl27==3.6.7-4+deb10u10 libgnutls28-dev==3.6.7-4+deb10u10 -libgnutls30==3.6.7-4+deb10u10 libgnutlsxx28==3.6.7-4+deb10u10 libgomp1==8.3.0-6 libgoogle-perftools4==2.7-1 @@ -1402,13 +1401,13 @@ php-token-stream==3.0.1-1 php-tokenizer==1.1.0-1 php-webmozart-assert==1.4.0-3 php-xml==2:7.3+69 -php7.3-cli==7.3.31-1~deb10u2 -php7.3-common==7.3.31-1~deb10u2 -php7.3-json==7.3.31-1~deb10u2 -php7.3-mbstring==7.3.31-1~deb10u2 -php7.3-opcache==7.3.31-1~deb10u2 -php7.3-readline==7.3.31-1~deb10u2 -php7.3-xml==7.3.31-1~deb10u2 +php7.3-cli==7.3.31-1~deb10u3 +php7.3-common==7.3.31-1~deb10u3 +php7.3-json==7.3.31-1~deb10u3 +php7.3-mbstring==7.3.31-1~deb10u3 +php7.3-opcache==7.3.31-1~deb10u3 +php7.3-readline==7.3.31-1~deb10u3 +php7.3-xml==7.3.31-1~deb10u3 phpunit==7.5.6-1 phpunit-code-unit-reverse-lookup==1.0.1-1 phpunit-comparator==3.0.2-1 diff --git a/files/build/versions/dockers/sonic-slave-buster/versions-git b/files/build/versions/dockers/sonic-slave-buster/versions-git index 4a6d033a52cd..6b1844bf466f 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==9144b67c7f037577516ebdfe220997560bd01e14 +https://chromium.googlesource.com/chromium/tools/depot_tools.git==c962e86f7bafddfc582922dec44cf7a843228abb 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 4a6d033a52cd..6b1844bf466f 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==9144b67c7f037577516ebdfe220997560bd01e14 +https://chromium.googlesource.com/chromium/tools/depot_tools.git==c962e86f7bafddfc582922dec44cf7a843228abb https://github.com/aristanetworks/swi-tools.git==b5f087e4774168bf536360d43c9c509c8f14ad9f \ 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 e474032f1704..d7ba2b9856b2 100644 --- a/files/build/versions/host-image/versions-deb-buster +++ b/files/build/versions/host-image/versions-deb-buster @@ -77,7 +77,7 @@ isc-dhcp-client==4.4.1-2+deb10u3 iso-codes==4.2-1 jq==1.5+dfsg-2+b1 kdump-tools==1:1.6.1-1 -kernel-mft-dkms-modules-4.19.0-12-2-amd64==4.18.0 +kernel-mft-dkms-modules-4.19.0-12-2-amd64==4.21.0 kexec-tools==1:2.0.18-1 klibc-utils==2.0.6-1+deb10u1 kmod==26-1 @@ -240,8 +240,8 @@ lsb-release==10.2019051400 make==4.2.1-1.2 makedev==2.3.1-94 makedumpfile==1:1.6.5-1 -mft==4.18.0-106 -mft-oem==4.18.0-106 +mft==4.21.0-100 +mft-oem==4.21.0-100 mime-support==3.62 monit==1:5.20.0-6 mtd-utils==1:2.0.1-1 diff --git a/files/build/versions/host-image/versions-py3 b/files/build/versions/host-image/versions-py3 index 20d5d9fdf172..6cf705cd50b5 100644 --- a/files/build/versions/host-image/versions-py3 +++ b/files/build/versions/host-image/versions-py3 @@ -6,7 +6,7 @@ certifi==2022.12.7 cffi==1.15.1 charset-normalizer==3.0.1 click==7.0 -cryptography==39.0.1 +cryptography==39.0.2 docker==4.3.1 idna==3.4 ijson==2.6.1 From 280939b5c9aabf2ff4207a687c4290a724947d08 Mon Sep 17 00:00:00 2001 From: xumia <59720581+xumia@users.noreply.github.com> Date: Fri, 3 Mar 2023 15:21:10 +0800 Subject: [PATCH 08/20] [Build] Support to use loosen version when failed to install python packages (#14013) Why I did it [Build] Support to use loosen version when failed to install python packages It is to fix the issue #14012 How I did it Try to use the installation command without constraint How to verify it --- src/sonic-build-hooks/scripts/buildinfo_base.sh | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/sonic-build-hooks/scripts/buildinfo_base.sh b/src/sonic-build-hooks/scripts/buildinfo_base.sh index 712c43baa3bc..4c94eaf0aa4e 100755 --- a/src/sonic-build-hooks/scripts/buildinfo_base.sh +++ b/src/sonic-build-hooks/scripts/buildinfo_base.sh @@ -183,6 +183,11 @@ run_pip_command() $REAL_COMMAND "${parameters[@]}" local result=$? + if [ "$result" != 0 ]; then + echo "Failed to run the command with constraint, try to install with the original command" 1>&2 + $REAL_COMMAND "$@" + result=$? + fi rm $tmp_version_file return $result } From 2ca6ec484ef6f991b485bce7073275df05911270 Mon Sep 17 00:00:00 2001 From: xumia <59720581+xumia@users.noreply.github.com> Date: Tue, 7 Mar 2023 17:43:46 +0800 Subject: [PATCH 09/20] [202012][Security][CVE-2022-2309] Upgrade lxml from 4.6.5 to 4.9.1 (#14066) Why I did it Fix CVE-2022-2309, upgrade lxml from 4.6.3 to 4.9.1 --- src/sonic-config-engine/setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/sonic-config-engine/setup.py b/src/sonic-config-engine/setup.py index 9b4f2cb51160..ea5b0853fab0 100644 --- a/src/sonic-config-engine/setup.py +++ b/src/sonic-config-engine/setup.py @@ -7,7 +7,7 @@ dependencies = [ 'bitarray==1.5.3', 'ipaddress==1.0.23', - 'lxml==4.6.3', + 'lxml==4.9.1', 'netaddr==0.8.0', 'pyyaml==5.4.1', 'sonic-py-common', From 481f51f45c913527f7c2d1e6d5a5b6ad2d1ae1bc Mon Sep 17 00:00:00 2001 From: SuvarnaMeenakshi <50386592+SuvarnaMeenakshi@users.noreply.github.com> Date: Tue, 7 Mar 2023 11:16:19 -0800 Subject: [PATCH 10/20] [202012][sonic-snmpagent]: Advance submodule (#14111) #### Why I did it Update sonic-snmpagent submodule to include below commit: fba50c6 [202012]: snmp vlan support per RFC1213 and added the missing support for RFC2863 (#279) --- src/sonic-snmpagent | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/sonic-snmpagent b/src/sonic-snmpagent index 7147354e08d6..fba50c65b00a 160000 --- a/src/sonic-snmpagent +++ b/src/sonic-snmpagent @@ -1 +1 @@ -Subproject commit 7147354e08d6ee225b96fdf37d2523dacab2736f +Subproject commit fba50c65b00a5662197d6d37c06308e82356e3ea From 545b526a49493be87f23d3b4712281546b05eb48 Mon Sep 17 00:00:00 2001 From: Sudharsan Dhamal Gopalarathnam Date: Wed, 8 Mar 2023 14:04:09 -0800 Subject: [PATCH 11/20] [202012][mellanox]Fix lpmode set when logical port is larger than 64 (#14137) This PR is to backport #14138 to 202012. - Why I did it In sfplpm API, the number of logical ports is hardcoded as 64. When a system contains more port than this, the SDK APIs would fail with a trace as below Enabling low-power mode for port Ethernet0... Traceback (most recent call last): File "/usr/share/sonic/platform/plugins/sfplpmset.py", line 167, in set_lpmode(handle, cmd, sfp_module) File "/usr/share/sonic/platform/plugins/sfplpmset.py", line 128, in set_lpmode SX_MGMT_PHY_MOD_PWR_ATTR_PWR_MODE_E, SX_MGMT_PHY_MOD_PWR_MODE_LOW_E) File "/usr/share/sonic/platform/plugins/sfplpmset.py", line 115, in pwr_attr_set mgmt_phy_mod_pwr_attr_set(handle, module_id, attr_type, power_mode) File "/usr/share/sonic/platform/plugins/sfplpmset.py", line 84, in mgmt_phy_mod_pwr_attr_set assert SX_STATUS_SUCCESS == rc, "sx_mgmt_phy_mod_pwr_attr_set failed" AssertionError: sx_mgmt_phy_mod_pwr_attr_set failed Error! Unable to set LPM for 1, rc = 1, err msg: [+] opening sdk Mar 07 03:25:28 INFO LOG: Initializing SX log with STDOUT as output file. Mar 07 03:25:28 ERROR SX_API_PORT: sx_mgmt_phy_mod_pwr_attr_get: This API is deprecated and will be removed in the future. Please use sx_mgmt_phy_module_pwr_attr_get in its place. Mar 07 03:25:28 ERROR SX_API_PORT: sx_mgmt_phy_mod_pwr_attr_set: This API is deprecated and will be removed in the future. Please use sx_mgmt_phy_module_pwr_attr_set in its place. - How I did it Remove the hardcoded value of 64. Obtained the number of logical ports from SDK - How to verify it Manual testing --- .../mellanox/x86_64-mlnx_msn2700-r0/plugins/sfplpmset.py | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/device/mellanox/x86_64-mlnx_msn2700-r0/plugins/sfplpmset.py b/device/mellanox/x86_64-mlnx_msn2700-r0/plugins/sfplpmset.py index 61423880ac71..b0b2d5a2c9c4 100644 --- a/device/mellanox/x86_64-mlnx_msn2700-r0/plugins/sfplpmset.py +++ b/device/mellanox/x86_64-mlnx_msn2700-r0/plugins/sfplpmset.py @@ -11,7 +11,6 @@ DEVICE_ID = 1 SWITCH_ID = 0 -SX_PORT_ATTR_ARR_SIZE = 64 PORT_TYPE_CPU = 4 PORT_TYPE_NVE = 8 @@ -51,9 +50,13 @@ def set_port_admin_status_by_log_port(handle, log_port, admin_status): def get_log_ports(handle, sfp_module): - port_attributes_list = new_sx_port_attributes_t_arr(SX_PORT_ATTR_ARR_SIZE) port_cnt_p = new_uint32_t_p() - uint32_t_p_assign(port_cnt_p, SX_PORT_ATTR_ARR_SIZE) + uint32_t_p_assign(port_cnt_p, 0) + rc = sx_api_port_device_get(handle, DEVICE_ID, SWITCH_ID, None, port_cnt_p) + + assert rc == SX_STATUS_SUCCESS, "sx_api_port_device_get failed, rc = %d" % rc + port_cnt = uint32_t_p_value(port_cnt_p) + port_attributes_list = new_sx_port_attributes_t_arr(port_cnt) rc = sx_api_port_device_get(handle, DEVICE_ID, SWITCH_ID, port_attributes_list, port_cnt_p) assert rc == SX_STATUS_SUCCESS, "sx_api_port_device_get failed, rc = %d" % rc From 6f949226d122319022c9f857eba41d53f99241cb Mon Sep 17 00:00:00 2001 From: prabhataravind <108555774+prabhataravind@users.noreply.github.com> Date: Wed, 8 Mar 2023 14:35:29 -0800 Subject: [PATCH 12/20] [202012][swss]: Submodule update (#14171) * Include the following commits: - a21b160 [202012][orchagent]: Handle duplicate routes in a graceful manner (#2666) - 1540161 [bfdorch] add default TOS value for BFD packet (#2692) - 860430c [ci] run apt-get update before apt-get install (#2686) --- src/sonic-swss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/sonic-swss b/src/sonic-swss index 0d95f076b5b4..a21b16041ef9 160000 --- a/src/sonic-swss +++ b/src/sonic-swss @@ -1 +1 @@ -Subproject commit 0d95f076b5b4e444eb8ea0a63b8ff4d883762440 +Subproject commit a21b16041ef9f5b0c559421e4e5e8279ff42a645 From f0c1ef0abce122645610c856a02052b10454e58b Mon Sep 17 00:00:00 2001 From: "Marty Y. Lok" <76118573+mlok-nokia@users.noreply.github.com> Date: Wed, 8 Mar 2023 18:27:49 -0500 Subject: [PATCH 13/20] [marvell-armhf][uboot] Fixed the uboot setting for sonic-installer set-default form 202012 to 202205 branch. (#13911) #### Why I did it When using ```sonic-install set-default``` to switch the image from 202012 to 202205. The system will be stuck at loading kernel while reboot. #### How I did it The issue is caused by the kernal size related setting in uboot environment is smaller in the 202012 branch while they are larger in 202205 branch. The "sonic-installer set-default" just changes the boot_next variable. To fix this issue, we sync up the 202012 branch kernel related setting with the 202205 branch. This PR is only applicable to 202012 branch. #### How to verify it 1) Install the latest 202205 image .89 or latest and reboot 2) Install the 202012 image which contains this fix and reboot 3) using "sonic-installer set-default 202205 image and reboot 4) system should start without any issue. #### Ensure to add label/tag for the feature raised. example - PR#2174 under sonic-utilities repo. where, Generic Config and Update feature has been labelled as GCU. --- platform/marvell-armhf/platform.conf | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/platform/marvell-armhf/platform.conf b/platform/marvell-armhf/platform.conf index 23a191adf7b2..ddc603490dbc 100644 --- a/platform/marvell-armhf/platform.conf +++ b/platform/marvell-armhf/platform.conf @@ -6,9 +6,9 @@ echo "Preparing for installation ... " # global defines kernel_addr=0x1100000 -fdt_addr=0x1000000 -fdt_high=0x10fffff -initrd_addr=0x2000000 +fdt_addr=0x2800000 +fdt_high=0x28fffff +initrd_addr=0x2900000 kernel_fname="/boot/vmlinuz-4.19.0-12-2-armmp" initrd_fname="/boot/initrd.img-4.19.0-12-2-armmp" @@ -175,7 +175,7 @@ prepare_boot_menu() { BOOT3='echo " > Boot3: ONIE - run onie_nand_boot";echo;' fi BORDER='echo "---------------------------------------------------";echo;' - fw_setenv ${FW_ARG} print_menu $BORDER $BOOT1 $BOOT2 $BOOT3 $BORDER > /dev/null + fw_setenv ${FW_ARG} print_menu "$BORDER $BOOT1 $BOOT2 $BOOT3 $BORDER" > /dev/null fw_setenv ${FW_ARG} linuxargs "net.ifnames=0 loopfstype=squashfs loop=$image_dir/$FILESYSTEM_SQUASHFS systemd.unified_cgroup_hierarchy=0 varlog_size=$VAR_LOG_SIZE loglevel=4" > /dev/null fw_setenv ${FW_ARG} linuxargs_old "net.ifnames=0 loopfstype=squashfs loop=$image_dir_old/$FILESYSTEM_SQUASHFS systemd.unified_cgroup_hierarchy=0 varlog_size=$VAR_LOG_SIZE loglevel=4" > /dev/null From 9e7b038d9cd175d15cd982fc9c26e0ba315f8406 Mon Sep 17 00:00:00 2001 From: Ashwin Srinivasan <93744978+assrinivasan@users.noreply.github.com> Date: Wed, 8 Mar 2023 17:32:41 -0800 Subject: [PATCH 14/20] [202012] Added libpci and pciutils to the pmon docker (#12684) (#14056) #### Why I did it This is part of a corresponding change to the pcie daemon that enables it to verify PCI peripherals on a platform against a preconfigured YAML file, and enables the pcied daemon to call the system commands needed for PCI peripheral verification #### How I did it Adding aforementioned libraries to the Dockerfile.j2 file #### How to verify it run 'which setpci' from the pmon docker - would show the path of the binary #### Description for the changelog Modified pmon's Dockerfile.j2 to include pciutils and libpci libraries. **cherry-pick of SHA: 7de04504c9518d68aa00c304b7376fdff4e1d318** --- dockers/docker-platform-monitor/Dockerfile.j2 | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/dockers/docker-platform-monitor/Dockerfile.j2 b/dockers/docker-platform-monitor/Dockerfile.j2 index d8988b8f6ebe..2c144cfc55d3 100755 --- a/dockers/docker-platform-monitor/Dockerfile.j2 +++ b/dockers/docker-platform-monitor/Dockerfile.j2 @@ -26,7 +26,8 @@ RUN apt-get update && \ i2c-tools \ psmisc \ python3-jsonschema \ - libpci3 + libpci3 \ + pciutils # TODO: Remove these lines once we no longer need Python 2 RUN apt-get install -f -y python-dev python-pip @@ -48,6 +49,10 @@ RUN pip2 install enum34 RUN pip2 install thrift==0.13.0 RUN pip3 install thrift==0.13.0 +# We install the libpci module in order to be able to do PCI transactions +RUN pip2 install libpci +RUN pip3 install libpci + {% if docker_platform_monitor_debs.strip() -%} # Copy locally-built Debian package dependencies {{ copy_files("debs/", docker_platform_monitor_debs.split(' '), "/debs/") }} From 9de3b4936b8e1728267a8116451b2d3ddfd168e8 Mon Sep 17 00:00:00 2001 From: Samuel Angebault Date: Mon, 13 Mar 2023 13:23:31 -0700 Subject: [PATCH 15/20] Add comment with affected products (#13803) #### Why I did it Some products might experience an occasional IO failure in the communication between CPU and SSD. Based on some research it could be attributable to some device not handling ATA NCQ (Native Command Queue). This issue currently affect 4 products: - `DCS-7170-32C*` - `DCS-7170-64C` - `DCS-7060DX4-32` - `DCS-7260CX3-64` #### How I did it This change disable NCQ on the affected drive for a small set of products. #### How to verify it When the fix is applied, these 2 patterns can be found in the dmesg. `ata1.00: FORCE: horkage modified (noncq)` `NCQ (not used)` Test results using: `fio --direct=1 --rw=randrw --bs=64k --ioengine=libaio --iodepth=64 --runtime=120 --numjobs=4` with NCQ (`ata1.00: 61865984 sectors, multi 1: LBA48 NCQ (depth 32), AA`) ``` READ: bw=33.9MiB/s (35.6MB/s), 33.9MiB/s-33.9MiB/s (35.6MB/s-35.6MB/s), io=4073MiB (4270MB), run=120078-120078msec WRITE: bw=34.1MiB/s (35.8MB/s), 34.1MiB/s-34.1MiB/s (35.8MB/s-35.8MB/s), io=4100MiB (4300MB), run=120078-120078msec ``` without NCQ (`ata1.00: 61865984 sectors, multi 1: LBA48 NCQ (not used)`) ``` READ: bw=31.7MiB/s (33.3MB/s), 31.7MiB/s-31.7MiB/s (33.3MB/s-33.3MB/s), io=3808MiB (3993MB), run=120083-120083msec WRITE: bw=31.9MiB/s (33.4MB/s), 31.9MiB/s-31.9MiB/s (33.4MB/s-33.4MB/s), io=3830MiB (4016MB), run=120083-120083msec ``` #### Description for the changelog Disable ATA NCQ for a few Arista products From 18d049082e53ce9a345127e83b221953d448289f Mon Sep 17 00:00:00 2001 From: xumia <59720581+xumia@users.noreply.github.com> Date: Tue, 14 Mar 2023 08:00:29 +0800 Subject: [PATCH 16/20] [ci/build]: Upgrade SONiC package versions (#14205) Why I did it [ci/build]: Upgrade SONiC package versions How I did it How to verify it --- .../versions/build/build-sonic-slave-buster/versions-git | 4 ++-- .../build/build-sonic-slave-buster/versions-py2-all-arm64 | 2 +- .../versions/build/build-sonic-slave-buster/versions-py3 | 2 +- .../build/build-sonic-slave-buster/versions-py3-all-arm64 | 2 +- files/build/versions/default/versions-git | 6 +++--- .../dockers/docker-config-engine-buster/versions-py3 | 2 +- .../dockers/docker-config-engine-stretch/versions-py2 | 2 +- .../dockers/docker-platform-monitor/versions-deb-buster | 1 + .../versions/dockers/docker-platform-monitor/versions-py2 | 4 +++- .../versions/dockers/docker-platform-monitor/versions-py3 | 2 ++ .../dockers/docker-sonic-mgmt-framework/versions-py3 | 4 ++-- files/build/versions/dockers/docker-sonic-vs/versions-py3 | 2 +- .../versions/dockers/sonic-slave-buster/versions-deb-buster | 2 +- .../build/versions/dockers/sonic-slave-buster/versions-git | 2 +- .../build/versions/dockers/sonic-slave-stretch/versions-git | 2 +- files/build/versions/host-image/versions-py2 | 2 +- files/build/versions/host-image/versions-py3 | 4 ++-- 17 files changed, 25 insertions(+), 20 deletions(-) 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 b3ec9dd33d5f..b2525ffced3e 100644 --- a/files/build/versions/build/build-sonic-slave-buster/versions-git +++ b/files/build/versions/build/build-sonic-slave-buster/versions-git @@ -3,12 +3,12 @@ https://github.com/daveolson53/libnss-tacplus.git==19008ab68d9d504aa58eb34d5f564 https://github.com/jeroennijhof/pam_tacplus.git==7908a7faa0205beda9ea198bdd3aa37868be6da2 https://github.com/jpirko/libteam.git==61e27812c1074a865d7e1a778c0ce442837c28d7 https://github.com/Mellanox/libpsample.git==62bb27d9a49424e45191eee81df7ce0d8c74e774 -https://github.com/sflow/host-sflow==b7d12c7fe18f2c4b2377f1b34c1e848d1a5ea16c +https://github.com/sflow/host-sflow==f1ffaa93b5ef2221ca7299e6db953917fba03b40 https://github.com/sflow/sflowtool==8c914e79ecb7930adcba2e5296041c3f9eb8e450 https://github.com/thom311/libnl==cbafad9ddf24caef5230fef715d34f0539603be0 https://salsa.debian.org/debian/libteam.git==48142125234a665ad5367b724af36a58fb484d3d https://salsa.debian.org/dhcp-team/isc-dhcp.git==7a6f5a9d178439a56a8eb0cd4446329a8d5631ce -https://salsa.debian.org/kernel-team/ethtool/==b24474c5f4cad2bb690ced33a3c7df397170a699 +https://salsa.debian.org/kernel-team/ethtool/==68409b09a969b49a07fbf3930409f155b953434b 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==48770216530d8a0a57f5f1d7cc60addd67d1b549 \ No newline at end of file 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 index 8492dcc26744..c7b43db04ec2 100644 --- 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 @@ -1,2 +1,2 @@ ipaddress==1.0.23 -lxml==4.6.3 \ No newline at end of file +lxml==4.9.1 \ 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 7e940600fc67..41bda4e47e42 100644 --- a/files/build/versions/build/build-sonic-slave-buster/versions-py3 +++ b/files/build/versions/build/build-sonic-slave-buster/versions-py3 @@ -1,4 +1,4 @@ -charset-normalizer==3.0.1 +charset-normalizer==3.1.0 click==7.0 docker==6.0.1 ijson==2.6.1 diff --git a/files/build/versions/build/build-sonic-slave-buster/versions-py3-all-arm64 b/files/build/versions/build/build-sonic-slave-buster/versions-py3-all-arm64 index 949c3055bf13..5b4fcbd1590a 100644 --- a/files/build/versions/build/build-sonic-slave-buster/versions-py3-all-arm64 +++ b/files/build/versions/build/build-sonic-slave-buster/versions-py3-all-arm64 @@ -1,4 +1,4 @@ bitarray==1.5.3 -lxml==4.6.3 +lxml==4.9.1 requests==2.28.2 urllib3==1.26.14 \ No newline at end of file diff --git a/files/build/versions/default/versions-git b/files/build/versions/default/versions-git index 8983c0a4dfbb..2098babd013a 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==c962e86f7bafddfc582922dec44cf7a843228abb +https://chromium.googlesource.com/chromium/tools/depot_tools.git==a9a7eecf37db6f89d4e5793826898e171b014e08 https://github.com/aristanetworks/swi-tools.git==b5f087e4774168bf536360d43c9c509c8f14ad9f https://github.com/CESNET/libyang.git==d57c8888922d1663508ad0f0a5b66f8ad600276d https://github.com/daveolson53/libnss-tacplus.git==19008ab68d9d504aa58eb34d5f564755a1613b8b @@ -9,12 +9,12 @@ https://github.com/lguohan/gnxi.git==f2b11e45b16ab13485ae14933f30c18ee6336499 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==b7d12c7fe18f2c4b2377f1b34c1e848d1a5ea16c +https://github.com/sflow/host-sflow==f1ffaa93b5ef2221ca7299e6db953917fba03b40 https://github.com/sflow/sflowtool==8c914e79ecb7930adcba2e5296041c3f9eb8e450 https://github.com/thom311/libnl==cbafad9ddf24caef5230fef715d34f0539603be0 https://salsa.debian.org/debian/libteam.git==48142125234a665ad5367b724af36a58fb484d3d https://salsa.debian.org/dhcp-team/isc-dhcp.git==7a6f5a9d178439a56a8eb0cd4446329a8d5631ce -https://salsa.debian.org/kernel-team/ethtool/==b24474c5f4cad2bb690ced33a3c7df397170a699 +https://salsa.debian.org/kernel-team/ethtool/==68409b09a969b49a07fbf3930409f155b953434b 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==48770216530d8a0a57f5f1d7cc60addd67d1b549 \ No newline at end of file diff --git a/files/build/versions/dockers/docker-config-engine-buster/versions-py3 b/files/build/versions/dockers/docker-config-engine-buster/versions-py3 index fb011461608f..faad4632051e 100644 --- a/files/build/versions/dockers/docker-config-engine-buster/versions-py3 +++ b/files/build/versions/dockers/docker-config-engine-buster/versions-py3 @@ -1,6 +1,6 @@ bitarray==1.5.3 ipaddress==1.0.23 -lxml==4.6.3 +lxml==4.9.1 natsort==6.2.1 netaddr==0.8.0 pyang==2.5.3 diff --git a/files/build/versions/dockers/docker-config-engine-stretch/versions-py2 b/files/build/versions/dockers/docker-config-engine-stretch/versions-py2 index ad70857eef4a..9092f9c71ce4 100644 --- a/files/build/versions/dockers/docker-config-engine-stretch/versions-py2 +++ b/files/build/versions/dockers/docker-config-engine-stretch/versions-py2 @@ -3,7 +3,7 @@ contextlib2==0.6.0.post1 future==0.18.3 importlib-resources==3.3.1 ipaddress==1.0.23 -lxml==4.6.3 +lxml==4.9.1 natsort==6.2.1 netaddr==0.8.0 pathlib2==2.3.7.post1 diff --git a/files/build/versions/dockers/docker-platform-monitor/versions-deb-buster b/files/build/versions/dockers/docker-platform-monitor/versions-deb-buster index 031e96ee644b..2c3e6fdecb38 100644 --- a/files/build/versions/dockers/docker-platform-monitor/versions-deb-buster +++ b/files/build/versions/dockers/docker-platform-monitor/versions-deb-buster @@ -102,6 +102,7 @@ lm-sensors-dbgsym==1:3.5.0-3 make==4.2.1-1.2 openssh-client==1:7.9p1-10+deb10u2 patch==2.7.6-3+deb10u1 +pciutils==1:3.5.2-1 psmisc==23.2-1+deb10u1 python==2.7.16-1 python-dev==2.7.16-1 diff --git a/files/build/versions/dockers/docker-platform-monitor/versions-py2 b/files/build/versions/dockers/docker-platform-monitor/versions-py2 index 61c36312f823..ce6b78c718ae 100644 --- a/files/build/versions/dockers/docker-platform-monitor/versions-py2 +++ b/files/build/versions/dockers/docker-platform-monitor/versions-py2 @@ -3,11 +3,13 @@ contextlib2==0.6.0.post1 enum34==1.1.10 functools32==3.2.3.post2 future==0.18.3 +guacamole==0.9.2 importlib-resources==3.3.1 ipaddress==1.0.23 jinja2==2.11.3 jsonschema==2.6.0 -lxml==4.6.3 +libpci==0.2 +lxml==4.9.1 markupsafe==1.1.1 natsort==6.2.1 netaddr==0.8.0 diff --git a/files/build/versions/dockers/docker-platform-monitor/versions-py3 b/files/build/versions/dockers/docker-platform-monitor/versions-py3 index f2debc6aefc2..c36f28d012b1 100644 --- a/files/build/versions/dockers/docker-platform-monitor/versions-py3 +++ b/files/build/versions/dockers/docker-platform-monitor/versions-py3 @@ -1,3 +1,5 @@ +guacamole==0.9.2 jsonschema==2.6.0 +libpci==0.2 python_sdk_api==4.5.3196 thrift==0.13.0 \ 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 e53395334666..3333ef049b81 100644 --- a/files/build/versions/dockers/docker-sonic-mgmt-framework/versions-py3 +++ b/files/build/versions/dockers/docker-sonic-mgmt-framework/versions-py3 @@ -1,6 +1,6 @@ attrs==22.2.0 certifi==2017.4.17 -charset-normalizer==3.0.1 +charset-normalizer==3.1.0 click==8.1.3 clickclick==20.10.2 connexion==2.7.0 @@ -19,7 +19,7 @@ openapi-schema-validator==0.4.3 openapi-spec-validator==0.5.5 pathable==0.4.3 pkgutil_resolve_name==1.3.10 -protobuf==4.22.0 +protobuf==4.22.1 pyrsistent==0.19.3 python-dateutil==2.6.0 requests==2.28.2 diff --git a/files/build/versions/dockers/docker-sonic-vs/versions-py3 b/files/build/versions/dockers/docker-sonic-vs/versions-py3 index 4156fc6f5b33..520d95fc351b 100644 --- a/files/build/versions/dockers/docker-sonic-vs/versions-py3 +++ b/files/build/versions/dockers/docker-sonic-vs/versions-py3 @@ -1,5 +1,5 @@ certifi==2022.12.7 -charset-normalizer==3.0.1 +charset-normalizer==3.1.0 click==7.0 idna==3.4 ijson==2.6.1 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 a14b1ede742c..516d94d5d4be 100644 --- a/files/build/versions/dockers/sonic-slave-buster/versions-deb-buster +++ b/files/build/versions/dockers/sonic-slave-buster/versions-deb-buster @@ -413,7 +413,7 @@ libdbi1==0.9.0-5 libdbus-1-3==1.12.24-0+deb10u1 libdbus-1-dev==1.12.24-0+deb10u1 libdconf1==0.30.1-2 -libde265-0==1.0.3-1+deb10u3 +libde265-0==1.0.11-0+deb10u4 libdevel-callchecker-perl==0.008-1 libdevel-caller-perl==2.06-2+b1 libdevel-globaldestruction-perl==0.14-1 diff --git a/files/build/versions/dockers/sonic-slave-buster/versions-git b/files/build/versions/dockers/sonic-slave-buster/versions-git index 6b1844bf466f..843ae5b79903 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==c962e86f7bafddfc582922dec44cf7a843228abb +https://chromium.googlesource.com/chromium/tools/depot_tools.git==a9a7eecf37db6f89d4e5793826898e171b014e08 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 6b1844bf466f..843ae5b79903 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==c962e86f7bafddfc582922dec44cf7a843228abb +https://chromium.googlesource.com/chromium/tools/depot_tools.git==a9a7eecf37db6f89d4e5793826898e171b014e08 https://github.com/aristanetworks/swi-tools.git==b5f087e4774168bf536360d43c9c509c8f14ad9f \ No newline at end of file diff --git a/files/build/versions/host-image/versions-py2 b/files/build/versions/host-image/versions-py2 index 93186520cb3e..a57346ced325 100644 --- a/files/build/versions/host-image/versions-py2 +++ b/files/build/versions/host-image/versions-py2 @@ -8,7 +8,7 @@ ipaddr==2.2.0 ipaddress==1.0.23 jinja2==2.11.3 jsonschema==2.6.0 -lxml==4.6.3 +lxml==4.9.1 markupsafe==1.1.1 natsort==6.2.1 netaddr==0.8.0 diff --git a/files/build/versions/host-image/versions-py3 b/files/build/versions/host-image/versions-py3 index 6cf705cd50b5..ec023eb5c7ce 100644 --- a/files/build/versions/host-image/versions-py3 +++ b/files/build/versions/host-image/versions-py3 @@ -4,7 +4,7 @@ azure-storage==0.36.0 bitarray==1.5.3 certifi==2022.12.7 cffi==1.15.1 -charset-normalizer==3.0.1 +charset-normalizer==3.1.0 click==7.0 cryptography==39.0.2 docker==4.3.1 @@ -15,7 +15,7 @@ j2cli==0.3.10 jinja2==3.1.2 jsondiff==2.0.0 jsonschema==2.6.0 -lxml==4.6.3 +lxml==4.9.1 m2crypto==0.38.0 markupsafe==2.1.2 natsort==6.2.1 From 79548e472dd8ff830f54dc4208eca98132bc17a2 Mon Sep 17 00:00:00 2001 From: Sudharsan Dhamal Gopalarathnam Date: Tue, 14 Mar 2023 10:19:02 -0700 Subject: [PATCH 17/20] [Mellanox]Fix lpmode set when logical port is larger than 64 (#14138) (#14202) Manual cherry-pick of https://github.com/sonic-net/sonic-buildimage/pull/14138 - Why I did it In sfplpm API, the number of logical ports is hardcoded as 64. When a system contains more port than this, the SDK APIs would fail with a syslog as below Mar 7 03:53:58.105980 r-leopard-58 ERR syncd#SDK: [MGMT_LIB.ERR] Slot [0] Module [0] has logport [0x00010069] in enabled state Mar 7 03:53:58.105980 r-leopard-58 ERR syncd#SDK: [SDK_MGMT_LIB.ERR] Failed in __sdk_mgmt_phy_module_pwr_attr_set, error: Internal Error Mar 7 03:53:58.106118 r-leopard-58 ERR pmon#-c: Error occurred when setting power mode for SFP module 0, slot 0, error code 1 - How I did it Remove the hardcoded value of 64. Obtained the number of logical ports from SDK - How to verify it Manual testing --- .../mellanox/mlnx-platform-api/sonic_platform/sfp.py | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/platform/mellanox/mlnx-platform-api/sonic_platform/sfp.py b/platform/mellanox/mlnx-platform-api/sonic_platform/sfp.py index 6cfe253aa3fb..5d26b7d43618 100644 --- a/platform/mellanox/mlnx-platform-api/sonic_platform/sfp.py +++ b/platform/mellanox/mlnx-platform-api/sonic_platform/sfp.py @@ -263,7 +263,6 @@ REGISTER_NUM = 1 DEVICE_ID = 1 SWITCH_ID = 0 -SX_PORT_ATTR_ARR_SIZE = 64 PMAOS_ASE = 1 PMAOS_EE = 1 @@ -1978,14 +1977,17 @@ def set_port_admin_status_by_log_port(self, log_port, admin_status): def get_logical_ports(self): # Get all the ports related to the sfp, if port admin status is up, put it to list - port_attributes_list = new_sx_port_attributes_t_arr(SX_PORT_ATTR_ARR_SIZE) port_cnt_p = new_uint32_t_p() - uint32_t_p_assign(port_cnt_p, SX_PORT_ATTR_ARR_SIZE) + uint32_t_p_assign(port_cnt_p, 0) + rc = sx_api_port_device_get(self.sdk_handle, DEVICE_ID, SWITCH_ID, None, port_cnt_p) + assert rc == SX_STATUS_SUCCESS, "sx_api_port_device_get failed, rc = %d" % rc + port_cnt = uint32_t_p_value(port_cnt_p) + port_attributes_list = new_sx_port_attributes_t_arr(port_cnt) + rc = sx_api_port_device_get(self.sdk_handle, DEVICE_ID , SWITCH_ID, port_attributes_list, port_cnt_p) assert rc == SX_STATUS_SUCCESS, "sx_api_port_device_get failed, rc = %d" % rc - port_cnt = uint32_t_p_value(port_cnt_p) log_port_list = [] for i in range(0, port_cnt): port_attributes = sx_port_attributes_t_arr_getitem(port_attributes_list, i) From e2e3625500e8ed15cd48ded7acded864f71e942b Mon Sep 17 00:00:00 2001 From: Prince Sunny Date: Wed, 15 Mar 2023 17:10:28 -0700 Subject: [PATCH 18/20] [202012][Submodule] update for sonic-restapi (#14241) Update sonic-restapi for the following commit: 44121be - 2023-03-14: Support ipv6 prefix length greater than 64 and check for adv_prefix 47e4b53 - 2023-03-15: Set allowed IPv6 pfx len to be 60 --- src/sonic-restapi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/sonic-restapi b/src/sonic-restapi index 99c467d8e727..47e4b534df75 160000 --- a/src/sonic-restapi +++ b/src/sonic-restapi @@ -1 +1 @@ -Subproject commit 99c467d8e727775085fbf962e2c3d9f9886b8161 +Subproject commit 47e4b534df75fd71af6f902759f69cc0fc8b7a3c From ab5115846ded6711803adaf526804ad520f045a6 Mon Sep 17 00:00:00 2001 From: Yakiv Huryk <62013282+Yakiv-Huryk@users.noreply.github.com> Date: Thu, 16 Mar 2023 12:42:19 +0200 Subject: [PATCH 19/20] [202012][Mellanox] update sdk/fw build procedure (#14025) (#14220) - Why I did it To optimize Mellanox platform build - How I did it sdk debs are now downloaded as Spectrum-SDK-Drivers-SONiC-Bins release sx kernel is downloaded as zip from Spectrum-SDK-Drivers --- .gitmodules | 3 --- platform/mellanox/fw.mk | 9 ++++++--- platform/mellanox/sdk-src/sx-kernel/Makefile | 14 +++++++++++--- .../sdk-src/sx-kernel/Switch-SDK-drivers | 1 - platform/mellanox/sdk.mk | 17 ++++++++--------- 5 files changed, 25 insertions(+), 19 deletions(-) delete mode 160000 platform/mellanox/sdk-src/sx-kernel/Switch-SDK-drivers diff --git a/.gitmodules b/.gitmodules index c5c1279a1b93..4eedbea00df9 100644 --- a/.gitmodules +++ b/.gitmodules @@ -73,9 +73,6 @@ [submodule "src/sonic-telemetry"] path = src/sonic-telemetry url = https://github.com/sonic-net/sonic-gnmi -[submodule "Switch-SDK-drivers"] - path = platform/mellanox/sdk-src/sx-kernel/Switch-SDK-drivers - url = https://github.com/Mellanox/Switch-SDK-drivers [submodule "src/sonic-ztp"] path = src/sonic-ztp url = https://github.com/sonic-net/sonic-ztp diff --git a/platform/mellanox/fw.mk b/platform/mellanox/fw.mk index faef8e6f9395..9026dc153176 100644 --- a/platform/mellanox/fw.mk +++ b/platform/mellanox/fw.mk @@ -5,10 +5,13 @@ MLNX_FW_BASE_PATH = $(MLNX_SDK_BASE_PATH) # Place an URL here to FW if you want to download FW instead MLNX_FW_BASE_URL = -ifneq ($(MLNX_FW_BASE_URL), ) FW_FROM_URL = y -else -FW_FROM_URL = n + +MLNX_FW_ASSETS_RELEASE_TAG = fw-2010.3196 +MLNX_FW_ASSETS_URL = $(MLNX_ASSETS_GITHUB_URL)/releases/download/$(MLNX_FW_ASSETS_RELEASE_TAG) + +ifeq ($(MLNX_FW_BASE_URL), ) +MLNX_FW_BASE_URL = $(MLNX_FW_ASSETS_URL) endif MLNX_SPC_FW_VERSION = 13.2010.3196 diff --git a/platform/mellanox/sdk-src/sx-kernel/Makefile b/platform/mellanox/sdk-src/sx-kernel/Makefile index 422f2ae95aae..179594798129 100644 --- a/platform/mellanox/sdk-src/sx-kernel/Makefile +++ b/platform/mellanox/sdk-src/sx-kernel/Makefile @@ -5,6 +5,8 @@ MAIN_TARGET = sx-kernel_1.mlnx.$(MLNX_SDK_DEB_VERSION)_amd64.deb DERIVED_TARGETS = sx-kernel-dev_1.mlnx.$(MLNX_SDK_DEB_VERSION)_amd64.deb PACKAGE_NAME = sx_kernel +MLNX_SX_KERNEL_GITHUB_URL_BASE = https://github.com/Mellanox/Spectrum-SDK-Drivers/archive/refs/heads + $(addprefix $(DEST)/, $(MAIN_TARGET)): $(DEST)/% : # get sources @@ -13,9 +15,15 @@ $(addprefix $(DEST)/, $(MAIN_TARGET)): $(DEST)/% : wget -c $(MLNX_SDK_SOURCE_BASE_URL)/$(PACKAGE_NAME)-$(MLNX_SDK_VERSION)-$(MLNX_SDK_ISSU_VERSION).tar.gz -O - | tar -xz pushd sx_kernel-$(MLNX_SDK_VERSION)-$(MLNX_SDK_ISSU_VERSION) else - pushd Switch-SDK-drivers - git reset --hard - git clean -xfd + rm -rf Spectrum-SDK-Drivers-$(MLNX_SDK_VERSION) + wget -c $(MLNX_SX_KERNEL_GITHUB_URL_BASE)/$(MLNX_SDK_VERSION).zip + unzip $(MLNX_SDK_VERSION).zip + rm -rf $(MLNX_SDK_VERSION).zip + + pushd Spectrum-SDK-Drivers-$(MLNX_SDK_VERSION) + ln -s ./sx_scripts/Makefile ./Makefile + ln -s ./sx_scripts/makefile ./makefile + ln -s ./sx_scripts/configure ./configure fi # build diff --git a/platform/mellanox/sdk-src/sx-kernel/Switch-SDK-drivers b/platform/mellanox/sdk-src/sx-kernel/Switch-SDK-drivers deleted file mode 160000 index a12968f165f6..000000000000 --- a/platform/mellanox/sdk-src/sx-kernel/Switch-SDK-drivers +++ /dev/null @@ -1 +0,0 @@ -Subproject commit a12968f165f623ff3c27d6ebaabd34cc6316497e diff --git a/platform/mellanox/sdk.mk b/platform/mellanox/sdk.mk index 06c067cc1984..a7a2bb20b43a 100644 --- a/platform/mellanox/sdk.mk +++ b/platform/mellanox/sdk.mk @@ -1,8 +1,9 @@ -MLNX_SDK_BASE_PATH = $(PLATFORM_PATH)/sdk-src/sx-kernel/Switch-SDK-drivers/bin/ -MLNX_SDK_PKG_BASE_PATH = $(MLNX_SDK_BASE_PATH)/$(BLDENV)/$(CONFIGURED_ARCH)/ MLNX_SDK_VERSION = 4.5.3196 MLNX_SDK_ISSU_VERSION = 101 +MLNX_ASSETS_GITHUB_URL = https://github.com/Mellanox/Spectrum-SDK-Drivers-SONiC-Bins +MLNX_SDK_ASSETS_RELEASE_TAG = sdk-$(MLNX_SDK_VERSION)-$(BLDENV)-$(CONFIGURED_ARCH) +MLNX_SDK_ASSETS_URL = $(MLNX_ASSETS_GITHUB_URL)/releases/download/$(MLNX_SDK_ASSETS_RELEASE_TAG) MLNX_SDK_DEB_VERSION = $(subst -,.,$(subst _,.,$(MLNX_SDK_VERSION))) # Place here URL where SDK sources exist @@ -14,7 +15,7 @@ else SDK_FROM_SRC = n endif -export MLNX_SDK_SOURCE_BASE_URL MLNX_SDK_VERSION MLNX_SDK_ISSU_VERSION MLNX_SDK_DEB_VERSION +export MLNX_SDK_SOURCE_BASE_URL MLNX_SDK_VERSION MLNX_SDK_ISSU_VERSION MLNX_SDK_DEB_VERSION MLNX_ASSETS_GITHUB_URL MLNX_SDK_RDEBS += $(APPLIBS) $(IPROUTE2_MLNX) $(SX_COMPLIB) $(SX_EXAMPLES) \ $(SX_GEN_UTILS) $(SX_SCEW) $(SXD_LIBS) $(WJH_LIBS) $(SX_ACL_HELPER) @@ -136,21 +137,19 @@ $(SX_KERNEL)_SRC_PATH = $(PLATFORM_PATH)/sdk-src/sx-kernel SX_KERNEL_DEV = sx-kernel-dev_1.mlnx.$(MLNX_SDK_DEB_VERSION)_amd64.deb $(eval $(call add_derived_package,$(SX_KERNEL),$(SX_KERNEL_DEV))) -define make_path - $(1)_PATH = $(MLNX_SDK_PKG_BASE_PATH) +define make_url + $(1)_URL = $(MLNX_SDK_ASSETS_URL)/$(1) endef -$(eval $(foreach deb,$(MLNX_SDK_DEBS),$(call make_path,$(deb)))) -$(eval $(foreach deb,$(MLNX_SDK_RDEBS),$(call make_path,$(deb)))) -$(eval $(foreach deb,$(PYTHON_SDK_API) $(SX_KERNEL) $(SX_KERNEL_DEV),$(call make_path,$(deb)))) +$(eval $(foreach deb,$(MLNX_SDK_DEBS) $(MLNX_SDK_RDEBS) $(PYTHON_SDK_API),$(call make_url,$(deb)))) SONIC_MAKE_DEBS += $(SX_KERNEL) ifeq ($(SDK_FROM_SRC), y) SONIC_MAKE_DEBS += $(MLNX_SDK_RDEBS) $(PYTHON_SDK_API) else -SONIC_COPY_DEBS += $(MLNX_SDK_RDEBS) $(PYTHON_SDK_API) +SONIC_ONLINE_DEBS += $(MLNX_SDK_RDEBS) $(PYTHON_SDK_API) endif mlnx-sdk-packages: $(addprefix $(DEBS_PATH)/, $(MLNX_SDK_RDEBS) $(PYTHON_SDK_API) $(SX_KERNEL)) From 4269e77bdbe56af590032ce787043896f60a5b79 Mon Sep 17 00:00:00 2001 From: xumia Date: Fri, 17 Mar 2023 00:18:18 +0000 Subject: [PATCH 20/20] Copy the files/build/versions from public 202012 --- .../build/build-sonic-slave-buster/versions-git | 2 +- files/build/versions/default/versions-docker | 16 +--------------- files/build/versions/default/versions-git | 2 +- files/build/versions/default/versions-web | 2 +- .../docker-config-engine-stretch/versions-py2 | 2 +- .../dockers/sonic-slave-buster/versions-git | 2 +- .../dockers/sonic-slave-stretch/versions-git | 2 +- 7 files changed, 7 insertions(+), 21 deletions(-) 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 c3f6b398823f..b2525ffced3e 100644 --- a/files/build/versions/build/build-sonic-slave-buster/versions-git +++ b/files/build/versions/build/build-sonic-slave-buster/versions-git @@ -11,4 +11,4 @@ https://salsa.debian.org/dhcp-team/isc-dhcp.git==7a6f5a9d178439a56a8eb0cd4446329 https://salsa.debian.org/kernel-team/ethtool/==68409b09a969b49a07fbf3930409f155b953434b 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==48770216530d8a0a57f5f1d7cc60addd67d1b549 +https://salsa.debian.org/ssh-team/openssh.git==48770216530d8a0a57f5f1d7cc60addd67d1b549 \ No newline at end of file diff --git a/files/build/versions/default/versions-docker b/files/build/versions/default/versions-docker index cda8e71f1f51..fe8679513101 100644 --- a/files/build/versions/default/versions-docker +++ b/files/build/versions/default/versions-docker @@ -1,17 +1,3 @@ -https://github.com/CESNET/libyang.git==d57c8888922d1663508ad0f0a5b66f8ad600276d -https://github.com/daveolson53/libnss-tacplus.git==19008ab68d9d504aa58eb34d5f564755a1613b8b -https://github.com/jeroennijhof/pam_tacplus.git==7908a7faa0205beda9ea198bdd3aa37868be6da2 -https://github.com/jpirko/libteam.git==61e27812c1074a865d7e1a778c0ce442837c28d7 -https://github.com/Mellanox/libpsample.git==62bb27d9a49424e45191eee81df7ce0d8c74e774 -https://github.com/sflow/host-sflow==f1ffaa93b5ef2221ca7299e6db953917fba03b40 -https://github.com/sflow/sflowtool==8c914e79ecb7930adcba2e5296041c3f9eb8e450 -https://github.com/thom311/libnl==cbafad9ddf24caef5230fef715d34f0539603be0 -https://salsa.debian.org/debian/libteam.git==48142125234a665ad5367b724af36a58fb484d3d -https://salsa.debian.org/dhcp-team/isc-dhcp.git==7a6f5a9d178439a56a8eb0cd4446329a8d5631ce -https://salsa.debian.org/kernel-team/ethtool/==68409b09a969b49a07fbf3930409f155b953434b -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==48770216530d8a0a57f5f1d7cc60addd67d1b549xumia@xumia-vm1:/projects/sonic/sonic-buildimage$ cat files/build/versions/default/versions-docker; echo amd64:amd64/debian:buster==sha256:c75d609d1d06a44ac87c52e9afe4102af856dd1c075f316b4d219f072af0b3b1 amd64:amd64/debian:stretch==sha256:16ee3e11da473f6565ef94a715f1a38b3079e0664913be78869c336a71cb6085 amd64:debian:buster==sha256:2d356e1e22c0902f88ef65cb7159ecd5a96feb62345747edfd4324b0d83a2923 @@ -21,4 +7,4 @@ arm64:debian:buster==sha256:2d356e1e22c0902f88ef65cb7159ecd5a96feb62345747edfd43 arm64:debian:stretch==sha256:c5c5200ff1e9c73ffbf188b4a67eb1c91531b644856b4aefe86a58d2f0cb05be armhf:arm32v7/debian:buster==sha256:43b845d5864322e89773a602535f5db85debe3356e50488c63dd99bf2cc16899 armhf:debian:buster==sha256:2d356e1e22c0902f88ef65cb7159ecd5a96feb62345747edfd4324b0d83a2923 -armhf:debian:stretch==sha256:c5c5200ff1e9c73ffbf188b4a67eb1c91531b644856b4aefe86a58d2f0cb05be +armhf:debian:stretch==sha256:c5c5200ff1e9c73ffbf188b4a67eb1c91531b644856b4aefe86a58d2f0cb05be \ No newline at end of file diff --git a/files/build/versions/default/versions-git b/files/build/versions/default/versions-git index c1a08785b2a6..2098babd013a 100644 --- a/files/build/versions/default/versions-git +++ b/files/build/versions/default/versions-git @@ -17,4 +17,4 @@ https://salsa.debian.org/dhcp-team/isc-dhcp.git==7a6f5a9d178439a56a8eb0cd4446329 https://salsa.debian.org/kernel-team/ethtool/==68409b09a969b49a07fbf3930409f155b953434b 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==48770216530d8a0a57f5f1d7cc60addd67d1b549 +https://salsa.debian.org/ssh-team/openssh.git==48770216530d8a0a57f5f1d7cc60addd67d1b549 \ No newline at end of file diff --git a/files/build/versions/default/versions-web b/files/build/versions/default/versions-web index 7ef87b7be829..1e3b4714099c 100644 --- a/files/build/versions/default/versions-web +++ b/files/build/versions/default/versions-web @@ -72,4 +72,4 @@ https://sonicstorage.blob.core.windows.net/packages/redis/redis-tools_6.0.6-1_bp https://sonicstorage.blob.core.windows.net/packages/redis/redis-tools_6.0.6-1~bpo10+1_amd64.deb?sv=2015-04-05&sr=b&sig=73zbmjkf3pi%2Bn0R8Hy7CWT2EUvOAyzM5aLYJWCLySGM%3D&se=2030-09-06T19%3A44%3A59Z&sp=r==2d58c3c3358290c04d5e0ba70f297f18 https://storage.googleapis.com/golang/go1.14.2.linux-amd64.tar.gz==856d248e3ea8a287d13e5f6afd086282 https://storage.googleapis.com/golang/go1.14.2.linux-arm64.tar.gz==e5f79b403701e00f20d13f0ea561b064 -https://storage.googleapis.com/golang/go1.14.2.linux-armv6l.tar.gz==04467414e783b18de4278e9f24baf4be +https://storage.googleapis.com/golang/go1.14.2.linux-armv6l.tar.gz==04467414e783b18de4278e9f24baf4be \ No newline at end of file diff --git a/files/build/versions/dockers/docker-config-engine-stretch/versions-py2 b/files/build/versions/dockers/docker-config-engine-stretch/versions-py2 index 6aa07a645e89..9092f9c71ce4 100644 --- a/files/build/versions/dockers/docker-config-engine-stretch/versions-py2 +++ b/files/build/versions/dockers/docker-config-engine-stretch/versions-py2 @@ -19,4 +19,4 @@ sonic-config-engine==1.0 sonic-py-common==1.0 swsssdk==2.0.1 typing==3.10.0.0 -zipp==1.2.0 +zipp==1.2.0 \ 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 9e9e3db92442..843ae5b79903 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==a9a7eecf37db6f89d4e5793826898e171b014e08 -https://github.com/aristanetworks/swi-tools.git==b5f087e4774168bf536360d43c9c509c8f14ad9f +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 9e9e3db92442..843ae5b79903 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==a9a7eecf37db6f89d4e5793826898e171b014e08 -https://github.com/aristanetworks/swi-tools.git==b5f087e4774168bf536360d43c9c509c8f14ad9f +https://github.com/aristanetworks/swi-tools.git==b5f087e4774168bf536360d43c9c509c8f14ad9f \ No newline at end of file