maki/openairinterface5g
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bump rhel to gcc13, to avoid gcc12 warnings in openair1

Browse Source
This commit is contained in:
arora
2024-09-26 11:41:45 +02:00
committed by Robert Schmidt
parent ad74106548
commit c1641b66af
4 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
docker/Dockerfile.base.rhel9
+4 -3
View File
@@ -57,8 +57,9 @@ RUN rm -f /etc/rhsm-host && \
python3-devel \ python3-devel \
numactl-libs \ numactl-libs \
numactl-devel \ numactl-devel \
gcc-toolset-12-gcc \ #use gcc-13 to avoid problems of default gcc-11 in FlexRIC
gcc-toolset-12-gcc-c++ \ gcc-toolset-13-gcc \
gcc-toolset-13-gcc-c++ \
# python3-pip and pyyaml are used for conf template generation # python3-pip and pyyaml are used for conf template generation
python3-pip && \ python3-pip && \
pip3 install --ignore-installed pyyaml && \ pip3 install --ignore-installed pyyaml && \
@@ -90,6 +91,6 @@ COPY oaienv .
RUN /bin/sh oaienv && \ RUN /bin/sh oaienv && \
cd cmake_targets && \ cd cmake_targets && \
mkdir -p log && \ mkdir -p log && \
scl enable gcc-toolset-12 "\ scl enable gcc-toolset-13 "\
./build_oai -I --install-optional-packages -w USRP" && \ ./build_oai -I --install-optional-packages -w USRP" && \
rm /etc/pki/entitlement/*pem rm /etc/pki/entitlement/*pem
docker/Dockerfile.base.ubuntu22
+1 -1
View File
@@ -34,7 +34,6 @@ ENV BUILD_UHD_FROM_SOURCE=True
ENV UHD_VERSION=4.4.0.0 ENV UHD_VERSION=4.4.0.0
#install developers pkg/repo #install developers pkg/repo
#use gcc-12 to avoid problems of default gcc-11 in FlexRIC
RUN apt-get update && \ RUN apt-get update && \
DEBIAN_FRONTEND=noninteractive apt-get upgrade --yes && \ DEBIAN_FRONTEND=noninteractive apt-get upgrade --yes && \
DEBIAN_FRONTEND=noninteractive apt-get install --yes \ DEBIAN_FRONTEND=noninteractive apt-get install --yes \
@@ -42,6 +41,7 @@ RUN apt-get update && \
build-essential \ build-essential \
psmisc \ psmisc \
git \ git \
#use gcc-12 to avoid problems of default gcc-11 in FlexRIC
gcc-12 \ gcc-12 \
g++-12 \ g++-12 \
xxd \ xxd \
docker/Dockerfile.build.fhi72.rhel9
+2 -2
View File
@@ -56,7 +56,7 @@ ARG KPM_VERSION=KPM_V3_00
RUN /bin/sh oaienv && \ RUN /bin/sh oaienv && \
cd cmake_targets && \ cd cmake_targets && \
mkdir -p log && \ mkdir -p log && \
scl enable gcc-toolset-12 "\ scl enable gcc-toolset-13 "\
./build_oai \ ./build_oai \
--gNB \ --gNB \
--build-lib 'telnetsrv enbscope uescope nrscope' \ --build-lib 'telnetsrv enbscope uescope nrscope' \
@@ -70,7 +70,7 @@ RUN /bin/sh oaienv && \
## Build FlexRIC for SM Models ## Build FlexRIC for SM Models
RUN mkdir -p openair2/E2AP/flexric/build && \ RUN mkdir -p openair2/E2AP/flexric/build && \
cd openair2/E2AP/flexric/build && \ cd openair2/E2AP/flexric/build && \
scl enable gcc-toolset-12 "\ scl enable gcc-toolset-13 "\
cmake -GNinja -DCMAKE_BUILD_TYPE=Release \ cmake -GNinja -DCMAKE_BUILD_TYPE=Release \
-DXAPP_MULTILANGUAGE=OFF \ -DXAPP_MULTILANGUAGE=OFF \
-DKPM_VERSION=$KPM_VERSION \ -DKPM_VERSION=$KPM_VERSION \
docker/Dockerfile.build.rhel9
+2 -2
View File
@@ -38,7 +38,7 @@ COPY . .
RUN /bin/sh oaienv && \ RUN /bin/sh oaienv && \
cd cmake_targets && \ cd cmake_targets && \
mkdir -p log && \ mkdir -p log && \
scl enable gcc-toolset-12 "\ scl enable gcc-toolset-13 "\
CXXFLAGS='-Werror -fstack-protector-strong' CFLAGS='-Werror -fstack-protector-strong' ./build_oai -c --ninja \ CXXFLAGS='-Werror -fstack-protector-strong' CFLAGS='-Werror -fstack-protector-strong' ./build_oai -c --ninja \
--eNB --gNB --RU --UE --nrUE \ --eNB --gNB --RU --UE --nrUE \
--build-e2 --cmake-opt -DXAPP_MULTILANGUAGE=OFF --cmake-opt \ --build-e2 --cmake-opt -DXAPP_MULTILANGUAGE=OFF --cmake-opt \
@@ -54,7 +54,7 @@ RUN /bin/sh oaienv && \
## Build FlexRIC for SM Models ## Build FlexRIC for SM Models
RUN mkdir -p openair2/E2AP/flexric/build && \ RUN mkdir -p openair2/E2AP/flexric/build && \
cd openair2/E2AP/flexric/build && \ cd openair2/E2AP/flexric/build && \
scl enable gcc-toolset-12 "\ scl enable gcc-toolset-13 "\
cmake -GNinja -DCMAKE_BUILD_TYPE=Release \ cmake -GNinja -DCMAKE_BUILD_TYPE=Release \
-DXAPP_MULTILANGUAGE=OFF \ -DXAPP_MULTILANGUAGE=OFF \
-DKPM_VERSION=$KPM_VERSION \ -DKPM_VERSION=$KPM_VERSION \