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
spbro
OpenXG-RAN
Commits
c1641b66
Commit
c1641b66
authored
Aug 22, 2024
by
arora
Committed by
Robert Schmidt
Sep 26, 2024
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Bump rhel to gcc13, to avoid gcc12 warnings in openair1
parent
ad741065
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
9 additions
and
8 deletions
+9
-8
docker/Dockerfile.base.rhel9
docker/Dockerfile.base.rhel9
+4
-3
docker/Dockerfile.base.ubuntu22
docker/Dockerfile.base.ubuntu22
+1
-1
docker/Dockerfile.build.fhi72.rhel9
docker/Dockerfile.build.fhi72.rhel9
+2
-2
docker/Dockerfile.build.rhel9
docker/Dockerfile.build.rhel9
+2
-2
No files found.
docker/Dockerfile.base.rhel9
View file @
c1641b66
...
...
@@ -57,8 +57,9 @@ RUN rm -f /etc/rhsm-host && \
python3-devel \
numactl-libs \
numactl-devel \
gcc-toolset-12-gcc \
gcc-toolset-12-gcc-c++ \
#use gcc-13 to avoid problems of default gcc-11 in FlexRIC
gcc-toolset-13-gcc \
gcc-toolset-13-gcc-c++ \
# python3-pip and pyyaml are used for conf template generation
python3-pip && \
pip3 install --ignore-installed pyyaml && \
...
...
@@ -90,6 +91,6 @@ COPY oaienv .
RUN /bin/sh oaienv && \
cd cmake_targets && \
mkdir -p log && \
scl enable gcc-toolset-1
2
"\
scl enable gcc-toolset-1
3
"\
./build_oai -I --install-optional-packages -w USRP" && \
rm /etc/pki/entitlement/*pem
docker/Dockerfile.base.ubuntu22
View file @
c1641b66
...
...
@@ -34,7 +34,6 @@ ENV BUILD_UHD_FROM_SOURCE=True
ENV UHD_VERSION=4.4.0.0
#install developers pkg/repo
#use gcc-12 to avoid problems of default gcc-11 in FlexRIC
RUN apt-get update && \
DEBIAN_FRONTEND=noninteractive apt-get upgrade --yes && \
DEBIAN_FRONTEND=noninteractive apt-get install --yes \
...
...
@@ -42,6 +41,7 @@ RUN apt-get update && \
build-essential \
psmisc \
git \
#use gcc-12 to avoid problems of default gcc-11 in FlexRIC
gcc-12 \
g++-12 \
xxd \
...
...
docker/Dockerfile.build.fhi72.rhel9
View file @
c1641b66
...
...
@@ -56,7 +56,7 @@ ARG KPM_VERSION=KPM_V3_00
RUN /bin/sh oaienv && \
cd cmake_targets && \
mkdir -p log && \
scl enable gcc-toolset-1
2
"\
scl enable gcc-toolset-1
3
"\
./build_oai \
--gNB \
--build-lib 'telnetsrv enbscope uescope nrscope' \
...
...
@@ -70,7 +70,7 @@ RUN /bin/sh oaienv && \
## Build FlexRIC for SM Models
RUN mkdir -p openair2/E2AP/flexric/build && \
cd openair2/E2AP/flexric/build && \
scl enable gcc-toolset-1
2
"\
scl enable gcc-toolset-1
3
"\
cmake -GNinja -DCMAKE_BUILD_TYPE=Release \
-DXAPP_MULTILANGUAGE=OFF \
-DKPM_VERSION=$KPM_VERSION \
...
...
docker/Dockerfile.build.rhel9
View file @
c1641b66
...
...
@@ -38,7 +38,7 @@ COPY . .
RUN /bin/sh oaienv && \
cd cmake_targets && \
mkdir -p log && \
scl enable gcc-toolset-1
2
"\
scl enable gcc-toolset-1
3
"\
CXXFLAGS='-Werror -fstack-protector-strong' CFLAGS='-Werror -fstack-protector-strong' ./build_oai -c --ninja \
--eNB --gNB --RU --UE --nrUE \
--build-e2 --cmake-opt -DXAPP_MULTILANGUAGE=OFF --cmake-opt \
...
...
@@ -54,7 +54,7 @@ RUN /bin/sh oaienv && \
## Build FlexRIC for SM Models
RUN mkdir -p openair2/E2AP/flexric/build && \
cd openair2/E2AP/flexric/build && \
scl enable gcc-toolset-1
2
"\
scl enable gcc-toolset-1
3
"\
cmake -GNinja -DCMAKE_BUILD_TYPE=Release \
-DXAPP_MULTILANGUAGE=OFF \
-DKPM_VERSION=$KPM_VERSION \
...
...
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