From 680c1a6b20e0bbb71cf81bf49118b864ba180db5 Mon Sep 17 00:00:00 2001 From: Raphael Defosseux Date: Mon, 8 Jul 2024 12:30:48 +0200 Subject: [PATCH] chore(build): no need for atlas reference in RHEL9/RockyLinux9 images Signed-off-by: Raphael Defosseux --- cmake_targets/tools/build_helper | 1 - docker/Dockerfile.build.rhel9 | 6 +++++- docker/Dockerfile.eNB.rhel9 | 22 +++++++++++++++------- docker/Dockerfile.eNB.rocky | 29 ++++++++++++++--------------- docker/Dockerfile.gNB.aw2s.rhel9 | 18 ++++++++++++------ docker/Dockerfile.gNB.aw2s.rocky | 24 +++++++++++------------- docker/Dockerfile.gNB.rhel9 | 21 +++++++++++++++------ docker/Dockerfile.gNB.rocky | 28 ++++++++++++++-------------- docker/Dockerfile.lteRU.rhel9 | 17 +++++++++++------ docker/Dockerfile.lteUE.rhel9 | 16 ++++++++++++++-- docker/Dockerfile.lteUE.rocky | 25 +++++++++++++------------ docker/Dockerfile.nr-cuup.rhel9 | 5 ----- docker/Dockerfile.nr-cuup.rocky | 5 ----- docker/Dockerfile.nrUE.rhel9 | 22 +++++++++++++++------- docker/Dockerfile.nrUE.rocky | 28 ++++++++++++++-------------- docker/Dockerfile.phySim.rhel9 | 22 ++++++++++++++++++++-- 16 files changed, 173 insertions(+), 116 deletions(-) diff --git a/cmake_targets/tools/build_helper b/cmake_targets/tools/build_helper index c4553765e4..9d28197450 100755 --- a/cmake_targets/tools/build_helper +++ b/cmake_targets/tools/build_helper @@ -614,7 +614,6 @@ check_install_oai_software() { gcc \ gcc-c++ \ git \ - atlas-devel \ pkgconfig \ libconfig-devel \ libffi-devel \ diff --git a/docker/Dockerfile.build.rhel9 b/docker/Dockerfile.build.rhel9 index 8f7d276d03..6adeb62b31 100644 --- a/docker/Dockerfile.build.rhel9 +++ b/docker/Dockerfile.build.rhel9 @@ -39,4 +39,8 @@ RUN /bin/sh oaienv && \ --eNB --gNB --RU --UE --nrUE \ --build-lib "telnetsrv enbscope uescope nrscope" \ -w USRP -t Ethernet \ - --noavx512 + --noavx512 && \ + echo "---- ldd on executables ----" && \ + ldd ran_build/build/*softmodem* ran_build/build/nr-cuup ran_build/build/oairu && \ + echo "---- ldd on shared libraries ----" && \ + ldd ran_build/build/*.so diff --git a/docker/Dockerfile.eNB.rhel9 b/docker/Dockerfile.eNB.rhel9 index 191c8eb2b5..c523ac0b1f 100644 --- a/docker/Dockerfile.eNB.rhel9 +++ b/docker/Dockerfile.eNB.rhel9 @@ -39,8 +39,8 @@ RUN dnf update -y && \ lksctp-tools \ tzdata \ procps-ng \ - atlas \ gdb \ + libusbx \ python3 \ python3-pip \ net-tools \ @@ -71,10 +71,6 @@ COPY --from=enb-build \ COPY --from=enb-base \ /lib64/libconfig.so.11 \ - /lib64/libblas.so.3 \ - /lib64/libcblas.so.3 \ - /lib64/liblapack.so.3 \ - /lib64/liblapacke.so.3 \ /lib64/libboost_chrono.so.1.75.0 \ /lib64/libboost_date_time.so.1.75.0 \ /lib64/libboost_filesystem.so.1.75.0 \ @@ -102,8 +98,20 @@ COPY --from=enb-base /usr/local/share/uhd/rfnoc/ . RUN /bin/bash -c "ln -s /usr/local/lib/liboai_usrpdevif.so /usr/local/lib/liboai_device.so" && \ /bin/bash -c "ln -s /usr/local/lib/liboai_eth_transpro.so /usr/local/lib/liboai_transpro.so" && \ - ldconfig - + ldconfig && \ + echo "---- ldd on executable lte-softmodem ----" && \ + ldd /opt/oai-enb/bin/lte-softmodem && \ + echo "---- ldd on shared libraries ----" && \ + ldd /usr/local/lib/liboai_eth_transpro.so \ + /usr/local/lib/librfsimulator.so \ + /usr/local/lib/liboai_usrpdevif.so \ + /usr/local/lib/libcoding.so \ + /usr/local/lib/libparams_libconfig.so \ + /usr/local/lib/libdfts.so \ + /usr/local/lib/liboai_iqplayer.so \ + /usr/local/lib/libtelnetsrv.so \ + /usr/local/lib/libtelnetsrv_enb.so \ + /usr/local/lib64/libuhd.so.4.4.0 WORKDIR /opt/oai-enb diff --git a/docker/Dockerfile.eNB.rocky b/docker/Dockerfile.eNB.rocky index 51705f0e7b..04243dfda2 100644 --- a/docker/Dockerfile.eNB.rocky +++ b/docker/Dockerfile.eNB.rocky @@ -40,8 +40,8 @@ RUN dnf update -y && \ lksctp-tools \ tzdata \ procps-ng \ - atlas \ gdb \ + libusbx \ python3 \ python3-pip \ net-tools \ @@ -72,10 +72,6 @@ COPY --from=enb-build \ COPY --from=enb-base \ /lib64/libconfig.so.11 \ - /lib64/libblas.so.3 \ - /lib64/libcblas.so.3 \ - /lib64/liblapack.so.3 \ - /lib64/liblapacke.so.3 \ /lib64/libboost_chrono.so.1.75.0 \ /lib64/libboost_date_time.so.1.75.0 \ /lib64/libboost_filesystem.so.1.75.0 \ @@ -104,16 +100,19 @@ COPY --from=enb-base /usr/local/share/uhd/rfnoc/ . RUN /bin/bash -c "ln -s /usr/local/lib/liboai_usrpdevif.so /usr/local/lib/liboai_device.so" && \ /bin/bash -c "ln -s /usr/local/lib/liboai_eth_transpro.so /usr/local/lib/liboai_transpro.so" && \ ldconfig && \ - echo "ldd on lte-softmodem" && ldd /opt/oai-enb/bin/lte-softmodem && \ - echo "ldd on liboai_eth_transpro.so" && ldd /usr/local/lib/liboai_eth_transpro.so && \ - echo "ldd on librfsimulator.so" && ldd /usr/local/lib/librfsimulator.so && \ - echo "ldd on liboai_usrpdevif.so" && ldd /usr/local/lib/liboai_usrpdevif.so && \ - echo "ldd on libcoding.so" && ldd /usr/local/lib/libcoding.so && \ - echo "ldd on libparams_libconfig.so" && ldd /usr/local/lib/libparams_libconfig.so && \ - echo "ldd on libdfts.so" && ldd /usr/local/lib/libdfts.so && \ - echo "ldd on liboai_iqplayer.so" && ldd /usr/local/lib/liboai_iqplayer.so && \ - echo "ldd on libtelnetsrv.so" && ldd /usr/local/lib/libtelnetsrv.so && \ - echo "ldd on libtelnetsrv_enb.so" && ldd /usr/local/lib/libtelnetsrv_enb.so + echo "---- ldd on executable lte-softmodem ----" && \ + ldd /opt/oai-enb/bin/lte-softmodem && \ + echo "---- ldd on shared libraries ----" && \ + ldd /usr/local/lib/liboai_eth_transpro.so \ + /usr/local/lib/librfsimulator.so \ + /usr/local/lib/liboai_usrpdevif.so \ + /usr/local/lib/libcoding.so \ + /usr/local/lib/libparams_libconfig.so \ + /usr/local/lib/libdfts.so \ + /usr/local/lib/liboai_iqplayer.so \ + /usr/local/lib/libtelnetsrv.so \ + /usr/local/lib/libtelnetsrv_enb.so \ + /usr/local/lib64/libuhd.so.4.4.0 WORKDIR /opt/oai-enb diff --git a/docker/Dockerfile.gNB.aw2s.rhel9 b/docker/Dockerfile.gNB.aw2s.rhel9 index 52d3d8b1fc..926e2a2e75 100644 --- a/docker/Dockerfile.gNB.aw2s.rhel9 +++ b/docker/Dockerfile.gNB.aw2s.rhel9 @@ -46,7 +46,6 @@ RUN dnf update -y && \ procps-ng \ libXpm \ libX11 \ - atlas \ gdb \ lksctp-tools \ tzdata \ @@ -75,15 +74,22 @@ COPY --from=gnb-build \ COPY --from=gnb-base \ /lib64/libconfig.so.11 \ /lib64/libforms.so.2 \ - /lib64/libblas.so.3 \ - /lib64/libcblas.so.3 \ - /lib64/liblapack.so.3 \ - /lib64/liblapacke.so.3 \ /lib64/ RUN ln -s /usr/local/lib/libaw2sori_transpro.so /usr/local/lib/libthirdparty_transpro.so && \ ln -s /usr/local/lib/liboai_eth_transpro.so /usr/local/lib/liboai_transpro.so && \ - ldconfig + ldconfig && \ + echo "---- ldd on executable nr-softmodem ----" && \ + ldd /opt/oai-gnb-aw2s/bin/nr-softmodem && \ + echo "---- ldd on shared libraries ----" && \ + ldd /usr/local/lib/liboai_eth_transpro.so \ + /usr/local/lib/librfsimulator.so \ + /usr/local/lib/libaw2sori_transpro.so \ + /usr/local/lib/libcoding.so \ + /usr/local/lib/libparams_libconfig.so \ + /usr/local/lib/libdfts.so \ + /usr/local/lib/libldpc*.so \ + /usr/local/lib/libtelnetsrv.so WORKDIR /opt/oai-gnb-aw2s diff --git a/docker/Dockerfile.gNB.aw2s.rocky b/docker/Dockerfile.gNB.aw2s.rocky index 5758e674f6..269eb4be3f 100644 --- a/docker/Dockerfile.gNB.aw2s.rocky +++ b/docker/Dockerfile.gNB.aw2s.rocky @@ -47,7 +47,6 @@ RUN dnf update -y && \ procps-ng \ libXpm \ libX11 \ - atlas \ gdb \ lksctp-tools \ tzdata \ @@ -76,23 +75,22 @@ COPY --from=gnb-build \ COPY --from=gnb-base \ /lib64/libconfig.so.11 \ /lib64/libforms.so.2 \ - /lib64/libblas.so.3 \ - /lib64/libcblas.so.3 \ - /lib64/liblapack.so.3 \ - /lib64/liblapacke.so.3 \ /lib64/ RUN ln -s /usr/local/lib/libaw2sori_transpro.so /usr/local/lib/libthirdparty_transpro.so && \ ln -s /usr/local/lib/liboai_eth_transpro.so /usr/local/lib/liboai_transpro.so && \ ldconfig && \ - echo "ldd on nr-softmodem" && ldd /opt/oai-gnb-aw2s/bin/nr-softmodem && \ - echo "ldd on liboai_eth_transpro.so" && ldd /usr/local/lib/liboai_eth_transpro.so && \ - echo "ldd on librfsimulator.so" && ldd /usr/local/lib/librfsimulator.so && \ - echo "ldd on libthirdparty_transpro.so" && ldd /usr/local/lib/libthirdparty_transpro.so && \ - echo "ldd on libcoding.so" && ldd /usr/local/lib/libcoding.so && \ - echo "ldd on libparams_libconfig.so" && ldd /usr/local/lib/libparams_libconfig.so && \ - echo "ldd on libdfts.so" && ldd /usr/local/lib/libdfts.so && \ - echo "ldd on libtelnetsrv.so" && ldd /usr/local/lib/libtelnetsrv.so + echo "---- ldd on executable nr-softmodem ----" && \ + ldd /opt/oai-gnb-aw2s/bin/nr-softmodem && \ + echo "---- ldd on shared libraries ----" && \ + ldd /usr/local/lib/liboai_eth_transpro.so \ + /usr/local/lib/librfsimulator.so \ + /usr/local/lib/libaw2sori_transpro.so \ + /usr/local/lib/libcoding.so \ + /usr/local/lib/libparams_libconfig.so \ + /usr/local/lib/libdfts.so \ + /usr/local/lib/libldpc*.so \ + /usr/local/lib/libtelnetsrv.so WORKDIR /opt/oai-gnb-aw2s diff --git a/docker/Dockerfile.gNB.rhel9 b/docker/Dockerfile.gNB.rhel9 index 358782519f..d4f20b1cd0 100644 --- a/docker/Dockerfile.gNB.rhel9 +++ b/docker/Dockerfile.gNB.rhel9 @@ -39,7 +39,7 @@ RUN dnf update -y && \ procps-ng \ libXpm \ libX11 \ - atlas \ + libusbx \ lksctp-tools \ tzdata \ gdb \ @@ -72,10 +72,6 @@ COPY --from=gnb-build \ COPY --from=gnb-base \ /lib64/libconfig.so.11 \ /lib64/libforms.so.2 \ - /lib64/libblas.so.3 \ - /lib64/libcblas.so.3 \ - /lib64/liblapack.so.3 \ - /lib64/liblapacke.so.3 \ /lib64/libboost_chrono.so.1.75.0 \ /lib64/libboost_date_time.so.1.75.0 \ /lib64/libboost_filesystem.so.1.75.0 \ @@ -101,7 +97,20 @@ WORKDIR /usr/local/share/uhd/rfnoc COPY --from=gnb-base /usr/local/share/uhd/rfnoc/ . RUN /bin/bash -c "ln -s /usr/local/lib/liboai_usrpdevif.so /usr/local/lib/liboai_device.so" && \ - ldconfig + ldconfig && \ + echo "---- ldd on executable nr-softmodem ----" && \ + ldd /opt/oai-gnb/bin/nr-softmodem && \ + echo "---- ldd on shared libraries ----" && \ + ldd /usr/local/lib/liboai_eth_transpro.so \ + /usr/local/lib/librfsimulator.so \ + /usr/local/lib/liboai_usrpdevif.so \ + /usr/local/lib/libcoding.so \ + /usr/local/lib/libparams_libconfig.so \ + /usr/local/lib/libdfts.so \ + /usr/local/lib/libldpc*.so \ + /usr/local/lib/libtelnetsrv.so \ + /usr/local/lib/libtelnetsrv_ci.so \ + /usr/local/lib64/libuhd.so.4.4.0 WORKDIR /opt/oai-gnb #EXPOSE 2152/udp # S1U, GTP/UDP diff --git a/docker/Dockerfile.gNB.rocky b/docker/Dockerfile.gNB.rocky index d4c8504bb8..2e59a0d230 100644 --- a/docker/Dockerfile.gNB.rocky +++ b/docker/Dockerfile.gNB.rocky @@ -40,7 +40,7 @@ RUN dnf update -y && \ procps-ng \ libXpm \ libX11 \ - atlas \ + libusbx \ lksctp-tools \ tzdata \ gdb \ @@ -73,10 +73,6 @@ COPY --from=gnb-build \ COPY --from=gnb-base \ /lib64/libconfig.so.11 \ /lib64/libforms.so.2 \ - /lib64/libblas.so.3 \ - /lib64/libcblas.so.3 \ - /lib64/liblapack.so.3 \ - /lib64/liblapacke.so.3 \ /lib64/libboost_chrono.so.1.75.0 \ /lib64/libboost_date_time.so.1.75.0 \ /lib64/libboost_filesystem.so.1.75.0 \ @@ -103,15 +99,19 @@ COPY --from=gnb-base /usr/local/share/uhd/rfnoc/ . RUN /bin/bash -c "ln -s /usr/local/lib/liboai_usrpdevif.so /usr/local/lib/liboai_device.so" && \ ldconfig && \ - echo "ldd on nr-softmodem" && ldd /opt/oai-gnb/bin/nr-softmodem && \ - echo "ldd on liboai_eth_transpro.so" && ldd /usr/local/lib/liboai_eth_transpro.so && \ - echo "ldd on librfsimulator.so" && ldd /usr/local/lib/librfsimulator.so && \ - echo "ldd on liboai_usrpdevif.so" && ldd /usr/local/lib/liboai_usrpdevif.so && \ - echo "ldd on libcoding.so" && ldd /usr/local/lib/libcoding.so && \ - echo "ldd on libparams_libconfig.so" && ldd /usr/local/lib/libparams_libconfig.so && \ - echo "ldd on libdfts.so" && ldd /usr/local/lib/libdfts.so && \ - echo "ldd on libtelnetsrv.so" && ldd /usr/local/lib/libtelnetsrv.so && \ - echo "ldd on libtelnetsrv_ci.so" && ldd /usr/local/lib/libtelnetsrv_ci.so + echo "---- ldd on executable nr-softmodem ----" && \ + ldd /opt/oai-gnb/bin/nr-softmodem && \ + echo "---- ldd on shared libraries ----" && \ + ldd /usr/local/lib/liboai_eth_transpro.so \ + /usr/local/lib/librfsimulator.so \ + /usr/local/lib/liboai_usrpdevif.so \ + /usr/local/lib/libcoding.so \ + /usr/local/lib/libparams_libconfig.so \ + /usr/local/lib/libdfts.so \ + /usr/local/lib/libldpc*.so \ + /usr/local/lib/libtelnetsrv.so \ + /usr/local/lib/libtelnetsrv_ci.so \ + /usr/local/lib64/libuhd.so.4.4.0 WORKDIR /opt/oai-gnb #EXPOSE 2152/udp # S1U, GTP/UDP diff --git a/docker/Dockerfile.lteRU.rhel9 b/docker/Dockerfile.lteRU.rhel9 index 30e996600c..d57c88bbf4 100644 --- a/docker/Dockerfile.lteRU.rhel9 +++ b/docker/Dockerfile.lteRU.rhel9 @@ -38,7 +38,7 @@ RUN dnf update -y && \ dnf install -y \ tzdata \ procps-ng \ - atlas \ + libusbx \ gdb \ python3 \ python3-pip \ @@ -65,10 +65,6 @@ COPY --from=ru-build \ COPY --from=ru-base \ /lib64/libconfig.so.11 \ - /lib64/libblas.so.3 \ - /lib64/libcblas.so.3 \ - /lib64/liblapack.so.3 \ - /lib64/liblapacke.so.3 \ /lib64/libboost_chrono.so.1.75.0 \ /lib64/libboost_date_time.so.1.75.0 \ /lib64/libboost_filesystem.so.1.75.0 \ @@ -91,7 +87,16 @@ WORKDIR /usr/local/share/uhd/rfnoc COPY --from=ru-base /usr/local/share/uhd/rfnoc/ . RUN /bin/bash -c "ln -s /usr/local/lib/liboai_usrpdevif.so /usr/local/lib/liboai_device.so" && \ - ldconfig + ldconfig && \ + echo "---- ldd on executable oairu ----" && \ + ldd /opt/oai-lte-ru/bin/oairu && \ + echo "---- ldd on shared libraries ----" && \ + ldd /usr/local/lib/liboai_eth_transpro.so \ + /usr/local/lib/librfsimulator.so \ + /usr/local/lib/liboai_usrpdevif.so \ + /usr/local/lib/libparams_libconfig.so \ + /usr/local/lib/libdfts.so \ + /usr/local/lib64/libuhd.so.4.4.0 WORKDIR /opt/oai-lte-ru diff --git a/docker/Dockerfile.lteUE.rhel9 b/docker/Dockerfile.lteUE.rhel9 index a9a95e23a6..84854c2104 100644 --- a/docker/Dockerfile.lteUE.rhel9 +++ b/docker/Dockerfile.lteUE.rhel9 @@ -39,7 +39,8 @@ RUN dnf update -y && \ lksctp-tools \ procps-ng \ tzdata \ - atlas \ + libusbx \ + libgfortran \ gdb \ python3 \ python3-pip \ @@ -101,7 +102,18 @@ WORKDIR /usr/local/share/uhd/rfnoc COPY --from=lte-ue-base /usr/local/share/uhd/rfnoc/ . RUN /bin/bash -c "ln -s /usr/local/lib/liboai_usrpdevif.so /usr/local/lib/liboai_device.so" && \ - ldconfig + ldconfig && \ + echo "---- ldd on executable lte-uesoftmodem ----" && \ + ldd /opt/oai-lte-ue/bin/lte-uesoftmodem && \ + echo "---- ldd on shared libraries ----" && \ + ldd /usr/local/lib/liboai_eth_transpro.so \ + /usr/local/lib/librfsimulator.so \ + /usr/local/lib/liboai_usrpdevif.so \ + /usr/local/lib/libcoding.so \ + /usr/local/lib/libparams_libconfig.so \ + /usr/local/lib/libdfts.so \ + /usr/local/lib/libtelnetsrv.so \ + /usr/local/lib64/libuhd.so.4.4.0 WORKDIR /opt/oai-lte-ue COPY --from=lte-ue-base /tini /tini diff --git a/docker/Dockerfile.lteUE.rocky b/docker/Dockerfile.lteUE.rocky index 95845a0fd4..54b5dfa52a 100644 --- a/docker/Dockerfile.lteUE.rocky +++ b/docker/Dockerfile.lteUE.rocky @@ -40,7 +40,8 @@ RUN dnf update -y && \ lksctp-tools \ procps-ng \ tzdata \ - atlas \ + libusbx \ + libgfortran \ gdb \ python3 \ python3-pip \ @@ -103,17 +104,17 @@ COPY --from=lte-ue-base /usr/local/share/uhd/rfnoc/ . RUN /bin/bash -c "ln -s /usr/local/lib/liboai_usrpdevif.so /usr/local/lib/liboai_device.so" && \ ldconfig && \ - echo "ldd on lte-uesoftmodem" && ldd /opt/oai-lte-ue/bin/lte-uesoftmodem && \ - echo "ldd on conf2uedata" && ldd /opt/oai-lte-ue/bin/conf2uedata && \ - echo "ldd on nvram" && ldd /opt/oai-lte-ue/bin/nvram && \ - echo "ldd on usim" && ldd /opt/oai-lte-ue/bin/usim && \ - echo "ldd on liboai_eth_transpro.so" && ldd /usr/local/lib/liboai_eth_transpro.so && \ - echo "ldd on librfsimulator.so" && ldd /usr/local/lib/librfsimulator.so && \ - echo "ldd on liboai_usrpdevif.so" && ldd /usr/local/lib/liboai_usrpdevif.so && \ - echo "ldd on libcoding.so" && ldd /usr/local/lib/libcoding.so && \ - echo "ldd on libparams_libconfig.so" && ldd /usr/local/lib/libparams_libconfig.so && \ - echo "ldd on libdfts.so" && ldd /usr/local/lib/libdfts.so && \ - echo "ldd on libtelnetsrv.so" && ldd /usr/local/lib/libtelnetsrv.so + echo "---- ldd on executable lte-uesoftmodem ----" && \ + ldd /opt/oai-lte-ue/bin/lte-uesoftmodem && \ + echo "---- ldd on shared libraries ----" && \ + ldd /usr/local/lib/liboai_eth_transpro.so \ + /usr/local/lib/librfsimulator.so \ + /usr/local/lib/liboai_usrpdevif.so \ + /usr/local/lib/libcoding.so \ + /usr/local/lib/libparams_libconfig.so \ + /usr/local/lib/libdfts.so \ + /usr/local/lib/libtelnetsrv.so \ + /usr/local/lib64/libuhd.so.4.4.0 WORKDIR /opt/oai-lte-ue COPY --from=lte-ue-base /tini /tini diff --git a/docker/Dockerfile.nr-cuup.rhel9 b/docker/Dockerfile.nr-cuup.rhel9 index 00d6236bfe..c10560e13f 100644 --- a/docker/Dockerfile.nr-cuup.rhel9 +++ b/docker/Dockerfile.nr-cuup.rhel9 @@ -41,7 +41,6 @@ RUN yum repolist --disablerepo=* && \ procps-ng \ lksctp-tools \ tzdata \ - atlas \ net-tools \ iputils && \ echo "/usr/local/lib" > /etc/ld.so.conf.d/local-lib.conf && \ @@ -60,10 +59,6 @@ COPY --from=gnb-build \ COPY --from=gnb-base \ /lib64/libconfig.so.11 \ - /lib64/libblas.so.3 \ - /lib64/libcblas.so.3 \ - /lib64/liblapack.so.3 \ - /lib64/liblapacke.so.3 \ /lib64/ RUN ldconfig && \ diff --git a/docker/Dockerfile.nr-cuup.rocky b/docker/Dockerfile.nr-cuup.rocky index e3dc1bf5be..e6803bce1a 100644 --- a/docker/Dockerfile.nr-cuup.rocky +++ b/docker/Dockerfile.nr-cuup.rocky @@ -42,7 +42,6 @@ RUN yum repolist --disablerepo=* && \ procps-ng \ lksctp-tools \ tzdata \ - atlas \ net-tools \ iputils && \ echo "/usr/local/lib" > /etc/ld.so.conf.d/local-lib.conf && \ @@ -61,10 +60,6 @@ COPY --from=gnb-build \ COPY --from=gnb-base \ /lib64/libconfig.so.11 \ - /lib64/libblas.so.3 \ - /lib64/libcblas.so.3 \ - /lib64/liblapack.so.3 \ - /lib64/liblapacke.so.3 \ /lib64/ RUN ldconfig && \ diff --git a/docker/Dockerfile.nrUE.rhel9 b/docker/Dockerfile.nrUE.rhel9 index 14d9f6c7f7..7d5894c618 100644 --- a/docker/Dockerfile.nrUE.rhel9 +++ b/docker/Dockerfile.nrUE.rhel9 @@ -42,7 +42,7 @@ RUN dnf update -y && \ net-tools \ iputils \ iproute \ - atlas \ + libusbx \ gdb \ python3 \ python3-pip \ @@ -74,10 +74,6 @@ COPY --from=nr-ue-build \ COPY --from=nr-ue-base \ /lib64/libconfig.so.11 \ - /lib64/libblas.so.3 \ - /lib64/libcblas.so.3 \ - /lib64/liblapack.so.3 \ - /lib64/liblapacke.so.3 \ /lib64/libforms.so.2 \ /lib64/libboost_chrono.so.1.75.0 \ /lib64/libboost_date_time.so.1.75.0 \ @@ -104,8 +100,20 @@ WORKDIR /usr/local/share/uhd/rfnoc COPY --from=nr-ue-base /usr/local/share/uhd/rfnoc/ . RUN /bin/bash -c "ln -s /usr/local/lib/liboai_usrpdevif.so /usr/local/lib/liboai_device.so" && \ - ldconfig - + ldconfig && \ + echo "---- ldd on executable nr-uesoftmodem ----" && \ + ldd /opt/oai-nr-ue/bin/nr-uesoftmodem && \ + echo "---- ldd on shared libraries ----" && \ + ldd /usr/local/lib/liboai_eth_transpro.so \ + /usr/local/lib/librfsimulator.so \ + /usr/local/lib/liboai_usrpdevif.so \ + /usr/local/lib/libcoding.so \ + /usr/local/lib/libparams_libconfig.so \ + /usr/local/lib/libdfts.so \ + /usr/local/lib/libldpc*.so \ + /usr/local/lib/libtelnetsrv.so \ + /usr/local/lib/libtelnetsrv_5Gue.so \ + /usr/local/lib64/libuhd.so.4.4.0 WORKDIR /opt/oai-nr-ue COPY --from=nr-ue-base /tini /tini diff --git a/docker/Dockerfile.nrUE.rocky b/docker/Dockerfile.nrUE.rocky index 1ffccd60d5..88d6bd73ff 100644 --- a/docker/Dockerfile.nrUE.rocky +++ b/docker/Dockerfile.nrUE.rocky @@ -43,7 +43,7 @@ RUN dnf update -y && \ net-tools \ iputils \ iproute \ - atlas \ + libusbx \ gdb \ python3 \ python3-pip \ @@ -75,10 +75,6 @@ COPY --from=nr-ue-build \ COPY --from=nr-ue-base \ /lib64/libconfig.so.11 \ - /lib64/libblas.so.3 \ - /lib64/libcblas.so.3 \ - /lib64/liblapack.so.3 \ - /lib64/liblapacke.so.3 \ /lib64/libforms.so.2 \ /lib64/libboost_chrono.so.1.75.0 \ /lib64/libboost_date_time.so.1.75.0 \ @@ -106,15 +102,19 @@ COPY --from=nr-ue-base /usr/local/share/uhd/rfnoc/ . RUN /bin/bash -c "ln -s /usr/local/lib/liboai_usrpdevif.so /usr/local/lib/liboai_device.so" && \ ldconfig && \ - echo "ldd on nr-uesoftmodem" && ldd /opt/oai-nr-ue/bin/nr-uesoftmodem && \ - echo "ldd on liboai_eth_transpro.so" && ldd /usr/local/lib/liboai_eth_transpro.so && \ - echo "ldd on librfsimulator.so" && ldd /usr/local/lib/librfsimulator.so && \ - echo "ldd on liboai_usrpdevif.so" && ldd /usr/local/lib/liboai_usrpdevif.so && \ - echo "ldd on libcoding.so" && ldd /usr/local/lib/libcoding.so && \ - echo "ldd on libparams_libconfig.so" && ldd /usr/local/lib/libparams_libconfig.so && \ - echo "ldd on libdfts.so" && ldd /usr/local/lib/libdfts.so && \ - echo "ldd on libtelnetsrv.so" && ldd /usr/local/lib/libtelnetsrv.so && \ - echo "ldd on libtelnetsrv_5Gue.so" && ldd /usr/local/lib/libtelnetsrv_5Gue.so + echo "---- ldd on executable nr-uesoftmodem ----" && \ + ldd /opt/oai-nr-ue/bin/nr-uesoftmodem && \ + echo "---- ldd on shared libraries ----" && \ + ldd /usr/local/lib/liboai_eth_transpro.so \ + /usr/local/lib/librfsimulator.so \ + /usr/local/lib/liboai_usrpdevif.so \ + /usr/local/lib/libcoding.so \ + /usr/local/lib/libparams_libconfig.so \ + /usr/local/lib/libdfts.so \ + /usr/local/lib/libldpc*.so \ + /usr/local/lib/libtelnetsrv.so \ + /usr/local/lib/libtelnetsrv_5Gue.so \ + /usr/local/lib64/libuhd.so.4.4.0 WORKDIR /opt/oai-nr-ue COPY --from=nr-ue-base /tini /tini diff --git a/docker/Dockerfile.phySim.rhel9 b/docker/Dockerfile.phySim.rhel9 index a5a4863a64..ccfe8505a8 100644 --- a/docker/Dockerfile.phySim.rhel9 +++ b/docker/Dockerfile.phySim.rhel9 @@ -47,7 +47,7 @@ RUN dnf update -y && \ dnf install -y \ lksctp-tools \ tzdata \ - atlas \ + libgfortran \ hostname \ sudo \ procps-ng \ @@ -94,7 +94,25 @@ COPY --from=phy-sim-build \ /oai-ran/cmake_targets/ran_build/build/libldpc*.so \ /usr/local/lib/ -RUN ldconfig +RUN ldconfig && \ + echo "---- ldd on physim executables ----" && \ + ldd /opt/oai-physim/bin/dlsim \ + /opt/oai-physim/bin/nr_dlsim \ + /opt/oai-physim/bin/nr_prachsim \ + /opt/oai-physim/bin/nr_ulschsim \ + /opt/oai-physim/bin/polartest \ + /opt/oai-physim/bin/ulsim \ + /opt/oai-physim/bin/ldpctest \ + /opt/oai-physim/bin/nr_dlschsim \ + /opt/oai-physim/bin/nr_pbchsim \ + /opt/oai-physim/bin/nr_psbchsim \ + /opt/oai-physim/bin/nr_pucchsim \ + /opt/oai-physim/bin/nr_ulsim \ + /opt/oai-physim/bin/smallblocktest && \ + echo "---- ldd on shared libraries ----" && \ + ldd /usr/local/lib/libcoding.so \ + /usr/local/lib/libdfts.so \ + /usr/local/lib/libldpc*.so # Copy some executables WORKDIR /usr/bin/