diff --git a/cmake_targets/build_oai b/cmake_targets/build_oai index ca387cda32..95793206bf 100755 --- a/cmake_targets/build_oai +++ b/cmake_targets/build_oai @@ -68,7 +68,7 @@ Options: --UE-conf-nvram [configuration file] Specify conf_nvram_path (default \"$conf_nvram_path\") -w | --hardware - USRP, BLADERF, LMSSDR, IRIS, SIMU, AW2SORI, AERIAL, None (Default) + USRP, BLADERF, LMSSDR, IRIS, SIMU, AW2SORI, AERIAL, ZMQ, None (Default) Adds this RF board support (in external packages installation and in compilation) -t | --transport Selects the transport protocol type, options: None, Ethernet, oran_fhlib_5g, oran_fhlib_5g_mplane, WLS @@ -223,7 +223,7 @@ function main() { shift 2;; -w | --hardware) case "$2" in - "USRP" | "BLADERF" | "LMSSDR" | "IRIS") + "USRP" | "BLADERF" | "LMSSDR" | "IRIS" | "ZMQ") HWs+=" OAI_"$2 TARGET_LIST="$TARGET_LIST oai_${2,,}devif" # ,, makes lowercase CMAKE_CMD="$CMAKE_CMD -DOAI_$2=ON" diff --git a/docker/Dockerfile.base.ubuntu b/docker/Dockerfile.base.ubuntu index fc258b226c..0fa2112047 100644 --- a/docker/Dockerfile.base.ubuntu +++ b/docker/Dockerfile.base.ubuntu @@ -40,7 +40,8 @@ RUN apt-get update && \ wget \ flatbuffers-compiler \ libflatbuffers-dev \ - libnanomsg-dev && \ + libnanomsg-dev \ + libzmq3-dev && \ # --break-system-packages allows externally managed environment in pip pip3 install --ignore-installed pyyaml --break-system-packages diff --git a/docker/Dockerfile.build.ubuntu b/docker/Dockerfile.build.ubuntu index 3050a5c51e..29c1278025 100644 --- a/docker/Dockerfile.build.ubuntu +++ b/docker/Dockerfile.build.ubuntu @@ -32,6 +32,7 @@ RUN \ -w USRP -t Ethernet -w BLADERF \ --build-e2 --cmake-opt -DKPM_VERSION=$KPM_VERSION --cmake-opt -DE2AP_VERSION=$E2AP_VERSION \ --cmake-opt -DOAI_VRTSIM_TAPS_CLIENT=ON \ + -w ZMQ \ --noavx512 \ --build-tool-opt -k10 \ --cmake-opt -DT_RECORD_DB=ON \ diff --git a/docker/Dockerfile.gNB.ubuntu b/docker/Dockerfile.gNB.ubuntu index d10e476127..d76cbcbd39 100644 --- a/docker/Dockerfile.gNB.ubuntu +++ b/docker/Dockerfile.gNB.ubuntu @@ -47,7 +47,8 @@ RUN apt-get update && \ python3-requests \ libusb-1.0-0 \ libyaml-cpp-dev \ - libnanomsg5 && \ + libnanomsg5 \ + libzmq5 && \ # if the --sanitize option was used to build, additional packages are required /bin/bash -c 'if [[ "$BUILD_OPTION" = "--sanitize" ]]; then DEBIAN_FRONTEND=noninteractive apt-get install --yes \ libasan8 \ @@ -78,6 +79,7 @@ COPY --from=gnb-build \ /oai-ran/cmake_targets/ran_build/build/libtelnetsrv_rrc.so \ /oai-ran/cmake_targets/ran_build/build/libtelnetsrv_o1.so \ /oai-ran/cmake_targets/ran_build/build/libvrtsim.so \ + /oai-ran/cmake_targets/ran_build/build/liboai_zmqdevif.so \ /usr/local/lib/ # Now we are copying from builder-image the UHD files. @@ -105,7 +107,8 @@ RUN /bin/bash -c "ln -s /usr/local/lib/liboai_usrpdevif.so /usr/local/lib/liboai /usr/local/lib/libldpc*.so \ /usr/local/lib/libtelnetsrv.so \ /usr/local/lib/libtelnetsrv_ci.so \ - /usr/local/lib/libuhd.so.4.8.0 + /usr/local/lib/libuhd.so.4.8.0 \ + /usr/local/lib/liboai_zmqdevif.so WORKDIR /opt/oai-gnb #EXPOSE 2152/udp # S1U, GTP/UDP diff --git a/docker/Dockerfile.nrUE.ubuntu b/docker/Dockerfile.nrUE.ubuntu index c38104f3bc..69aa85d550 100644 --- a/docker/Dockerfile.nrUE.ubuntu +++ b/docker/Dockerfile.nrUE.ubuntu @@ -50,7 +50,8 @@ RUN apt-get update && \ iperf \ libyaml-cpp-dev \ libzstd1 \ - libnanomsg5 && \ + libnanomsg5 \ + libzmq5 && \ # if the --sanitize option was used to build, additional packages are required /bin/bash -c 'if [[ "$BUILD_OPTION" = "--sanitize" ]]; then DEBIAN_FRONTEND=noninteractive apt-get install --yes \ libasan8 \ @@ -83,6 +84,7 @@ COPY --from=nr-ue-build \ /oai-ran/cmake_targets/ran_build/build/libtelnetsrv.so \ /oai-ran/cmake_targets/ran_build/build/libparams_yaml.so \ /oai-ran/cmake_targets/ran_build/build/libvrtsim.so \ + /oai-ran/cmake_targets/ran_build/build/liboai_zmqdevif.so \ # Wildcards so it doesn't fail if not present /oai-ran/cmake_targets/ran_build/build/_deps*/fmtlog-build*/libfmtlog-shared*.so \ /oai-ran/cmake_targets/ran_build/build/_deps*/clickhouse-cpp-build*/clickhouse/libclickhouse*.so \ @@ -114,7 +116,8 @@ RUN /bin/bash -c "ln -s /usr/local/lib/liboai_usrpdevif.so /usr/local/lib/liboai /usr/local/lib/libtelnetsrv.so \ /usr/local/lib/libtelnetsrv_ciUE.so \ /usr/local/lib/libtelnetsrv_5Gue.so \ - /usr/local/lib/libuhd.so.4.8.0 + /usr/local/lib/libuhd.so.4.8.0 \ + /usr/local/lib/liboai_zmqdevif.so WORKDIR /opt/oai-nr-ue