Commit 680c1a6b authored by Raphael Defosseux's avatar Raphael Defosseux

chore(build): no need for atlas reference in RHEL9/RockyLinux9 images

Signed-off-by: default avatarRaphael Defosseux <raphael.defosseux@eurecom.fr>
parent b8012a98
...@@ -614,7 +614,6 @@ check_install_oai_software() { ...@@ -614,7 +614,6 @@ check_install_oai_software() {
gcc \ gcc \
gcc-c++ \ gcc-c++ \
git \ git \
atlas-devel \
pkgconfig \ pkgconfig \
libconfig-devel \ libconfig-devel \
libffi-devel \ libffi-devel \
......
...@@ -39,4 +39,8 @@ RUN /bin/sh oaienv && \ ...@@ -39,4 +39,8 @@ RUN /bin/sh oaienv && \
--eNB --gNB --RU --UE --nrUE \ --eNB --gNB --RU --UE --nrUE \
--build-lib "telnetsrv enbscope uescope nrscope" \ --build-lib "telnetsrv enbscope uescope nrscope" \
-w USRP -t Ethernet \ -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
...@@ -39,8 +39,8 @@ RUN dnf update -y && \ ...@@ -39,8 +39,8 @@ RUN dnf update -y && \
lksctp-tools \ lksctp-tools \
tzdata \ tzdata \
procps-ng \ procps-ng \
atlas \
gdb \ gdb \
libusbx \
python3 \ python3 \
python3-pip \ python3-pip \
net-tools \ net-tools \
...@@ -71,10 +71,6 @@ COPY --from=enb-build \ ...@@ -71,10 +71,6 @@ COPY --from=enb-build \
COPY --from=enb-base \ COPY --from=enb-base \
/lib64/libconfig.so.11 \ /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_chrono.so.1.75.0 \
/lib64/libboost_date_time.so.1.75.0 \ /lib64/libboost_date_time.so.1.75.0 \
/lib64/libboost_filesystem.so.1.75.0 \ /lib64/libboost_filesystem.so.1.75.0 \
...@@ -102,8 +98,20 @@ COPY --from=enb-base /usr/local/share/uhd/rfnoc/ . ...@@ -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" && \ 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" && \ /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 WORKDIR /opt/oai-enb
......
...@@ -40,8 +40,8 @@ RUN dnf update -y && \ ...@@ -40,8 +40,8 @@ RUN dnf update -y && \
lksctp-tools \ lksctp-tools \
tzdata \ tzdata \
procps-ng \ procps-ng \
atlas \
gdb \ gdb \
libusbx \
python3 \ python3 \
python3-pip \ python3-pip \
net-tools \ net-tools \
...@@ -72,10 +72,6 @@ COPY --from=enb-build \ ...@@ -72,10 +72,6 @@ COPY --from=enb-build \
COPY --from=enb-base \ COPY --from=enb-base \
/lib64/libconfig.so.11 \ /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_chrono.so.1.75.0 \
/lib64/libboost_date_time.so.1.75.0 \ /lib64/libboost_date_time.so.1.75.0 \
/lib64/libboost_filesystem.so.1.75.0 \ /lib64/libboost_filesystem.so.1.75.0 \
...@@ -104,16 +100,19 @@ COPY --from=enb-base /usr/local/share/uhd/rfnoc/ . ...@@ -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" && \ 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" && \ /bin/bash -c "ln -s /usr/local/lib/liboai_eth_transpro.so /usr/local/lib/liboai_transpro.so" && \
ldconfig && \ ldconfig && \
echo "ldd on lte-softmodem" && ldd /opt/oai-enb/bin/lte-softmodem && \ echo "---- ldd on executable lte-softmodem ----" && \
echo "ldd on liboai_eth_transpro.so" && ldd /usr/local/lib/liboai_eth_transpro.so && \ ldd /opt/oai-enb/bin/lte-softmodem && \
echo "ldd on librfsimulator.so" && ldd /usr/local/lib/librfsimulator.so && \ echo "---- ldd on shared libraries ----" && \
echo "ldd on liboai_usrpdevif.so" && ldd /usr/local/lib/liboai_usrpdevif.so && \ ldd /usr/local/lib/liboai_eth_transpro.so \
echo "ldd on libcoding.so" && ldd /usr/local/lib/libcoding.so && \ /usr/local/lib/librfsimulator.so \
echo "ldd on libparams_libconfig.so" && ldd /usr/local/lib/libparams_libconfig.so && \ /usr/local/lib/liboai_usrpdevif.so \
echo "ldd on libdfts.so" && ldd /usr/local/lib/libdfts.so && \ /usr/local/lib/libcoding.so \
echo "ldd on liboai_iqplayer.so" && ldd /usr/local/lib/liboai_iqplayer.so && \ /usr/local/lib/libparams_libconfig.so \
echo "ldd on libtelnetsrv.so" && ldd /usr/local/lib/libtelnetsrv.so && \ /usr/local/lib/libdfts.so \
echo "ldd on libtelnetsrv_enb.so" && ldd /usr/local/lib/libtelnetsrv_enb.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 WORKDIR /opt/oai-enb
......
...@@ -46,7 +46,6 @@ RUN dnf update -y && \ ...@@ -46,7 +46,6 @@ RUN dnf update -y && \
procps-ng \ procps-ng \
libXpm \ libXpm \
libX11 \ libX11 \
atlas \
gdb \ gdb \
lksctp-tools \ lksctp-tools \
tzdata \ tzdata \
...@@ -75,15 +74,22 @@ COPY --from=gnb-build \ ...@@ -75,15 +74,22 @@ COPY --from=gnb-build \
COPY --from=gnb-base \ COPY --from=gnb-base \
/lib64/libconfig.so.11 \ /lib64/libconfig.so.11 \
/lib64/libforms.so.2 \ /lib64/libforms.so.2 \
/lib64/libblas.so.3 \
/lib64/libcblas.so.3 \
/lib64/liblapack.so.3 \
/lib64/liblapacke.so.3 \
/lib64/ /lib64/
RUN ln -s /usr/local/lib/libaw2sori_transpro.so /usr/local/lib/libthirdparty_transpro.so && \ 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 && \ 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 WORKDIR /opt/oai-gnb-aw2s
......
...@@ -47,7 +47,6 @@ RUN dnf update -y && \ ...@@ -47,7 +47,6 @@ RUN dnf update -y && \
procps-ng \ procps-ng \
libXpm \ libXpm \
libX11 \ libX11 \
atlas \
gdb \ gdb \
lksctp-tools \ lksctp-tools \
tzdata \ tzdata \
...@@ -76,23 +75,22 @@ COPY --from=gnb-build \ ...@@ -76,23 +75,22 @@ COPY --from=gnb-build \
COPY --from=gnb-base \ COPY --from=gnb-base \
/lib64/libconfig.so.11 \ /lib64/libconfig.so.11 \
/lib64/libforms.so.2 \ /lib64/libforms.so.2 \
/lib64/libblas.so.3 \
/lib64/libcblas.so.3 \
/lib64/liblapack.so.3 \
/lib64/liblapacke.so.3 \
/lib64/ /lib64/
RUN ln -s /usr/local/lib/libaw2sori_transpro.so /usr/local/lib/libthirdparty_transpro.so && \ 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 && \ ln -s /usr/local/lib/liboai_eth_transpro.so /usr/local/lib/liboai_transpro.so && \
ldconfig && \ ldconfig && \
echo "ldd on nr-softmodem" && ldd /opt/oai-gnb-aw2s/bin/nr-softmodem && \ echo "---- ldd on executable nr-softmodem ----" && \
echo "ldd on liboai_eth_transpro.so" && ldd /usr/local/lib/liboai_eth_transpro.so && \ ldd /opt/oai-gnb-aw2s/bin/nr-softmodem && \
echo "ldd on librfsimulator.so" && ldd /usr/local/lib/librfsimulator.so && \ echo "---- ldd on shared libraries ----" && \
echo "ldd on libthirdparty_transpro.so" && ldd /usr/local/lib/libthirdparty_transpro.so && \ ldd /usr/local/lib/liboai_eth_transpro.so \
echo "ldd on libcoding.so" && ldd /usr/local/lib/libcoding.so && \ /usr/local/lib/librfsimulator.so \
echo "ldd on libparams_libconfig.so" && ldd /usr/local/lib/libparams_libconfig.so && \ /usr/local/lib/libaw2sori_transpro.so \
echo "ldd on libdfts.so" && ldd /usr/local/lib/libdfts.so && \ /usr/local/lib/libcoding.so \
echo "ldd on libtelnetsrv.so" && ldd /usr/local/lib/libtelnetsrv.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 WORKDIR /opt/oai-gnb-aw2s
......
...@@ -39,7 +39,7 @@ RUN dnf update -y && \ ...@@ -39,7 +39,7 @@ RUN dnf update -y && \
procps-ng \ procps-ng \
libXpm \ libXpm \
libX11 \ libX11 \
atlas \ libusbx \
lksctp-tools \ lksctp-tools \
tzdata \ tzdata \
gdb \ gdb \
...@@ -72,10 +72,6 @@ COPY --from=gnb-build \ ...@@ -72,10 +72,6 @@ COPY --from=gnb-build \
COPY --from=gnb-base \ COPY --from=gnb-base \
/lib64/libconfig.so.11 \ /lib64/libconfig.so.11 \
/lib64/libforms.so.2 \ /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_chrono.so.1.75.0 \
/lib64/libboost_date_time.so.1.75.0 \ /lib64/libboost_date_time.so.1.75.0 \
/lib64/libboost_filesystem.so.1.75.0 \ /lib64/libboost_filesystem.so.1.75.0 \
...@@ -101,7 +97,20 @@ WORKDIR /usr/local/share/uhd/rfnoc ...@@ -101,7 +97,20 @@ WORKDIR /usr/local/share/uhd/rfnoc
COPY --from=gnb-base /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" && \ 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 WORKDIR /opt/oai-gnb
#EXPOSE 2152/udp # S1U, GTP/UDP #EXPOSE 2152/udp # S1U, GTP/UDP
......
...@@ -40,7 +40,7 @@ RUN dnf update -y && \ ...@@ -40,7 +40,7 @@ RUN dnf update -y && \
procps-ng \ procps-ng \
libXpm \ libXpm \
libX11 \ libX11 \
atlas \ libusbx \
lksctp-tools \ lksctp-tools \
tzdata \ tzdata \
gdb \ gdb \
...@@ -73,10 +73,6 @@ COPY --from=gnb-build \ ...@@ -73,10 +73,6 @@ COPY --from=gnb-build \
COPY --from=gnb-base \ COPY --from=gnb-base \
/lib64/libconfig.so.11 \ /lib64/libconfig.so.11 \
/lib64/libforms.so.2 \ /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_chrono.so.1.75.0 \
/lib64/libboost_date_time.so.1.75.0 \ /lib64/libboost_date_time.so.1.75.0 \
/lib64/libboost_filesystem.so.1.75.0 \ /lib64/libboost_filesystem.so.1.75.0 \
...@@ -103,15 +99,19 @@ COPY --from=gnb-base /usr/local/share/uhd/rfnoc/ . ...@@ -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" && \ RUN /bin/bash -c "ln -s /usr/local/lib/liboai_usrpdevif.so /usr/local/lib/liboai_device.so" && \
ldconfig && \ ldconfig && \
echo "ldd on nr-softmodem" && ldd /opt/oai-gnb/bin/nr-softmodem && \ echo "---- ldd on executable nr-softmodem ----" && \
echo "ldd on liboai_eth_transpro.so" && ldd /usr/local/lib/liboai_eth_transpro.so && \ ldd /opt/oai-gnb/bin/nr-softmodem && \
echo "ldd on librfsimulator.so" && ldd /usr/local/lib/librfsimulator.so && \ echo "---- ldd on shared libraries ----" && \
echo "ldd on liboai_usrpdevif.so" && ldd /usr/local/lib/liboai_usrpdevif.so && \ ldd /usr/local/lib/liboai_eth_transpro.so \
echo "ldd on libcoding.so" && ldd /usr/local/lib/libcoding.so && \ /usr/local/lib/librfsimulator.so \
echo "ldd on libparams_libconfig.so" && ldd /usr/local/lib/libparams_libconfig.so && \ /usr/local/lib/liboai_usrpdevif.so \
echo "ldd on libdfts.so" && ldd /usr/local/lib/libdfts.so && \ /usr/local/lib/libcoding.so \
echo "ldd on libtelnetsrv.so" && ldd /usr/local/lib/libtelnetsrv.so && \ /usr/local/lib/libparams_libconfig.so \
echo "ldd on libtelnetsrv_ci.so" && ldd /usr/local/lib/libtelnetsrv_ci.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 WORKDIR /opt/oai-gnb
#EXPOSE 2152/udp # S1U, GTP/UDP #EXPOSE 2152/udp # S1U, GTP/UDP
......
...@@ -38,7 +38,7 @@ RUN dnf update -y && \ ...@@ -38,7 +38,7 @@ RUN dnf update -y && \
dnf install -y \ dnf install -y \
tzdata \ tzdata \
procps-ng \ procps-ng \
atlas \ libusbx \
gdb \ gdb \
python3 \ python3 \
python3-pip \ python3-pip \
...@@ -65,10 +65,6 @@ COPY --from=ru-build \ ...@@ -65,10 +65,6 @@ COPY --from=ru-build \
COPY --from=ru-base \ COPY --from=ru-base \
/lib64/libconfig.so.11 \ /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_chrono.so.1.75.0 \
/lib64/libboost_date_time.so.1.75.0 \ /lib64/libboost_date_time.so.1.75.0 \
/lib64/libboost_filesystem.so.1.75.0 \ /lib64/libboost_filesystem.so.1.75.0 \
...@@ -91,7 +87,16 @@ WORKDIR /usr/local/share/uhd/rfnoc ...@@ -91,7 +87,16 @@ WORKDIR /usr/local/share/uhd/rfnoc
COPY --from=ru-base /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" && \ 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 WORKDIR /opt/oai-lte-ru
......
...@@ -39,7 +39,8 @@ RUN dnf update -y && \ ...@@ -39,7 +39,8 @@ RUN dnf update -y && \
lksctp-tools \ lksctp-tools \
procps-ng \ procps-ng \
tzdata \ tzdata \
atlas \ libusbx \
libgfortran \
gdb \ gdb \
python3 \ python3 \
python3-pip \ python3-pip \
...@@ -101,7 +102,18 @@ WORKDIR /usr/local/share/uhd/rfnoc ...@@ -101,7 +102,18 @@ WORKDIR /usr/local/share/uhd/rfnoc
COPY --from=lte-ue-base /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" && \ 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 WORKDIR /opt/oai-lte-ue
COPY --from=lte-ue-base /tini /tini COPY --from=lte-ue-base /tini /tini
......
...@@ -40,7 +40,8 @@ RUN dnf update -y && \ ...@@ -40,7 +40,8 @@ RUN dnf update -y && \
lksctp-tools \ lksctp-tools \
procps-ng \ procps-ng \
tzdata \ tzdata \
atlas \ libusbx \
libgfortran \
gdb \ gdb \
python3 \ python3 \
python3-pip \ python3-pip \
...@@ -103,17 +104,17 @@ COPY --from=lte-ue-base /usr/local/share/uhd/rfnoc/ . ...@@ -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" && \ RUN /bin/bash -c "ln -s /usr/local/lib/liboai_usrpdevif.so /usr/local/lib/liboai_device.so" && \
ldconfig && \ ldconfig && \
echo "ldd on lte-uesoftmodem" && ldd /opt/oai-lte-ue/bin/lte-uesoftmodem && \ echo "---- ldd on executable lte-uesoftmodem ----" && \
echo "ldd on conf2uedata" && ldd /opt/oai-lte-ue/bin/conf2uedata && \ ldd /opt/oai-lte-ue/bin/lte-uesoftmodem && \
echo "ldd on nvram" && ldd /opt/oai-lte-ue/bin/nvram && \ echo "---- ldd on shared libraries ----" && \
echo "ldd on usim" && ldd /opt/oai-lte-ue/bin/usim && \ ldd /usr/local/lib/liboai_eth_transpro.so \
echo "ldd on liboai_eth_transpro.so" && ldd /usr/local/lib/liboai_eth_transpro.so && \ /usr/local/lib/librfsimulator.so \
echo "ldd on librfsimulator.so" && ldd /usr/local/lib/librfsimulator.so && \ /usr/local/lib/liboai_usrpdevif.so \
echo "ldd on liboai_usrpdevif.so" && ldd /usr/local/lib/liboai_usrpdevif.so && \ /usr/local/lib/libcoding.so \
echo "ldd on libcoding.so" && ldd /usr/local/lib/libcoding.so && \ /usr/local/lib/libparams_libconfig.so \
echo "ldd on libparams_libconfig.so" && ldd /usr/local/lib/libparams_libconfig.so && \ /usr/local/lib/libdfts.so \
echo "ldd on libdfts.so" && ldd /usr/local/lib/libdfts.so && \ /usr/local/lib/libtelnetsrv.so \
echo "ldd on libtelnetsrv.so" && ldd /usr/local/lib/libtelnetsrv.so /usr/local/lib64/libuhd.so.4.4.0
WORKDIR /opt/oai-lte-ue WORKDIR /opt/oai-lte-ue
COPY --from=lte-ue-base /tini /tini COPY --from=lte-ue-base /tini /tini
......
...@@ -41,7 +41,6 @@ RUN yum repolist --disablerepo=* && \ ...@@ -41,7 +41,6 @@ RUN yum repolist --disablerepo=* && \
procps-ng \ procps-ng \
lksctp-tools \ lksctp-tools \
tzdata \ tzdata \
atlas \
net-tools \ net-tools \
iputils && \ iputils && \
echo "/usr/local/lib" > /etc/ld.so.conf.d/local-lib.conf && \ echo "/usr/local/lib" > /etc/ld.so.conf.d/local-lib.conf && \
...@@ -60,10 +59,6 @@ COPY --from=gnb-build \ ...@@ -60,10 +59,6 @@ COPY --from=gnb-build \
COPY --from=gnb-base \ COPY --from=gnb-base \
/lib64/libconfig.so.11 \ /lib64/libconfig.so.11 \
/lib64/libblas.so.3 \
/lib64/libcblas.so.3 \
/lib64/liblapack.so.3 \
/lib64/liblapacke.so.3 \
/lib64/ /lib64/
RUN ldconfig && \ RUN ldconfig && \
......
...@@ -42,7 +42,6 @@ RUN yum repolist --disablerepo=* && \ ...@@ -42,7 +42,6 @@ RUN yum repolist --disablerepo=* && \
procps-ng \ procps-ng \
lksctp-tools \ lksctp-tools \
tzdata \ tzdata \
atlas \
net-tools \ net-tools \
iputils && \ iputils && \
echo "/usr/local/lib" > /etc/ld.so.conf.d/local-lib.conf && \ echo "/usr/local/lib" > /etc/ld.so.conf.d/local-lib.conf && \
...@@ -61,10 +60,6 @@ COPY --from=gnb-build \ ...@@ -61,10 +60,6 @@ COPY --from=gnb-build \
COPY --from=gnb-base \ COPY --from=gnb-base \
/lib64/libconfig.so.11 \ /lib64/libconfig.so.11 \
/lib64/libblas.so.3 \
/lib64/libcblas.so.3 \
/lib64/liblapack.so.3 \
/lib64/liblapacke.so.3 \
/lib64/ /lib64/
RUN ldconfig && \ RUN ldconfig && \
......
...@@ -42,7 +42,7 @@ RUN dnf update -y && \ ...@@ -42,7 +42,7 @@ RUN dnf update -y && \
net-tools \ net-tools \
iputils \ iputils \
iproute \ iproute \
atlas \ libusbx \
gdb \ gdb \
python3 \ python3 \
python3-pip \ python3-pip \
...@@ -74,10 +74,6 @@ COPY --from=nr-ue-build \ ...@@ -74,10 +74,6 @@ COPY --from=nr-ue-build \
COPY --from=nr-ue-base \ COPY --from=nr-ue-base \
/lib64/libconfig.so.11 \ /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/libforms.so.2 \
/lib64/libboost_chrono.so.1.75.0 \ /lib64/libboost_chrono.so.1.75.0 \
/lib64/libboost_date_time.so.1.75.0 \ /lib64/libboost_date_time.so.1.75.0 \
...@@ -104,8 +100,20 @@ WORKDIR /usr/local/share/uhd/rfnoc ...@@ -104,8 +100,20 @@ WORKDIR /usr/local/share/uhd/rfnoc
COPY --from=nr-ue-base /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" && \ 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 WORKDIR /opt/oai-nr-ue
COPY --from=nr-ue-base /tini /tini COPY --from=nr-ue-base /tini /tini
......
...@@ -43,7 +43,7 @@ RUN dnf update -y && \ ...@@ -43,7 +43,7 @@ RUN dnf update -y && \
net-tools \ net-tools \
iputils \ iputils \
iproute \ iproute \
atlas \ libusbx \
gdb \ gdb \
python3 \ python3 \
python3-pip \ python3-pip \
...@@ -75,10 +75,6 @@ COPY --from=nr-ue-build \ ...@@ -75,10 +75,6 @@ COPY --from=nr-ue-build \
COPY --from=nr-ue-base \ COPY --from=nr-ue-base \
/lib64/libconfig.so.11 \ /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/libforms.so.2 \
/lib64/libboost_chrono.so.1.75.0 \ /lib64/libboost_chrono.so.1.75.0 \
/lib64/libboost_date_time.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/ . ...@@ -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" && \ RUN /bin/bash -c "ln -s /usr/local/lib/liboai_usrpdevif.so /usr/local/lib/liboai_device.so" && \
ldconfig && \ ldconfig && \
echo "ldd on nr-uesoftmodem" && ldd /opt/oai-nr-ue/bin/nr-uesoftmodem && \ echo "---- ldd on executable nr-uesoftmodem ----" && \
echo "ldd on liboai_eth_transpro.so" && ldd /usr/local/lib/liboai_eth_transpro.so && \ ldd /opt/oai-nr-ue/bin/nr-uesoftmodem && \
echo "ldd on librfsimulator.so" && ldd /usr/local/lib/librfsimulator.so && \ echo "---- ldd on shared libraries ----" && \
echo "ldd on liboai_usrpdevif.so" && ldd /usr/local/lib/liboai_usrpdevif.so && \ ldd /usr/local/lib/liboai_eth_transpro.so \
echo "ldd on libcoding.so" && ldd /usr/local/lib/libcoding.so && \ /usr/local/lib/librfsimulator.so \
echo "ldd on libparams_libconfig.so" && ldd /usr/local/lib/libparams_libconfig.so && \ /usr/local/lib/liboai_usrpdevif.so \
echo "ldd on libdfts.so" && ldd /usr/local/lib/libdfts.so && \ /usr/local/lib/libcoding.so \
echo "ldd on libtelnetsrv.so" && ldd /usr/local/lib/libtelnetsrv.so && \ /usr/local/lib/libparams_libconfig.so \
echo "ldd on libtelnetsrv_5Gue.so" && ldd /usr/local/lib/libtelnetsrv_5Gue.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 WORKDIR /opt/oai-nr-ue
COPY --from=nr-ue-base /tini /tini COPY --from=nr-ue-base /tini /tini
......
...@@ -47,7 +47,7 @@ RUN dnf update -y && \ ...@@ -47,7 +47,7 @@ RUN dnf update -y && \
dnf install -y \ dnf install -y \
lksctp-tools \ lksctp-tools \
tzdata \ tzdata \
atlas \ libgfortran \
hostname \ hostname \
sudo \ sudo \
procps-ng \ procps-ng \
...@@ -94,7 +94,25 @@ COPY --from=phy-sim-build \ ...@@ -94,7 +94,25 @@ COPY --from=phy-sim-build \
/oai-ran/cmake_targets/ran_build/build/libldpc*.so \ /oai-ran/cmake_targets/ran_build/build/libldpc*.so \
/usr/local/lib/ /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 # Copy some executables
WORKDIR /usr/bin/ WORKDIR /usr/bin/
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment