Commit 843b12db authored by Robert Schmidt's avatar Robert Schmidt
Browse files

Merge branch 'ci-update-uhd' into 'develop' 

CI: Update UHD version to 4.8

See merge request !3587
parents 05f9c975 8f79abed

cmake_targets/tools/build_helper

+1 −1
Original line number Diff line number Diff line
@@ -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

docker/Dockerfile.base.rhel9

+1 −1
Original line number Diff line number Diff line
@@ -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

docker/Dockerfile.base.rocky

+1 −1
Original line number Diff line number Diff line
@@ -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 && \

docker/Dockerfile.base.ubuntu22

+1 −1
Original line number Diff line number Diff line
@@ -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 && \

docker/Dockerfile.eNB.rhel9

+2 −2
Original line number Diff line number Diff line
@@ -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