Merge remote-tracking branch 'origin/cmake-refactor' into integration_2023_w27

docker/Dockerfile.build.rhel9

@@ -35,4 +35,4 @@ COPY . .
 RUN /bin/sh oaienv && \ 
     cd cmake_targets && \
     mkdir -p log && \
-    ./build_oai --eNB --gNB --RU --UE --nrUE --ninja --build-lib "telnetsrv enbscope uescope nrscope" -w USRP --verbose-ci --noavx512 -c
+    ./build_oai --eNB --gNB --RU --UE --nrUE --ninja --build-lib "telnetsrv enbscope uescope nrscope" -w USRP -t Ethernet --verbose-ci --noavx512 -c

docker/Dockerfile.build.rocky

@@ -35,4 +35,4 @@ COPY . .
 RUN /bin/sh oaienv && \ 
     cd cmake_targets && \
     mkdir -p log && \
-    ./build_oai --eNB --gNB --RU --UE --nrUE --ninja --build-lib "telnetsrv enbscope uescope nrscope" -w USRP --verbose-ci --noavx512 -c
+    ./build_oai --eNB --gNB --RU --UE --nrUE --ninja --build-lib "telnetsrv enbscope uescope nrscope" -w USRP -t Ethernet --verbose-ci --noavx512 -c

docker/Dockerfile.build.ubuntu20

@@ -35,4 +35,4 @@ COPY . .
 RUN /bin/sh oaienv && \
     cd cmake_targets && \
     mkdir -p log && \
-    ./build_oai --eNB --gNB --RU --UE --nrUE --ninja --build-lib "telnetsrv enbscope uescope nrscope nrqtscope" -w USRP --verbose-ci --noavx512 -c --cmake-opt -DCMAKE_C_FLAGS=-Werror --cmake-opt -DCMAKE_CXX_FLAGS=-Werror
+    ./build_oai --eNB --gNB --RU --UE --nrUE --ninja --build-lib "telnetsrv enbscope uescope nrscope nrqtscope" -w USRP -t Ethernet --verbose-ci --noavx512 -c --cmake-opt -DCMAKE_C_FLAGS=-Werror --cmake-opt -DCMAKE_CXX_FLAGS=-Werror

docker/Dockerfile.eNB.rhel9

@@ -72,6 +72,7 @@ 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 \

docker/Dockerfile.gNB.aw2s.rhel9

@@ -34,8 +34,8 @@ COPY ./libori.so /usr/local/lib
 # build AW2S fronthaul lib
 WORKDIR /oai-ran
 RUN /bin/sh oaienv && \
-    cd cmake_targets/ran_build/build && \
-    ninja aw2sori_transpro
+    cd cmake_targets/ && \
+    ./build_oai -w AW2SORI -t Ethernet
 
 #start from scratch for target executable
 FROM registry.access.redhat.com/ubi9/ubi:latest as oai-gnb-aw2s
@@ -75,6 +75,7 @@ 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/

docker/Dockerfile.gNB.aw2s.rocky

@@ -35,8 +35,8 @@ COPY ./libori.so /usr/local/lib
 # build AW2S fronthaul lib
 WORKDIR /oai-ran
 RUN /bin/sh oaienv && \
-    cd cmake_targets/ran_build/build && \
-    ninja aw2sori_transpro
+    cd cmake_targets/ && \
+    ./build_oai -w AW2SORI -t Ethernet
 
 #start from scratch for target executable
 FROM $BASE_IMAGE as oai-gnb-aw2s

docker/Dockerfile.gNB.aw2s.ubuntu20

@@ -34,8 +34,8 @@ COPY ./libori.so /usr/local/lib/
 # build AW2S fronthaul lib
 WORKDIR /oai-ran
 RUN /bin/sh oaienv && \
-    cd cmake_targets/ran_build/build && \
-    ninja aw2sori_transpro
+    cd cmake_targets/ && \
+    ./build_oai -w AW2SORI -t Ethernet
 
 #start from scratch for target executable
 FROM ubuntu:bionic as oai-gnb-aw2s

docker/Dockerfile.gNB.rhel9

@@ -73,6 +73,7 @@ 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 \

docker/Dockerfile.lteRU.rhel9

@@ -66,6 +66,7 @@ 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 \

docker/Dockerfile.lteUE.rhel9

@@ -73,6 +73,7 @@ COPY --from=lte-ue-build \
 COPY --from=lte-ue-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 \

docker/Dockerfile.nr-cuup.rhel9

@@ -61,6 +61,7 @@ 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/

docker/Dockerfile.nr-cuup.ubuntu20

@@ -52,6 +52,8 @@ COPY --from=gnb-build \
     /oai-ran/cmake_targets/ran_build/build/libtelnetsrv.so \
     /usr/local/lib/
 
+RUN ldconfig && ldd /opt/oai-gnb/bin/nr-cuup
+
 # Create directory for configuration files
 WORKDIR /opt/oai-gnb/etc
 

docker/Dockerfile.nrUE.rhel9

@@ -78,6 +78,7 @@ 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 \

docker/Dockerfile.phySim.rhel9

@@ -83,6 +83,7 @@ COPY --from=phy-sim-build \
     /lib64/libXau.so.6 \
     /lib64/libforms.so.2 \
     /lib64/libblas.so.3 \
+    /lib64/libcblas.so.3 \
     /lib64/liblapack.so.3 \
     /lib64/libexslt.so.0 \
     /lib64/libxslt.so.1 \