Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
O
OpenXG-RAN
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Michael Black
OpenXG-RAN
Commits
e6dd5240
Commit
e6dd5240
authored
Feb 14, 2023
by
Robert Schmidt
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Upgrade to UHD 4.4 in all container images
parent
192a24c4
Changes
13
Hide whitespace changes
Inline
Side-by-side
Showing
13 changed files
with
19 additions
and
13 deletions
+19
-13
cmake_targets/tools/build_helper
cmake_targets/tools/build_helper
+2
-1
docker/Dockerfile.base.rhel8.2
docker/Dockerfile.base.rhel8.2
+1
-1
docker/Dockerfile.base.ubuntu20
docker/Dockerfile.base.ubuntu20
+1
-1
docker/Dockerfile.eNB.rhel8.2
docker/Dockerfile.eNB.rhel8.2
+1
-1
docker/Dockerfile.eNB.ubuntu20
docker/Dockerfile.eNB.ubuntu20
+2
-1
docker/Dockerfile.gNB.rhel8.2
docker/Dockerfile.gNB.rhel8.2
+1
-1
docker/Dockerfile.gNB.ubuntu20
docker/Dockerfile.gNB.ubuntu20
+2
-1
docker/Dockerfile.lteRU.rhel8.2
docker/Dockerfile.lteRU.rhel8.2
+1
-1
docker/Dockerfile.lteRU.ubuntu20
docker/Dockerfile.lteRU.ubuntu20
+2
-1
docker/Dockerfile.lteUE.rhel8.2
docker/Dockerfile.lteUE.rhel8.2
+1
-1
docker/Dockerfile.lteUE.ubuntu20
docker/Dockerfile.lteUE.ubuntu20
+2
-1
docker/Dockerfile.nrUE.rhel8.2
docker/Dockerfile.nrUE.rhel8.2
+1
-1
docker/Dockerfile.nrUE.ubuntu20
docker/Dockerfile.nrUE.ubuntu20
+2
-1
No files found.
cmake_targets/tools/build_helper
View file @
e6dd5240
...
@@ -274,6 +274,7 @@ install_usrp_uhd_driver_from_source(){
...
@@ -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(){
...
@@ -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
...
...
docker/Dockerfile.base.rhel8.2
View file @
e6dd5240
...
@@ -30,7 +30,7 @@ FROM registry.access.redhat.com/ubi8/ubi:latest AS ran-base
...
@@ -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
...
...
docker/Dockerfile.base.ubuntu20
View file @
e6dd5240
...
@@ -31,7 +31,7 @@ ARG NEEDED_GIT_PROXY
...
@@ -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 && \
...
...
docker/Dockerfile.eNB.rhel8.2
View file @
e6dd5240
...
@@ -95,7 +95,7 @@ COPY --from=enb-base \
...
@@ -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
...
...
docker/Dockerfile.eNB.ubuntu20
View file @
e6dd5240
...
@@ -81,9 +81,10 @@ COPY --from=enb-build \
...
@@ -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 \
...
...
docker/Dockerfile.gNB.rhel8.2
View file @
e6dd5240
...
@@ -99,7 +99,7 @@ COPY --from=gnb-base \
...
@@ -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
...
...
docker/Dockerfile.gNB.ubuntu20
View file @
e6dd5240
...
@@ -82,9 +82,10 @@ COPY --from=gnb-build \
...
@@ -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 \
...
...
docker/Dockerfile.lteRU.rhel8.2
View file @
e6dd5240
...
@@ -86,7 +86,7 @@ COPY --from=ru-base \
...
@@ -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
...
...
docker/Dockerfile.lteRU.ubuntu20
View file @
e6dd5240
...
@@ -73,10 +73,11 @@ COPY --from=ru-build \
...
@@ -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 \
...
...
docker/Dockerfile.lteUE.rhel8.2
View file @
e6dd5240
...
@@ -96,7 +96,7 @@ COPY --from=lte-ue-base \
...
@@ -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
...
...
docker/Dockerfile.lteUE.ubuntu20
View file @
e6dd5240
...
@@ -81,10 +81,11 @@ COPY --from=lte-ue-build \
...
@@ -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 \
...
...
docker/Dockerfile.nrUE.rhel8.2
View file @
e6dd5240
...
@@ -106,7 +106,7 @@ COPY --from=nr-ue-base \
...
@@ -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
...
...
docker/Dockerfile.nrUE.ubuntu20
View file @
e6dd5240
...
@@ -89,10 +89,11 @@ COPY --from=nr-ue-build \
...
@@ -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 \
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment