Skip to content

O
OpenXG-RAN
Commit fb1e6ee7 authored by Robert Schmidt's avatar Robert Schmidt
Browse files
Options

Merge remote-tracking branch 'origin/build-no-atlas-dependency' into integration_2024_w27

parents 9a320a16 343673b0
Hide whitespace changes
Inline Side-by-side
Showing with 271 additions and 132 deletions
cmake_targets/tools/build_helper
View file @ fb1e6ee7
......@@ -614,7 +614,6 @@ check_install_oai_software() {
gcc \
gcc-c++ \
git \
atlas-devel \
pkgconfig \
libconfig-devel \
libffi-devel \
......
docker/Dockerfile.base.ubuntu22.cross-arm64
View file @ fb1e6ee7
......@@ -56,7 +56,6 @@ RUN apt-get update && \
tzdata \
xxd \
# ARM64 packages
libatlas-base-dev:arm64 \
libblas-dev:arm64 \
liblapack-dev:arm64 \
liblapacke-dev:arm64 \
......
docker/Dockerfile.build.rhel9
View file @ fb1e6ee7
......@@ -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
docker/Dockerfile.build.ubuntu22
View file @ fb1e6ee7
......@@ -44,4 +44,7 @@ RUN /bin/sh oaienv && \
--noavx512 \
--cmake-opt -DCMAKE_C_FLAGS="-Werror" --cmake-opt -DCMAKE_CXX_FLAGS="-Werror" $BUILD_OPTION && \
# Mainly to see if the sanitize option was perfectly executed
ldd ran_build/build/nr-softmodem
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
docker/Dockerfile.eNB.rhel9
View file @ fb1e6ee7
......@@ -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
......
docker/Dockerfile.eNB.rocky
View file @ fb1e6ee7
......@@ -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
......
docker/Dockerfile.eNB.ubuntu22
View file @ fb1e6ee7
......@@ -52,7 +52,6 @@ RUN apt-get update && \
libboost-program-options1.74.0 \
tzdata \
libblas3 \
libatlas3-base \
libconfig9 \
openssl \
net-tools \
......@@ -111,7 +110,18 @@ COPY --from=enb-base /usr/local/lib/uhd/utils/uhd_images_downloader.py /opt/oai-
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 && \
ldd /opt/oai-enb/bin/lte-softmodem
echo "---- ldd on 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/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/lib/libuhd.so.4.4.0
WORKDIR /opt/oai-enb
......
docker/Dockerfile.gNB.aerial.ubuntu22
View file @ fb1e6ee7
......@@ -69,7 +69,7 @@ RUN apt-get update && \
procps \
libsctp1 \
tzdata \
libatlas3-base \
libblas3 \
libconfig9 \
openssl \
net-tools \
......@@ -95,6 +95,14 @@ COPY --from=ran-build \
/usr/local/lib/libnvipc.so \
/usr/local/lib/
RUN ldconfig && \
echo "---- ldd on nr-softmodem ----" && \
ldd /opt/oai-gnb/bin/nr-softmodem && \
echo "---- ldd on shared libraries ----" && \
ldd /usr/local/lib/libparams_libconfig.so \
/usr/local/lib/libfmtlog-shared.so \
/usr/local/lib/libnvlog.so \
/usr/local/lib/libnvipc.so
WORKDIR /opt/oai-gnb
COPY --from=ran-build /tini /tini
......
docker/Dockerfile.gNB.aerial.ubuntu22.sanitize-address
View file @ fb1e6ee7
......@@ -69,7 +69,7 @@ RUN apt-get update && \
procps \
libsctp1 \
tzdata \
libatlas3-base \
libblas3 \
libconfig9 \
openssl \
net-tools \
......@@ -77,6 +77,7 @@ RUN apt-get update && \
iproute2 \
iputils-ping \
gdb \
moreutils \
libusb-1.0-0 && \
rm -rf /var/lib/apt/lists/*
......@@ -100,6 +101,14 @@ COPY --from=ran-build \
/usr/local/lib/libnvipc.so \
/usr/local/lib/
RUN ldconfig && \
echo "---- ldd on nr-softmodem ----" && \
ldd /opt/oai-gnb/bin/nr-softmodem && \
echo "---- ldd on shared libraries ----" && \
ldd /usr/local/lib/libparams_libconfig.so \
/usr/local/lib/libfmtlog-shared.so \
/usr/local/lib/libnvlog.so \
/usr/local/lib/libnvipc.so
WORKDIR /opt/oai-gnb
COPY --from=ran-build /tini /tini
......
docker/Dockerfile.gNB.aw2s.rhel9
View file @ fb1e6ee7
......@@ -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
......
docker/Dockerfile.gNB.aw2s.rocky
View file @ fb1e6ee7
......@@ -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
......
docker/Dockerfile.gNB.aw2s.ubuntu22
View file @ fb1e6ee7
......@@ -49,7 +49,7 @@ RUN apt-get update && \
libsctp1 \
tzdata \
libblas3 \
libatlas3-base \
libc6 \
libconfig9 \
gdb \
openssl \
......@@ -78,7 +78,18 @@ COPY --from=gnb-build \
RUN /bin/bash -c "ln -s /usr/local/lib/libaw2sori_transpro.so /usr/local/lib/libthirdparty_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 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
......
docker/Dockerfile.gNB.rhel9
View file @ fb1e6ee7
......@@ -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
......
docker/Dockerfile.gNB.rocky
View file @ fb1e6ee7
......@@ -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
......
docker/Dockerfile.gNB.ubuntu22
View file @ fb1e6ee7
......@@ -52,7 +52,6 @@ RUN apt-get update && \
libboost-program-options1.74.0 \
tzdata \
libblas3 \
libatlas3-base \
libconfig9 \
openssl \
net-tools \
......@@ -103,7 +102,19 @@ COPY --from=gnb-base /usr/local/lib/uhd/utils/uhd_images_downloader.py /opt/oai-
RUN /bin/bash -c "ln -s /usr/local/lib/liboai_usrpdevif.so /usr/local/lib/liboai_device.so" && \
ldconfig && \
ldd /opt/oai-gnb/bin/nr-softmodem
echo "---- ldd on 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/lib/libuhd.so.4.4.0
WORKDIR /opt/oai-gnb
#EXPOSE 2152/udp # S1U, GTP/UDP
......
docker/Dockerfile.lteRU.rhel9
View file @ fb1e6ee7
......@@ -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
......
docker/Dockerfile.lteRU.ubuntu22
View file @ fb1e6ee7
......@@ -42,7 +42,6 @@ RUN apt-get update && \
procps \
software-properties-common \
libblas3 \
libatlas3-base \
libconfig9 \
net-tools \
gdb \
......@@ -83,7 +82,16 @@ COPY --from=ru-base \
/usr/lib/x86_64-linux-gnu/
RUN /bin/bash -c "ln -s /usr/local/lib/liboai_usrpdevif.so /usr/local/lib/liboai_device.so" && \
ldconfig
ldconfig && \
echo "---- ldd on 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/lib/libuhd.so.4.4.0
WORKDIR /opt/oai-lte-ru
......
docker/Dockerfile.lteUE.rhel9
View file @ fb1e6ee7
......@@ -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
......
docker/Dockerfile.lteUE.rocky
View file @ fb1e6ee7
......@@ -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
......
docker/Dockerfile.lteUE.ubuntu22
View file @ fb1e6ee7
......@@ -52,7 +52,7 @@ RUN apt-get update && \
libboost-program-options1.74.0 \
tzdata \
liblapacke \
libatlas3-base \
libblas3 \
libconfig9 \
openssl \
net-tools \
......@@ -112,7 +112,17 @@ COPY --from=lte-ue-base /usr/local/lib/uhd/utils/uhd_images_downloader.py /opt/o
RUN /bin/bash -c "ln -s /usr/local/lib/liboai_usrpdevif.so /usr/local/lib/liboai_device.so" && \
ldconfig && \
ldd /opt/oai-lte-ue/bin/lte-uesoftmodem
echo "---- ldd on lte-uesoftmodem ----" && \
ldd /opt/oai-lte-ue/bin/lte-uesoftmodem && \
echo "---- ldd on shared librarues ----" && \
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/lib/libuhd.so.4.4.0
WORKDIR /opt/oai-lte-ue
COPY --from=lte-ue-base /tini /tini
......
docker/Dockerfile.nr-cuup.rhel9
View file @ fb1e6ee7
......@@ -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 && \
......
docker/Dockerfile.nr-cuup.rocky
View file @ fb1e6ee7
......@@ -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 && \
......
docker/Dockerfile.nrUE.rhel9
View file @ fb1e6ee7
......@@ -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
......
docker/Dockerfile.nrUE.rocky
View file @ fb1e6ee7
......@@ -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
......
docker/Dockerfile.nrUE.ubuntu22
View file @ fb1e6ee7
......@@ -52,7 +52,7 @@ RUN apt-get update && \
libboost-program-options1.74.0 \
tzdata \
liblapacke \
libatlas3-base \
libblas3 \
libconfig9 \
openssl \
net-tools \
......@@ -106,7 +106,20 @@ COPY --from=nr-ue-base /usr/local/lib/uhd/utils/uhd_images_downloader.py /opt/oa
RUN /bin/bash -c "ln -s /usr/local/lib/liboai_usrpdevif.so /usr/local/lib/liboai_device.so" && \
ldconfig && \
ldd /opt/oai-nr-ue/bin/nr-uesoftmodem
echo "---- ldd on 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_ciUE.so \
/usr/local/lib/libtelnetsrv_5Gue.so \
/usr/local/lib/libuhd.so.4.4.0
WORKDIR /opt/oai-nr-ue
COPY --from=nr-ue-base /tini /tini
......
docker/Dockerfile.phySim.rhel9
View file @ fb1e6ee7
......@@ -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/
......
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