From 8f79abed2e74166abfc453efef864d2b131e5771 Mon Sep 17 00:00:00 2001 From: Jaroslava Fiedlerova Date: Tue, 12 Aug 2025 15:40:13 +0200 Subject: [PATCH] CI: Update UHD version to 4.8 --- cmake_targets/tools/build_helper | 2 +- docker/Dockerfile.base.rhel9 | 2 +- docker/Dockerfile.base.rocky | 2 +- docker/Dockerfile.base.ubuntu22 | 2 +- docker/Dockerfile.eNB.rhel9 | 4 ++-- docker/Dockerfile.eNB.rocky | 4 ++-- docker/Dockerfile.eNB.ubuntu22 | 4 ++-- docker/Dockerfile.gNB.rhel9 | 4 ++-- docker/Dockerfile.gNB.rocky | 4 ++-- docker/Dockerfile.gNB.ubuntu22 | 4 ++-- docker/Dockerfile.lteRU.rhel9 | 4 ++-- docker/Dockerfile.lteRU.ubuntu22 | 4 ++-- docker/Dockerfile.lteUE.rhel9 | 4 ++-- docker/Dockerfile.lteUE.rocky | 4 ++-- docker/Dockerfile.lteUE.ubuntu22 | 4 ++-- docker/Dockerfile.nrUE.rhel9 | 4 ++-- docker/Dockerfile.nrUE.rocky | 4 ++-- docker/Dockerfile.nrUE.ubuntu22 | 4 ++-- 18 files changed, 32 insertions(+), 32 deletions(-) diff --git a/cmake_targets/tools/build_helper b/cmake_targets/tools/build_helper index f13dd314ef..03f9f76eb5 100755 --- a/cmake_targets/tools/build_helper +++ b/cmake_targets/tools/build_helper @@ -263,7 +263,7 @@ install_usrp_uhd_driver_from_source(){ # - 3.15.0.0 git apply $OPENAIR_DIR/cmake_targets/tools/uhd-3.15-tdd-patch.diff ret=$?;[[ $ret -ne 0 ]] && echo_fatal "Could not apply the TDD patch" - elif [[ "$UHD_VERSION" == "4.7.0.0" || "$UHD_VERSION" == "4.6.0.0" || "$UHD_VERSION" == "4.5.0.0" ]]; then + elif [[ "$UHD_VERSION" == "4.8.0.0" || "$UHD_VERSION" == "4.7.0.0" || "$UHD_VERSION" == "4.6.0.0" || "$UHD_VERSION" == "4.5.0.0" ]]; then # Tested that patch for the following versions: # - 4.7.0.0 cp $OPENAIR_DIR/cmake_targets/tools/uhd-4.x-tdd-patch.diff $OPENAIR_DIR/cmake_targets/tools/uhd-4.5plus-tdd-patch.diff diff --git a/docker/Dockerfile.base.rhel9 b/docker/Dockerfile.base.rhel9 index 28992918e2..dde540556b 100644 --- a/docker/Dockerfile.base.rhel9 +++ b/docker/Dockerfile.base.rhel9 @@ -32,7 +32,7 @@ ARG NEEDED_GIT_PROXY ARG TARGETARCH ENV TZ=Europe/Paris ENV BUILD_UHD_FROM_SOURCE=True -ENV UHD_VERSION=4.4.0.0 +ENV UHD_VERSION=4.8.0.0 # Copy the entitlements COPY ./etc-pki-entitlement /etc/pki/entitlement diff --git a/docker/Dockerfile.base.rocky b/docker/Dockerfile.base.rocky index 2d83389418..98a9ef703a 100644 --- a/docker/Dockerfile.base.rocky +++ b/docker/Dockerfile.base.rocky @@ -30,7 +30,7 @@ FROM $BASE_IMAGE AS ran-base ARG TARGETARCH ENV TZ=Europe/Paris ENV BUILD_UHD_FROM_SOURCE=True -ENV UHD_VERSION=4.4.0.0 +ENV UHD_VERSION=4.8.0.0 RUN dnf install 'dnf-command(config-manager)' -y && \ dnf install epel-release -y && crb enable && \ diff --git a/docker/Dockerfile.base.ubuntu22 b/docker/Dockerfile.base.ubuntu22 index ba8707d4db..2ea1ace533 100644 --- a/docker/Dockerfile.base.ubuntu22 +++ b/docker/Dockerfile.base.ubuntu22 @@ -32,7 +32,7 @@ ARG TARGETARCH ENV DEBIAN_FRONTEND=noninteractive ENV TZ=Europe/Paris ENV BUILD_UHD_FROM_SOURCE=True -ENV UHD_VERSION=4.4.0.0 +ENV UHD_VERSION=4.8.0.0 #install developers pkg/repo RUN apt-get update && \ diff --git a/docker/Dockerfile.eNB.rhel9 b/docker/Dockerfile.eNB.rhel9 index 391f2a6594..3cd1018634 100644 --- a/docker/Dockerfile.eNB.rhel9 +++ b/docker/Dockerfile.eNB.rhel9 @@ -90,7 +90,7 @@ COPY --from=enb-base \ # Now we are copying from builder-image the UHD files. COPY --from=enb-base /usr/local/bin/uhd_find_devices /usr/local/bin -COPY --from=enb-base /usr/local/lib64/libuhd.so.4.4.0 /usr/local/lib64 +COPY --from=enb-base /usr/local/lib64/libuhd.so.4.8.0 /usr/local/lib64 COPY --from=enb-base /usr/local/lib64/uhd/utils/uhd_images_downloader.py /opt/oai-enb/bin WORKDIR /usr/local/share/uhd/rfnoc @@ -111,7 +111,7 @@ RUN /bin/bash -c "ln -s /usr/local/lib/liboai_usrpdevif.so /usr/local/lib/liboai /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 + /usr/local/lib64/libuhd.so.4.8.0 WORKDIR /opt/oai-enb diff --git a/docker/Dockerfile.eNB.rocky b/docker/Dockerfile.eNB.rocky index eee61a7dda..1ff2b42e7a 100644 --- a/docker/Dockerfile.eNB.rocky +++ b/docker/Dockerfile.eNB.rocky @@ -91,7 +91,7 @@ COPY --from=enb-base \ # Now we are copying from builder-image the UHD files. COPY --from=enb-base /usr/local/bin/uhd_find_devices /usr/local/bin -COPY --from=enb-base /usr/local/lib64/libuhd.so.4.4.0 /usr/local/lib64 +COPY --from=enb-base /usr/local/lib64/libuhd.so.4.8.0 /usr/local/lib64 COPY --from=enb-base /usr/local/lib64/uhd/utils/uhd_images_downloader.py /opt/oai-enb/bin WORKDIR /usr/local/share/uhd/rfnoc @@ -112,7 +112,7 @@ RUN /bin/bash -c "ln -s /usr/local/lib/liboai_usrpdevif.so /usr/local/lib/liboai /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 + /usr/local/lib64/libuhd.so.4.8.0 WORKDIR /opt/oai-enb diff --git a/docker/Dockerfile.eNB.ubuntu22 b/docker/Dockerfile.eNB.ubuntu22 index 44797cd7f5..51dd3e445e 100644 --- a/docker/Dockerfile.eNB.ubuntu22 +++ b/docker/Dockerfile.eNB.ubuntu22 @@ -104,7 +104,7 @@ COPY --from=enb-build \ # Now we are copying from builder-image the UHD files. COPY --from=enb-base /usr/local/bin/uhd_find_devices /usr/local/bin -COPY --from=enb-base /usr/local/lib/libuhd.so.4.4.0 /usr/local/lib +COPY --from=enb-base /usr/local/lib/libuhd.so.4.8.0 /usr/local/lib COPY --from=enb-base /usr/local/lib/uhd/utils/uhd_images_downloader.py /opt/oai-enb/bin RUN /bin/bash -c "ln -s /usr/local/lib/liboai_usrpdevif.so /usr/local/lib/liboai_device.so" && \ @@ -121,7 +121,7 @@ RUN /bin/bash -c "ln -s /usr/local/lib/liboai_usrpdevif.so /usr/local/lib/liboai /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 + /usr/local/lib/libuhd.so.4.8.0 WORKDIR /opt/oai-enb diff --git a/docker/Dockerfile.gNB.rhel9 b/docker/Dockerfile.gNB.rhel9 index d02b6907d7..1c201eeeab 100644 --- a/docker/Dockerfile.gNB.rhel9 +++ b/docker/Dockerfile.gNB.rhel9 @@ -97,7 +97,7 @@ COPY --from=gnb-base \ # Now we are copying from builder-image the UHD files. COPY --from=gnb-base /usr/local/bin/uhd_find_devices /usr/local/bin -COPY --from=gnb-base /usr/local/lib64/libuhd.so.4.4.0 /usr/local/lib64 +COPY --from=gnb-base /usr/local/lib64/libuhd.so.4.8.0 /usr/local/lib64 COPY --from=gnb-base /usr/local/lib64/uhd/utils/uhd_images_downloader.py /opt/oai-gnb/bin ## Copy E2 SM models @@ -120,7 +120,7 @@ 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/lib64/libuhd.so.4.4.0 + /usr/local/lib64/libuhd.so.4.8.0 WORKDIR /opt/oai-gnb #EXPOSE 2152/udp # S1U, GTP/UDP diff --git a/docker/Dockerfile.gNB.rocky b/docker/Dockerfile.gNB.rocky index 912de17ede..d005c36c9f 100644 --- a/docker/Dockerfile.gNB.rocky +++ b/docker/Dockerfile.gNB.rocky @@ -94,7 +94,7 @@ COPY --from=gnb-base \ # Now we are copying from builder-image the UHD files. COPY --from=gnb-base /usr/local/bin/uhd_find_devices /usr/local/bin -COPY --from=gnb-base /usr/local/lib64/libuhd.so.4.4.0 /usr/local/lib64 +COPY --from=gnb-base /usr/local/lib64/libuhd.so.4.8.0 /usr/local/lib64 COPY --from=gnb-base /usr/local/lib64/uhd/utils/uhd_images_downloader.py /opt/oai-gnb/bin WORKDIR /usr/local/share/uhd/rfnoc @@ -114,7 +114,7 @@ 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/lib64/libuhd.so.4.4.0 + /usr/local/lib64/libuhd.so.4.8.0 WORKDIR /opt/oai-gnb #EXPOSE 2152/udp # S1U, GTP/UDP diff --git a/docker/Dockerfile.gNB.ubuntu22 b/docker/Dockerfile.gNB.ubuntu22 index ea7b538c41..7b6425de59 100644 --- a/docker/Dockerfile.gNB.ubuntu22 +++ b/docker/Dockerfile.gNB.ubuntu22 @@ -116,7 +116,7 @@ COPY --from=gnb-build \ # Now we are copying from builder-image the UHD files. COPY --from=gnb-base /usr/local/bin/uhd_find_devices /usr/local/bin -COPY --from=gnb-base /usr/local/lib/libuhd.so.4.4.0 /usr/local/lib +COPY --from=gnb-base /usr/local/lib/libuhd.so.4.8.0 /usr/local/lib COPY --from=gnb-base /usr/local/lib/uhd/utils/uhd_images_downloader.py /opt/oai-gnb/bin ## Copy E2 SM models COPY --from=gnb-build /usr/local/lib/flexric /usr/local/lib/flexric @@ -135,7 +135,7 @@ 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.4.0 + /usr/local/lib/libuhd.so.4.8.0 WORKDIR /opt/oai-gnb #EXPOSE 2152/udp # S1U, GTP/UDP diff --git a/docker/Dockerfile.lteRU.rhel9 b/docker/Dockerfile.lteRU.rhel9 index 18ef1e8cfd..736ae2a884 100644 --- a/docker/Dockerfile.lteRU.rhel9 +++ b/docker/Dockerfile.lteRU.rhel9 @@ -80,7 +80,7 @@ COPY --from=ru-base \ # Copying from the ran-build image the USRP needed packages COPY --from=ru-base /usr/local/bin/uhd_find_devices /usr/local/bin -COPY --from=ru-base /usr/local/lib64/libuhd.so.4.4.0 /usr/local/lib64 +COPY --from=ru-base /usr/local/lib64/libuhd.so.4.8.0 /usr/local/lib64 COPY --from=ru-base /usr/local/lib64/uhd/utils/uhd_images_downloader.py /opt/oai-lte-ru/bin WORKDIR /usr/local/share/uhd/rfnoc @@ -96,7 +96,7 @@ RUN /bin/bash -c "ln -s /usr/local/lib/liboai_usrpdevif.so /usr/local/lib/liboai /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 + /usr/local/lib64/libuhd.so.4.8.0 WORKDIR /opt/oai-lte-ru diff --git a/docker/Dockerfile.lteRU.ubuntu22 b/docker/Dockerfile.lteRU.ubuntu22 index 0f5f68932a..71d99aa239 100644 --- a/docker/Dockerfile.lteRU.ubuntu22 +++ b/docker/Dockerfile.lteRU.ubuntu22 @@ -68,7 +68,7 @@ COPY --from=ru-build \ # Now we are copying from builder-image the UHD files. COPY --from=ru-base /usr/local/bin/uhd_find_devices /usr/local/bin -COPY --from=ru-base /usr/local/lib/libuhd.so.4.4.0 /usr/local/lib +COPY --from=ru-base /usr/local/lib/libuhd.so.4.8.0 /usr/local/lib COPY --from=ru-base /usr/local/lib/uhd/utils/uhd_images_downloader.py /opt/oai-lte-ru/bin COPY --from=ru-base \ @@ -91,7 +91,7 @@ RUN /bin/bash -c "ln -s /usr/local/lib/liboai_usrpdevif.so /usr/local/lib/liboai /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 + /usr/local/lib/libuhd.so.4.8.0 WORKDIR /opt/oai-lte-ru diff --git a/docker/Dockerfile.lteUE.rhel9 b/docker/Dockerfile.lteUE.rhel9 index 56b7266331..7f1199c897 100644 --- a/docker/Dockerfile.lteUE.rhel9 +++ b/docker/Dockerfile.lteUE.rhel9 @@ -95,7 +95,7 @@ COPY --from=lte-ue-base \ # Now we are copying from builder-image the UHD files. COPY --from=lte-ue-base /usr/local/bin/uhd_find_devices /usr/local/bin -COPY --from=lte-ue-base /usr/local/lib64/libuhd.so.4.4.0 /usr/local/lib64 +COPY --from=lte-ue-base /usr/local/lib64/libuhd.so.4.8.0 /usr/local/lib64 COPY --from=lte-ue-base /usr/local/lib64/uhd/utils/uhd_images_downloader.py /opt/oai-lte-ue/bin WORKDIR /usr/local/share/uhd/rfnoc @@ -113,7 +113,7 @@ RUN /bin/bash -c "ln -s /usr/local/lib/liboai_usrpdevif.so /usr/local/lib/liboai /usr/local/lib/libparams_libconfig.so \ /usr/local/lib/libdfts.so \ /usr/local/lib/libtelnetsrv.so \ - /usr/local/lib64/libuhd.so.4.4.0 + /usr/local/lib64/libuhd.so.4.8.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 39b99f4e0e..5f968b266a 100644 --- a/docker/Dockerfile.lteUE.rocky +++ b/docker/Dockerfile.lteUE.rocky @@ -96,7 +96,7 @@ COPY --from=lte-ue-base \ # Now we are copying from builder-image the UHD files. COPY --from=lte-ue-base /usr/local/bin/uhd_find_devices /usr/local/bin -COPY --from=lte-ue-base /usr/local/lib64/libuhd.so.4.4.0 /usr/local/lib64 +COPY --from=lte-ue-base /usr/local/lib64/libuhd.so.4.8.0 /usr/local/lib64 COPY --from=lte-ue-base /usr/local/lib64/uhd/utils/uhd_images_downloader.py /opt/oai-lte-ue/bin WORKDIR /usr/local/share/uhd/rfnoc @@ -114,7 +114,7 @@ RUN /bin/bash -c "ln -s /usr/local/lib/liboai_usrpdevif.so /usr/local/lib/liboai /usr/local/lib/libparams_libconfig.so \ /usr/local/lib/libdfts.so \ /usr/local/lib/libtelnetsrv.so \ - /usr/local/lib64/libuhd.so.4.4.0 + /usr/local/lib64/libuhd.so.4.8.0 WORKDIR /opt/oai-lte-ue COPY --from=lte-ue-base /tini /tini diff --git a/docker/Dockerfile.lteUE.ubuntu22 b/docker/Dockerfile.lteUE.ubuntu22 index 27623dbd33..9173228d7f 100644 --- a/docker/Dockerfile.lteUE.ubuntu22 +++ b/docker/Dockerfile.lteUE.ubuntu22 @@ -107,7 +107,7 @@ COPY --from=lte-ue-build \ # Now we are copying from builder-image the UHD files. COPY --from=lte-ue-base /usr/local/bin/uhd_find_devices /usr/local/bin -COPY --from=lte-ue-base /usr/local/lib/libuhd.so.4.4.0 /usr/local/lib +COPY --from=lte-ue-base /usr/local/lib/libuhd.so.4.8.0 /usr/local/lib COPY --from=lte-ue-base /usr/local/lib/uhd/utils/uhd_images_downloader.py /opt/oai-lte-ue/bin RUN /bin/bash -c "ln -s /usr/local/lib/liboai_usrpdevif.so /usr/local/lib/liboai_device.so" && \ @@ -122,7 +122,7 @@ RUN /bin/bash -c "ln -s /usr/local/lib/liboai_usrpdevif.so /usr/local/lib/liboai /usr/local/lib/libparams_libconfig.so \ /usr/local/lib/libdfts.so \ /usr/local/lib/libtelnetsrv.so \ - /usr/local/lib/libuhd.so.4.4.0 + /usr/local/lib/libuhd.so.4.8.0 WORKDIR /opt/oai-lte-ue COPY --from=lte-ue-base /tini /tini diff --git a/docker/Dockerfile.nrUE.rhel9 b/docker/Dockerfile.nrUE.rhel9 index 3a2900da27..0929ab3df0 100644 --- a/docker/Dockerfile.nrUE.rhel9 +++ b/docker/Dockerfile.nrUE.rhel9 @@ -99,7 +99,7 @@ COPY --from=nr-ue-base \ # Now we are copying from builder-image the UHD files. COPY --from=nr-ue-base /usr/local/bin/uhd_find_devices /usr/local/bin -COPY --from=nr-ue-base /usr/local/lib64/libuhd.so.4.4.0 /usr/local/lib64 +COPY --from=nr-ue-base /usr/local/lib64/libuhd.so.4.8.0 /usr/local/lib64 COPY --from=nr-ue-base /usr/local/lib64/uhd/utils/uhd_images_downloader.py /opt/oai-nr-ue/bin WORKDIR /usr/local/share/uhd/rfnoc @@ -119,7 +119,7 @@ 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_5Gue.so \ - /usr/local/lib64/libuhd.so.4.4.0 + /usr/local/lib64/libuhd.so.4.8.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 7f112af53a..bfe84dc011 100644 --- a/docker/Dockerfile.nrUE.rocky +++ b/docker/Dockerfile.nrUE.rocky @@ -96,7 +96,7 @@ COPY --from=nr-ue-base \ # Now we are copying from builder-image the UHD files. COPY --from=nr-ue-base /usr/local/bin/uhd_find_devices /usr/local/bin -COPY --from=nr-ue-base /usr/local/lib64/libuhd.so.4.4.0 /usr/local/lib64 +COPY --from=nr-ue-base /usr/local/lib64/libuhd.so.4.8.0 /usr/local/lib64 COPY --from=nr-ue-base /usr/local/lib64/uhd/utils/uhd_images_downloader.py /opt/oai-nr-ue/bin WORKDIR /usr/local/share/uhd/rfnoc @@ -116,7 +116,7 @@ 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_5Gue.so \ - /usr/local/lib64/libuhd.so.4.4.0 + /usr/local/lib64/libuhd.so.4.8.0 WORKDIR /opt/oai-nr-ue COPY --from=nr-ue-base /tini /tini diff --git a/docker/Dockerfile.nrUE.ubuntu22 b/docker/Dockerfile.nrUE.ubuntu22 index c3b6592753..bdd5ab9693 100644 --- a/docker/Dockerfile.nrUE.ubuntu22 +++ b/docker/Dockerfile.nrUE.ubuntu22 @@ -115,7 +115,7 @@ COPY --from=nr-ue-build \ # Now we are copying from builder-image the UHD files. COPY --from=nr-ue-base /usr/local/bin/uhd_find_devices /usr/local/bin -COPY --from=nr-ue-base /usr/local/lib/libuhd.so.4.4.0 /usr/local/lib +COPY --from=nr-ue-base /usr/local/lib/libuhd.so.4.8.0 /usr/local/lib COPY --from=nr-ue-base /usr/local/lib/uhd/utils/uhd_images_downloader.py /opt/oai-nr-ue/bin RUN /bin/bash -c "ln -s /usr/local/lib/liboai_usrpdevif.so /usr/local/lib/liboai_device.so" && \ @@ -133,7 +133,7 @@ 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.4.0 + /usr/local/lib/libuhd.so.4.8.0 WORKDIR /opt/oai-nr-ue COPY --from=nr-ue-base /tini /tini