From 49c7ffcb1bd550b683f35c53713bbe2ed66780b3 Mon Sep 17 00:00:00 2001 From: Andriy Kokhan <andriy.kokhan@plvision.eu> Date: Fri, 17 Nov 2023 21:39:20 +0200 Subject: [PATCH 1/2] Updated SAI version to Oct 20, 2023 Signed-off-by: Andriy Kokhan <andriy.kokhan@plvision.eu> --- sai.env | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/sai.env b/sai.env index ba81acd2..9b6c6010 100644 --- a/sai.env +++ b/sai.env @@ -1,13 +1,13 @@ # The sonic-swss-common and sonic-sairedis commits were taken from -# sonic-buildimage master as of Sep 29, 2023 +# sonic-buildimage master as of Nov 17, 2023 # -# https://github.com/sonic-net/sonic-buildimage/tree/81a2f56 +# https://github.com/sonic-net/sonic-buildimage/tree/9f08f88 -SWSS_COMMON_ID=b0f148e -SAIREDIS_ID=c22b76b +SWSS_COMMON_ID=05e024e +SAIREDIS_ID=92da5b3 # SAI version: # Branch master (post v1.13) -# Sep 8, 2023 +# Oct 20, 2023 -SAI_ID=7f7a758 +SAI_ID=f981a1f From e6166d46fa10997b7ddc2f7bb7e8142fb1bc1914 Mon Sep 17 00:00:00 2001 From: Andriy Kokhan <andriy.kokhan@plvision.eu> Date: Fri, 17 Nov 2023 23:37:37 +0200 Subject: [PATCH 2/2] Fixed swss-common dependencies Signed-off-by: Andriy Kokhan <andriy.kokhan@plvision.eu> --- dockerfiles/bullseye/Dockerfile | 4 ++-- dockerfiles/buster/Dockerfile | 6 +++--- dockerfiles/buster/Dockerfile.server | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dockerfiles/bullseye/Dockerfile b/dockerfiles/bullseye/Dockerfile index a6e83fbf..6ed09c45 100644 --- a/dockerfiles/bullseye/Dockerfile +++ b/dockerfiles/bullseye/Dockerfile @@ -34,7 +34,8 @@ RUN apt-get install -y \ make libtool m4 autoconf dh-exec debhelper automake cmake pkg-config \ libhiredis-dev libnl-3-dev libnl-genl-3-dev libnl-route-3-dev swig \ libgtest-dev libgmock-dev libboost-dev autoconf-archive \ - uuid-dev libboost-serialization-dev libyang-dev libyang1 + uuid-dev libboost-serialization-dev libyang-dev libyang1 \ + nlohmann-json3-dev RUN apt-get install -y \ libnl-3-dev libnl-genl-3-dev libnl-route-3-dev libnl-nf-3-dev libzmq3-dev @@ -98,7 +99,6 @@ RUN echo "#mock" > /ptf/ptf && pip3 install /ptf # Install SAI attributes metadata JSON generator COPY scripts/gen_attr_list /sai/gen_attr_list -RUN apt-get install -y nlohmann-json3-dev # Install SAI-C dependencies RUN pip3 install pytest pytest_dependency pytest-html aenum pdbpp macaddress click==8.0 diff --git a/dockerfiles/buster/Dockerfile b/dockerfiles/buster/Dockerfile index 36bfedde..b74b163c 100644 --- a/dockerfiles/buster/Dockerfile +++ b/dockerfiles/buster/Dockerfile @@ -38,9 +38,10 @@ RUN apt-get install -y redis-server libhiredis0.14 libc-ares2 # Install sonic-swss-common & sonic-sairedis building dependencies RUN apt-get install -y \ make libtool m4 autoconf dh-exec debhelper automake cmake pkg-config \ - libhiredis-dev libnl-3-dev libnl-genl-3-dev libnl-route-3-dev swig3.0 \ + libhiredis-dev libnl-3-dev libnl-genl-3-dev libnl-route-3-dev swig \ libgtest-dev libgmock-dev libboost-dev autoconf-archive \ - uuid-dev libboost-serialization-dev libyang-dev libyang1 + uuid-dev libboost-serialization-dev libyang-dev libyang1 \ + nlohmann-json3-dev RUN apt-get install -y \ libnl-3-dev libnl-genl-3-dev libnl-route-3-dev libnl-nf-3-dev libzmq3-dev @@ -104,7 +105,6 @@ RUN echo "#mock" > /ptf/ptf && pip3 install /ptf # Install SAI attributes metadata JSON generator COPY scripts/gen_attr_list /sai/gen_attr_list -RUN apt-get install -y nlohmann-json3-dev # Install SAI-C dependencies RUN pip3 install pytest pytest_dependency pytest-html aenum pdbpp macaddress click==8.0 diff --git a/dockerfiles/buster/Dockerfile.server b/dockerfiles/buster/Dockerfile.server index e9b46911..b0a909d6 100644 --- a/dockerfiles/buster/Dockerfile.server +++ b/dockerfiles/buster/Dockerfile.server @@ -38,7 +38,7 @@ RUN apt-get install -y redis-server libhiredis0.14 libc-ares2 # Install sonic-swss-common & sonic-sairedis building dependencies RUN apt-get install -y \ make libtool m4 autoconf dh-exec debhelper automake cmake pkg-config \ - libhiredis-dev libnl-3-dev libnl-genl-3-dev libnl-route-3-dev swig3.0 \ + libhiredis-dev libnl-3-dev libnl-genl-3-dev libnl-route-3-dev swig \ libgtest-dev libgmock-dev libboost-dev autoconf-archive \ uuid-dev libboost-serialization-dev libyang-dev libyang1 \ nlohmann-json3-dev