[syncd-rpc] Install Libboost Atomic 1.71, Libqtcore And Libqtnetwork (#…

…6689) When Building syncd-rpc, libthrift has dependency on libboost-atomic1.71.0, however the debian packager install version 1.67 instead. This PR preinstalls libboost-atomic v 1.71 to avoid falling back to v 1.67. signed-off-by: Tamer Ahmed <[email protected]>
sonic-net · Feb 10, 2021 · 149a68b · 149a68b
1 parent c54a03f
commit 149a68b
Show file tree

Hide file tree

Showing 11 changed files with 119 additions and 71 deletions.
diff --git a/platform/barefoot/docker-syncd-bfn-rpc/Dockerfile.j2 b/platform/barefoot/docker-syncd-bfn-rpc/Dockerfile.j2
@@ -11,11 +11,6 @@ debs/
 
 RUN apt-get purge -y syncd
 
-RUN dpkg_apt() { [ -f $1 ] && { dpkg -i $1 || apt-get -y install -f; } || return 1; } ; \
-{% for deb in docker_syncd_bfn_rpc_debs.split(' ') -%}
-dpkg_apt debs/{{ deb }}{{'; '}}
-{%- endfor %}
-
 ## Pre-install the fundamental packages
 RUN apt-get update \
  && apt-get -y install  \
@@ -28,8 +23,16 @@ RUN apt-get update \
     python-dev          \
     wget                \
     cmake               \
-    libpython3.4        \
- && wget https://github.com/nanomsg/nanomsg/archive/1.0.0.tar.gz \
+    libqt5core5a        \
+    libqt5network5      \
+    libboost-atomic1.71.0
+
+RUN dpkg_apt() { [ -f $1 ] && { dpkg -i $1 || apt-get -y install -f; } || return 1; } ; \
+{% for deb in docker_syncd_bfn_rpc_debs.split(' ') -%}
+dpkg_apt debs/{{ deb }}{{'; '}}
+{%- endfor %}
+
+RUN wget https://github.com/nanomsg/nanomsg/archive/1.0.0.tar.gz \
  && tar xvfz 1.0.0.tar.gz \
  && cd nanomsg-1.0.0    \
  && mkdir -p build      \
@@ -50,5 +53,5 @@ RUN apt-get update \
  && rm -rf /root/deps
 
 COPY ["ptf_nn_agent.conf", "/etc/supervisor/conf.d/"]
- 
+
 ENTRYPOINT ["/usr/local/bin/supervisord"]
diff --git a/platform/broadcom/docker-syncd-brcm-rpc/Dockerfile.j2 b/platform/broadcom/docker-syncd-brcm-rpc/Dockerfile.j2
@@ -11,11 +11,6 @@ debs/
 
 RUN apt-get purge -y syncd
 
-RUN dpkg_apt() { [ -f $1 ] && { dpkg -i $1 || apt-get -y install -f; } || return 1; } ; \
-{% for deb in docker_syncd_brcm_rpc_debs.split(' ') -%}
-dpkg_apt debs/{{ deb }}{{'; '}}
-{%- endfor %}
-
 ## Pre-install the fundamental packages
 RUN apt-get update \
  && apt-get -y install  \
@@ -28,7 +23,16 @@ RUN apt-get update \
     python-dev          \
     wget                \
     cmake               \
- && wget https://github.com/nanomsg/nanomsg/archive/1.0.0.tar.gz \
+    libqt5core5a        \
+    libqt5network5      \
+    libboost-atomic1.71.0
+
+RUN dpkg_apt() { [ -f $1 ] && { dpkg -i $1 || apt-get -y install -f; } || return 1; } ; \
+{% for deb in docker_syncd_brcm_rpc_debs.split(' ') -%}
+dpkg_apt debs/{{ deb }}{{'; '}}
+{%- endfor %}
+
+RUN wget https://github.com/nanomsg/nanomsg/archive/1.0.0.tar.gz \
  && tar xvfz 1.0.0.tar.gz \
  && cd nanomsg-1.0.0    \
  && mkdir -p build      \

diff --git a/platform/cavium/docker-syncd-cavm-rpc/Dockerfile.j2 b/platform/cavium/docker-syncd-cavm-rpc/Dockerfile.j2
@@ -11,11 +11,6 @@ debs/
 
 RUN apt-get purge -y syncd
 
-RUN dpkg_apt() { [ -f $1 ] && { dpkg -i $1 || apt-get -y install -f; } || return 1; } ; \
-{% for deb in docker_syncd_cavm_rpc_debs.split(' ') -%}
-dpkg_apt debs/{{ deb }}{{'; '}}
-{%- endfor %}
-
 ## Pre-install the fundamental packages
 RUN apt-get update \
  && apt-get -y install  \
@@ -27,7 +22,16 @@ RUN apt-get update \
     python-dev          \
     wget                \
     cmake               \
- && wget https://github.com/nanomsg/nanomsg/archive/1.0.0.tar.gz \
+    libqt5core5a        \
+    libqt5network5      \
+    libboost-atomic1.71.0
+
+RUN dpkg_apt() { [ -f $1 ] && { dpkg -i $1 || apt-get -y install -f; } || return 1; } ; \
+{% for deb in docker_syncd_cavm_rpc_debs.split(' ') -%}
+dpkg_apt debs/{{ deb }}{{'; '}}
+{%- endfor %}
+
+RUN wget https://github.com/nanomsg/nanomsg/archive/1.0.0.tar.gz \
  && tar xvfz 1.0.0.tar.gz \
  && cd nanomsg-1.0.0    \
  && mkdir -p build      \

diff --git a/platform/centec-arm64/docker-syncd-centec-rpc/Dockerfile.j2 b/platform/centec-arm64/docker-syncd-centec-rpc/Dockerfile.j2
@@ -11,11 +11,6 @@ debs/
 
 RUN apt-get purge -y syncd
 
-RUN dpkg_apt() { [ -f $1 ] && { dpkg -i $1 || apt-get -y install -f; } || return 1; } ; \
-{% for deb in docker_syncd_centec_rpc_debs.split(' ') -%}
-dpkg_apt debs/{{ deb }}{{'; '}}
-{%- endfor %}
-
 ## Pre-install the fundamental packages
 RUN apt-get update \
  && apt-get -y install  \
@@ -28,7 +23,16 @@ RUN apt-get update \
     python-dev          \
     wget                \
     cmake               \
- && wget https://github.com/nanomsg/nanomsg/archive/1.0.0.tar.gz \
+    libqt5core5a        \
+    libqt5network5      \
+    libboost-atomic1.71.0
+
+RUN dpkg_apt() { [ -f $1 ] && { dpkg -i $1 || apt-get -y install -f; } || return 1; } ; \
+{% for deb in docker_syncd_centec_rpc_debs.split(' ') -%}
+dpkg_apt debs/{{ deb }}{{'; '}}
+{%- endfor %}
+
+RUN wget https://github.com/nanomsg/nanomsg/archive/1.0.0.tar.gz \
  && tar xvfz 1.0.0.tar.gz \
  && cd nanomsg-1.0.0    \
  && mkdir -p build      \
@@ -49,5 +53,5 @@ RUN apt-get update \
  && rm -rf /root/deps
 
 COPY ["ptf_nn_agent.conf", "/etc/supervisor/conf.d/"]
- 
+
 ENTRYPOINT ["/usr/local/bin/supervisord"]
diff --git a/platform/centec/docker-syncd-centec-rpc/Dockerfile.j2 b/platform/centec/docker-syncd-centec-rpc/Dockerfile.j2
@@ -11,11 +11,6 @@ debs/
 
 RUN apt-get purge -y syncd
 
-RUN dpkg_apt() { [ -f $1 ] && { dpkg -i $1 || apt-get -y install -f; } || return 1; } ; \
-{% for deb in docker_syncd_centec_rpc_debs.split(' ') -%}
-dpkg_apt debs/{{ deb }}{{'; '}}
-{%- endfor %}
-
 ## Pre-install the fundamental packages
 RUN apt-get update \
  && apt-get -y install  \
@@ -28,7 +23,16 @@ RUN apt-get update \
     python-dev          \
     wget                \
     cmake               \
- && wget https://github.com/nanomsg/nanomsg/archive/1.0.0.tar.gz \
+    libqt5core5a        \
+    libqt5network5      \
+    libboost-atomic1.71.0
+
+RUN dpkg_apt() { [ -f $1 ] && { dpkg -i $1 || apt-get -y install -f; } || return 1; } ; \
+{% for deb in docker_syncd_centec_rpc_debs.split(' ') -%}
+dpkg_apt debs/{{ deb }}{{'; '}}
+{%- endfor %}
+
+RUN wget https://github.com/nanomsg/nanomsg/archive/1.0.0.tar.gz \
  && tar xvfz 1.0.0.tar.gz \
  && cd nanomsg-1.0.0    \
  && mkdir -p build      \
@@ -49,5 +53,5 @@ RUN apt-get update \
  && rm -rf /root/deps
 
 COPY ["ptf_nn_agent.conf", "/etc/supervisor/conf.d/"]
- 
+
 ENTRYPOINT ["/usr/local/bin/supervisord"]
diff --git a/platform/innovium/docker-syncd-invm-rpc/Dockerfile.j2 b/platform/innovium/docker-syncd-invm-rpc/Dockerfile.j2
@@ -11,11 +11,6 @@ debs/
 
 RUN dpkg -P syncd
 
-RUN dpkg_apt() { [ -f $1 ] && { dpkg -i $1 || apt-get -y install -f; } || return 1; } ; \
-{% for deb in docker_syncd_invm_rpc_debs.split(' ') -%}
-dpkg_apt debs/{{ deb }}{{'; '}}
-{%- endfor %}
-
 ## Pre-install the fundamental packages
 RUN apt-get update \
  && apt-get -y install  \
@@ -29,7 +24,16 @@ RUN apt-get update \
     libjansson4         \
     wget                \
     cmake               \
- && wget https://github.com/nanomsg/nanomsg/archive/1.0.0.tar.gz \
+    libqt5core5a        \
+    libqt5network5      \
+    libboost-atomic1.71.0
+
+RUN dpkg_apt() { [ -f $1 ] && { dpkg -i $1 || apt-get -y install -f; } || return 1; } ; \
+{% for deb in docker_syncd_invm_rpc_debs.split(' ') -%}
+dpkg_apt debs/{{ deb }}{{'; '}}
+{%- endfor %}
+
+RUN wget https://github.com/nanomsg/nanomsg/archive/1.0.0.tar.gz \
  && tar xvfz 1.0.0.tar.gz \
  && cd nanomsg-1.0.0    \
  && mkdir -p build      \

diff --git a/platform/marvell-arm64/docker-syncd-mrvl-rpc/Dockerfile.j2 b/platform/marvell-arm64/docker-syncd-mrvl-rpc/Dockerfile.j2
@@ -11,11 +11,6 @@ debs/
 
 RUN apt-get purge -y syncd
 
-RUN dpkg_apt() { [ -f $1 ] && { dpkg -i $1 || apt-get -y install -f; } || return 1; } ; \
-{% for deb in docker_syncd_mrvl_rpc_debs.split(' ') -%}
-dpkg_apt debs/{{ deb }}{{'; '}}
-{%- endfor %}
-
 ## Pre-install the fundamental packages
 RUN apt-get update \
  && apt-get -y install  \
@@ -27,7 +22,16 @@ RUN apt-get update \
     python-dev          \
     wget                \
     cmake               \
- && wget https://github.com/nanomsg/nanomsg/archive/1.0.0.tar.gz \
+    libqt5core5a        \
+    libqt5network5      \
+    libboost-atomic1.71.0
+
+RUN dpkg_apt() { [ -f $1 ] && { dpkg -i $1 || apt-get -y install -f; } || return 1; } ; \
+{% for deb in docker_syncd_mrvl_rpc_debs.split(' ') -%}
+dpkg_apt debs/{{ deb }}{{'; '}}
+{%- endfor %}
+
+RUN wget https://github.com/nanomsg/nanomsg/archive/1.0.0.tar.gz \
  && tar xvfz 1.0.0.tar.gz \
  && cd nanomsg-1.0.0    \
  && mkdir -p build      \

diff --git a/platform/marvell-armhf/docker-syncd-mrvl-rpc/Dockerfile.j2 b/platform/marvell-armhf/docker-syncd-mrvl-rpc/Dockerfile.j2
@@ -11,11 +11,6 @@ debs/
 
 RUN apt-get purge -y syncd
 
-RUN dpkg_apt() { [ -f $1 ] && { dpkg -i $1 || apt-get -y install -f; } || return 1; } ; \
-{% for deb in docker_syncd_mrvl_rpc_debs.split(' ') -%}
-dpkg_apt debs/{{ deb }}{{'; '}}
-{%- endfor %}
-
 ## Pre-install the fundamental packages
 RUN apt-get update \
  && apt-get -y install  \
@@ -27,7 +22,16 @@ RUN apt-get update \
     python-dev          \
     wget                \
     cmake               \
- && wget https://github.com/nanomsg/nanomsg/archive/1.0.0.tar.gz \
+    libqt5core5a        \
+    libqt5network5      \
+    libboost-atomic1.71.0
+
+RUN dpkg_apt() { [ -f $1 ] && { dpkg -i $1 || apt-get -y install -f; } || return 1; } ; \
+{% for deb in docker_syncd_mrvl_rpc_debs.split(' ') -%}
+dpkg_apt debs/{{ deb }}{{'; '}}
+{%- endfor %}
+
+RUN wget https://github.com/nanomsg/nanomsg/archive/1.0.0.tar.gz \
  && tar xvfz 1.0.0.tar.gz \
  && cd nanomsg-1.0.0    \
  && mkdir -p build      \

diff --git a/platform/marvell/docker-syncd-mrvl-rpc/Dockerfile.j2 b/platform/marvell/docker-syncd-mrvl-rpc/Dockerfile.j2
@@ -11,11 +11,6 @@ debs/
 
 RUN apt-get purge -y syncd
 
-RUN dpkg_apt() { [ -f $1 ] && { dpkg -i $1 || apt-get -y install -f; } || return 1; } ; \
-{% for deb in docker_syncd_mrvl_rpc_debs.split(' ') -%}
-dpkg_apt debs/{{ deb }}{{'; '}}
-{%- endfor %}
-
 ## Pre-install the fundamental packages
 RUN apt-get update \
  && apt-get -y install  \
@@ -27,7 +22,16 @@ RUN apt-get update \
     python-dev          \
     wget                \
     cmake               \
- && wget https://github.com/nanomsg/nanomsg/archive/1.0.0.tar.gz \
+    libqt5core5a        \
+    libqt5network5      \
+    libboost-atomic1.71.0
+
+RUN dpkg_apt() { [ -f $1 ] && { dpkg -i $1 || apt-get -y install -f; } || return 1; } ; \
+{% for deb in docker_syncd_mrvl_rpc_debs.split(' ') -%}
+dpkg_apt debs/{{ deb }}{{'; '}}
+{%- endfor %}
+
+RUN wget https://github.com/nanomsg/nanomsg/archive/1.0.0.tar.gz \
  && tar xvfz 1.0.0.tar.gz \
  && cd nanomsg-1.0.0    \
  && mkdir -p build      \

diff --git a/platform/mellanox/docker-syncd-mlnx-rpc/Dockerfile.j2 b/platform/mellanox/docker-syncd-mlnx-rpc/Dockerfile.j2
@@ -11,17 +11,11 @@ RUN apt-get purge -y syncd
 {% if docker_syncd_mlnx_rpc_debs.strip() -%}
 # Copy locally-built Debian package dependencies
 {{ copy_files("debs/", docker_syncd_mlnx_rpc_debs.split(' '), "/debs/") }}
-
-# Install locally-built Debian packages and implicitly install their dependencies
-{{ install_debian_packages(docker_syncd_mlnx_rpc_debs.split(' ')) }}
 {% endif %}
 
 {% if docker_syncd_mlnx_rpc_pydebs.strip() -%}
 # Copy locally-built Debian package dependencies
 {{ copy_files("python-debs/", docker_syncd_mlnx_rpc_pydebs.split(' '), "/debs/") }}
-
-# Install locally-built Debian packages and implicitly install their dependencies
-{{ install_debian_packages(docker_syncd_mlnx_rpc_pydebs.split(' ')) }}
 {% endif %}
 
 ## Pre-install the fundamental packages
@@ -36,7 +30,22 @@ RUN apt-get update \
     python-dev          \
     wget                \
     cmake               \
- && wget https://github.com/nanomsg/nanomsg/archive/1.0.0.tar.gz \
+    libqt5core5a        \
+    libqt5network5      \
+    libboost-atomic1.71.0
+
+{% if docker_syncd_mlnx_rpc_debs.strip() -%}
+# Install locally-built Debian packages and implicitly install their dependencies
+{{ install_debian_packages(docker_syncd_mlnx_rpc_debs.split(' ')) }}
+{% endif %}
+
+{% if docker_syncd_mlnx_rpc_pydebs.strip() -%}
+# Install locally-built Debian packages and implicitly install their dependencies
+{{ install_debian_packages(docker_syncd_mlnx_rpc_pydebs.split(' ')) }}
+{% endif %}
+
+
+RUN wget https://github.com/nanomsg/nanomsg/archive/1.0.0.tar.gz \
  && tar xvfz 1.0.0.tar.gz \
  && cd nanomsg-1.0.0    \
  && mkdir -p build      \

diff --git a/platform/nephos/docker-syncd-nephos-rpc/Dockerfile.j2 b/platform/nephos/docker-syncd-nephos-rpc/Dockerfile.j2
@@ -11,11 +11,6 @@ debs/
 
 RUN apt-get purge -y syncd
 
-RUN dpkg_apt() { [ -f $1 ] && { dpkg -i $1 || apt-get -y install -f; } || return 1; } ; \
-{% for deb in docker_syncd_nephos_rpc_debs.split(' ') -%}
-dpkg_apt debs/{{ deb }}{{'; '}}
-{%- endfor %}
-
 ## Pre-install the fundamental packages
 RUN apt-get update \
  && apt-get -y install  \
@@ -27,7 +22,16 @@ RUN apt-get update \
     python-dev          \
     wget                \
     cmake               \
- && wget https://github.com/nanomsg/nanomsg/archive/1.0.0.tar.gz \
+    libqt5core5a        \
+    libqt5network5      \
+    libboost-atomic1.71.0
+
+RUN dpkg_apt() { [ -f $1 ] && { dpkg -i $1 || apt-get -y install -f; } || return 1; } ; \
+{% for deb in docker_syncd_nephos_rpc_debs.split(' ') -%}
+dpkg_apt debs/{{ deb }}{{'; '}}
+{%- endfor %}
+
+RUN wget https://github.com/nanomsg/nanomsg/archive/1.0.0.tar.gz \
  && tar xvfz 1.0.0.tar.gz \
  && cd nanomsg-1.0.0    \
  && mkdir -p build      \