Upgrade to UHD 4.4 in all container images
This commit is contained in:
@@ -274,6 +274,7 @@ install_usrp_uhd_driver_from_source(){
|
|||||||
# - 4.2.0.0
|
# - 4.2.0.0
|
||||||
# - 4.2.0.1
|
# - 4.2.0.1
|
||||||
# - 4.3.0.0-rc1
|
# - 4.3.0.0-rc1
|
||||||
|
# - 4.4.0.0
|
||||||
git apply $OPENAIR_DIR/cmake_targets/tools/uhd-4.x-tdd-patch.diff
|
git apply $OPENAIR_DIR/cmake_targets/tools/uhd-4.x-tdd-patch.diff
|
||||||
ret=$?;[[ $ret -ne 0 ]] && echo_fatal "Could not apply the TDD patch"
|
ret=$?;[[ $ret -ne 0 ]] && echo_fatal "Could not apply the TDD patch"
|
||||||
fi
|
fi
|
||||||
@@ -349,7 +350,7 @@ check_install_usrp_uhd_driver(){
|
|||||||
$SUDO apt-get -y install python-tk $boost_libs_ubuntu libusb-1.0-0-dev
|
$SUDO apt-get -y install python-tk $boost_libs_ubuntu libusb-1.0-0-dev
|
||||||
case "$(get_distribution_release)" in
|
case "$(get_distribution_release)" in
|
||||||
"ubuntu18.04" | "ubuntu20.04" | "ubuntu22.04")
|
"ubuntu18.04" | "ubuntu20.04" | "ubuntu22.04")
|
||||||
$SUDO apt-get -y install libuhd-dev libuhd4.2.0 uhd-host
|
$SUDO apt-get -y install libuhd-dev libuhd4.4.0 uhd-host
|
||||||
;;
|
;;
|
||||||
esac
|
esac
|
||||||
elif [[ "$OS_BASEDISTRO" == "fedora" ]]; then
|
elif [[ "$OS_BASEDISTRO" == "fedora" ]]; then
|
||||||
|
|||||||
@@ -30,7 +30,7 @@ FROM registry.access.redhat.com/ubi8/ubi:latest AS ran-base
|
|||||||
ARG NEEDED_GIT_PROXY
|
ARG NEEDED_GIT_PROXY
|
||||||
ENV TZ=Europe/Paris
|
ENV TZ=Europe/Paris
|
||||||
ENV BUILD_UHD_FROM_SOURCE=True
|
ENV BUILD_UHD_FROM_SOURCE=True
|
||||||
ENV UHD_VERSION=3.15.0.0
|
ENV UHD_VERSION=4.4.0.0
|
||||||
|
|
||||||
# Copy the entitlements
|
# Copy the entitlements
|
||||||
COPY ./etc-pki-entitlement /etc/pki/entitlement
|
COPY ./etc-pki-entitlement /etc/pki/entitlement
|
||||||
|
|||||||
@@ -31,7 +31,7 @@ ARG NEEDED_GIT_PROXY
|
|||||||
ENV DEBIAN_FRONTEND=noninteractive
|
ENV DEBIAN_FRONTEND=noninteractive
|
||||||
ENV TZ=Europe/Paris
|
ENV TZ=Europe/Paris
|
||||||
ENV BUILD_UHD_FROM_SOURCE=True
|
ENV BUILD_UHD_FROM_SOURCE=True
|
||||||
ENV UHD_VERSION=3.15.0.0
|
ENV UHD_VERSION=4.4.0.0
|
||||||
|
|
||||||
#install developers pkg/repo
|
#install developers pkg/repo
|
||||||
RUN apt-get update && \
|
RUN apt-get update && \
|
||||||
|
|||||||
@@ -95,7 +95,7 @@ COPY --from=enb-base \
|
|||||||
|
|
||||||
# Now we are copying from builder-image the UHD files.
|
# 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/bin/uhd_find_devices /usr/local/bin
|
||||||
COPY --from=enb-base /usr/local/lib64/libuhd.so.3.15.0 /usr/local/lib64
|
COPY --from=enb-base /usr/local/lib64/libuhd.so.4.4.0 /usr/local/lib64
|
||||||
COPY --from=enb-base /usr/local/lib64/uhd/utils/uhd_images_downloader.py /opt/oai-enb/bin
|
COPY --from=enb-base /usr/local/lib64/uhd/utils/uhd_images_downloader.py /opt/oai-enb/bin
|
||||||
|
|
||||||
WORKDIR /usr/local/share/uhd/rfnoc
|
WORKDIR /usr/local/share/uhd/rfnoc
|
||||||
|
|||||||
@@ -81,9 +81,10 @@ COPY --from=enb-build \
|
|||||||
|
|
||||||
# Now we are copying from builder-image the UHD files.
|
# 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/bin/uhd_find_devices /usr/local/bin
|
||||||
COPY --from=enb-base /usr/local/lib/libuhd.so.3.15.0 /usr/local/lib
|
COPY --from=enb-base /usr/local/lib/libuhd.so.4.4.0 /usr/local/lib
|
||||||
COPY --from=enb-base /usr/local/lib/uhd/utils/uhd_images_downloader.py /opt/oai-enb/bin
|
COPY --from=enb-base /usr/local/lib/uhd/utils/uhd_images_downloader.py /opt/oai-enb/bin
|
||||||
COPY --from=enb-base \
|
COPY --from=enb-base \
|
||||||
|
/usr/lib/x86_64-linux-gnu/libboost_chrono.so.1.71.0 \
|
||||||
/usr/lib/x86_64-linux-gnu/libboost_date_time.so.1.71.0 \
|
/usr/lib/x86_64-linux-gnu/libboost_date_time.so.1.71.0 \
|
||||||
/usr/lib/x86_64-linux-gnu/libboost_filesystem.so.1.71.0 \
|
/usr/lib/x86_64-linux-gnu/libboost_filesystem.so.1.71.0 \
|
||||||
/usr/lib/x86_64-linux-gnu/libboost_regex.so.1.71.0 \
|
/usr/lib/x86_64-linux-gnu/libboost_regex.so.1.71.0 \
|
||||||
|
|||||||
@@ -99,7 +99,7 @@ COPY --from=gnb-base \
|
|||||||
|
|
||||||
# Now we are copying from builder-image the UHD files.
|
# 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/bin/uhd_find_devices /usr/local/bin
|
||||||
COPY --from=gnb-base /usr/local/lib64/libuhd.so.3.15.0 /usr/local/lib64
|
COPY --from=gnb-base /usr/local/lib64/libuhd.so.4.4.0 /usr/local/lib64
|
||||||
COPY --from=gnb-base /usr/local/lib64/uhd/utils/uhd_images_downloader.py /opt/oai-gnb/bin
|
COPY --from=gnb-base /usr/local/lib64/uhd/utils/uhd_images_downloader.py /opt/oai-gnb/bin
|
||||||
|
|
||||||
WORKDIR /usr/local/share/uhd/rfnoc
|
WORKDIR /usr/local/share/uhd/rfnoc
|
||||||
|
|||||||
@@ -82,9 +82,10 @@ COPY --from=gnb-build \
|
|||||||
|
|
||||||
# Now we are copying from builder-image the UHD files.
|
# 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/bin/uhd_find_devices /usr/local/bin
|
||||||
COPY --from=gnb-base /usr/local/lib/libuhd.so.3.15.0 /usr/local/lib
|
COPY --from=gnb-base /usr/local/lib/libuhd.so.4.4.0 /usr/local/lib
|
||||||
COPY --from=gnb-base /usr/local/lib/uhd/utils/uhd_images_downloader.py /opt/oai-gnb/bin
|
COPY --from=gnb-base /usr/local/lib/uhd/utils/uhd_images_downloader.py /opt/oai-gnb/bin
|
||||||
COPY --from=gnb-base \
|
COPY --from=gnb-base \
|
||||||
|
/usr/lib/x86_64-linux-gnu/libboost_chrono.so.1.71.0 \
|
||||||
/usr/lib/x86_64-linux-gnu/libboost_date_time.so.1.71.0 \
|
/usr/lib/x86_64-linux-gnu/libboost_date_time.so.1.71.0 \
|
||||||
/usr/lib/x86_64-linux-gnu/libboost_filesystem.so.1.71.0 \
|
/usr/lib/x86_64-linux-gnu/libboost_filesystem.so.1.71.0 \
|
||||||
/usr/lib/x86_64-linux-gnu/libboost_regex.so.1.71.0 \
|
/usr/lib/x86_64-linux-gnu/libboost_regex.so.1.71.0 \
|
||||||
|
|||||||
@@ -86,7 +86,7 @@ COPY --from=ru-base \
|
|||||||
|
|
||||||
# Copying from the ran-build image the USRP needed packages
|
# 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/bin/uhd_find_devices /usr/local/bin
|
||||||
COPY --from=ru-base /usr/local/lib64/libuhd.so.3.15.0 /usr/local/lib64
|
COPY --from=ru-base /usr/local/lib64/libuhd.so.4.4.0 /usr/local/lib64
|
||||||
COPY --from=ru-base /usr/local/lib64/uhd/utils/uhd_images_downloader.py /opt/oai-lte-ru/bin
|
COPY --from=ru-base /usr/local/lib64/uhd/utils/uhd_images_downloader.py /opt/oai-lte-ru/bin
|
||||||
|
|
||||||
WORKDIR /usr/local/share/uhd/rfnoc
|
WORKDIR /usr/local/share/uhd/rfnoc
|
||||||
|
|||||||
@@ -73,10 +73,11 @@ COPY --from=ru-build \
|
|||||||
|
|
||||||
# Now we are copying from builder-image the UHD files.
|
# 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/bin/uhd_find_devices /usr/local/bin
|
||||||
COPY --from=ru-base /usr/local/lib/libuhd.so.3.15.0 /usr/local/lib
|
COPY --from=ru-base /usr/local/lib/libuhd.so.4.4.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 /usr/local/lib/uhd/utils/uhd_images_downloader.py /opt/oai-lte-ru/bin
|
||||||
|
|
||||||
COPY --from=ru-base \
|
COPY --from=ru-base \
|
||||||
|
/usr/lib/x86_64-linux-gnu/libboost_chrono.so.1.71.0 \
|
||||||
/usr/lib/x86_64-linux-gnu/libboost_date_time.so.1.71.0 \
|
/usr/lib/x86_64-linux-gnu/libboost_date_time.so.1.71.0 \
|
||||||
/usr/lib/x86_64-linux-gnu/libboost_filesystem.so.1.71.0 \
|
/usr/lib/x86_64-linux-gnu/libboost_filesystem.so.1.71.0 \
|
||||||
/usr/lib/x86_64-linux-gnu/libboost_regex.so.1.71.0 \
|
/usr/lib/x86_64-linux-gnu/libboost_regex.so.1.71.0 \
|
||||||
|
|||||||
@@ -96,7 +96,7 @@ COPY --from=lte-ue-base \
|
|||||||
|
|
||||||
# Now we are copying from builder-image the UHD files.
|
# 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/bin/uhd_find_devices /usr/local/bin
|
||||||
COPY --from=lte-ue-base /usr/local/lib64/libuhd.so.3.15.0 /usr/local/lib64
|
COPY --from=lte-ue-base /usr/local/lib64/libuhd.so.4.4.0 /usr/local/lib64
|
||||||
COPY --from=lte-ue-base /usr/local/lib64/uhd/utils/uhd_images_downloader.py /opt/oai-lte-ue/bin
|
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
|
WORKDIR /usr/local/share/uhd/rfnoc
|
||||||
|
|||||||
@@ -81,10 +81,11 @@ COPY --from=lte-ue-build \
|
|||||||
|
|
||||||
# Now we are copying from builder-image the UHD files.
|
# 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/bin/uhd_find_devices /usr/local/bin
|
||||||
COPY --from=lte-ue-base /usr/local/lib/libuhd.so.3.15.0 /usr/local/lib
|
COPY --from=lte-ue-base /usr/local/lib/libuhd.so.4.4.0 /usr/local/lib
|
||||||
COPY --from=lte-ue-base /usr/local/lib/uhd/utils/uhd_images_downloader.py /opt/oai-lte-ue/bin
|
COPY --from=lte-ue-base /usr/local/lib/uhd/utils/uhd_images_downloader.py /opt/oai-lte-ue/bin
|
||||||
|
|
||||||
COPY --from=lte-ue-base \
|
COPY --from=lte-ue-base \
|
||||||
|
/usr/lib/x86_64-linux-gnu/libboost_chrono.so.1.71.0 \
|
||||||
/usr/lib/x86_64-linux-gnu/libboost_date_time.so.1.71.0 \
|
/usr/lib/x86_64-linux-gnu/libboost_date_time.so.1.71.0 \
|
||||||
/usr/lib/x86_64-linux-gnu/libboost_filesystem.so.1.71.0 \
|
/usr/lib/x86_64-linux-gnu/libboost_filesystem.so.1.71.0 \
|
||||||
/usr/lib/x86_64-linux-gnu/libboost_regex.so.1.71.0 \
|
/usr/lib/x86_64-linux-gnu/libboost_regex.so.1.71.0 \
|
||||||
|
|||||||
@@ -106,7 +106,7 @@ COPY --from=nr-ue-base \
|
|||||||
|
|
||||||
# Now we are copying from builder-image the UHD files.
|
# 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/bin/uhd_find_devices /usr/local/bin
|
||||||
COPY --from=nr-ue-base /usr/local/lib64/libuhd.so.3.15.0 /usr/local/lib64
|
COPY --from=nr-ue-base /usr/local/lib64/libuhd.so.4.4.0 /usr/local/lib64
|
||||||
COPY --from=nr-ue-base /usr/local/lib64/uhd/utils/uhd_images_downloader.py /opt/oai-nr-ue/bin
|
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
|
WORKDIR /usr/local/share/uhd/rfnoc
|
||||||
|
|||||||
@@ -89,10 +89,11 @@ COPY --from=nr-ue-build \
|
|||||||
|
|
||||||
# Now we are copying from builder-image the UHD files.
|
# 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/bin/uhd_find_devices /usr/local/bin
|
||||||
COPY --from=nr-ue-base /usr/local/lib/libuhd.so.3.15.0 /usr/local/lib
|
COPY --from=nr-ue-base /usr/local/lib/libuhd.so.4.4.0 /usr/local/lib
|
||||||
COPY --from=nr-ue-base /usr/local/lib/uhd/utils/uhd_images_downloader.py /opt/oai-nr-ue/bin
|
COPY --from=nr-ue-base /usr/local/lib/uhd/utils/uhd_images_downloader.py /opt/oai-nr-ue/bin
|
||||||
|
|
||||||
COPY --from=nr-ue-base \
|
COPY --from=nr-ue-base \
|
||||||
|
/usr/lib/x86_64-linux-gnu/libboost_chrono.so.1.71.0 \
|
||||||
/usr/lib/x86_64-linux-gnu/libboost_date_time.so.1.71.0 \
|
/usr/lib/x86_64-linux-gnu/libboost_date_time.so.1.71.0 \
|
||||||
/usr/lib/x86_64-linux-gnu/libboost_filesystem.so.1.71.0 \
|
/usr/lib/x86_64-linux-gnu/libboost_filesystem.so.1.71.0 \
|
||||||
/usr/lib/x86_64-linux-gnu/libboost_regex.so.1.71.0 \
|
/usr/lib/x86_64-linux-gnu/libboost_regex.so.1.71.0 \
|
||||||
|
|||||||
Reference in New Issue
Block a user