Remove BUILD_ARG: Will never build sanitize
xran does not work with Address Sanitizer. Thus, there is no reason to keep these build arguments.
This commit is contained in:
@@ -81,8 +81,7 @@ RUN /bin/sh oaienv && \
|
|||||||
--ninja --gNB \
|
--ninja --gNB \
|
||||||
--build-lib "telnetsrv enbscope uescope nrscope" \
|
--build-lib "telnetsrv enbscope uescope nrscope" \
|
||||||
-t oran_fhlib_5g --cmake-opt -Dxran_LOCATION=/opt/phy/fhi_lib/lib \
|
-t oran_fhlib_5g --cmake-opt -Dxran_LOCATION=/opt/phy/fhi_lib/lib \
|
||||||
--build-e2 --cmake-opt -DXAPP_MULTILANGUAGE=OFF --cmake-opt -DKPM_VERSION=$KPM_VERSION --cmake-opt -DE2AP_VERSION=$E2AP_VERSION \
|
--build-e2 --cmake-opt -DXAPP_MULTILANGUAGE=OFF --cmake-opt -DKPM_VERSION=$KPM_VERSION --cmake-opt -DE2AP_VERSION=$E2AP_VERSION && \
|
||||||
$BUILD_OPTION && \
|
|
||||||
# Mainly to see if the sanitize option was perfectly executed
|
# Mainly to see if the sanitize option was perfectly executed
|
||||||
ldd ran_build/build/nr-softmodem && \
|
ldd ran_build/build/nr-softmodem && \
|
||||||
ldd ran_build/build/liboran_fhlib_5g.so && \
|
ldd ran_build/build/liboran_fhlib_5g.so && \
|
||||||
|
|||||||
@@ -71,8 +71,7 @@ RUN /bin/sh oaienv && \
|
|||||||
--ninja --gNB --nrRU \
|
--ninja --gNB --nrRU \
|
||||||
--build-lib "telnetsrv enbscope uescope nrscope" \
|
--build-lib "telnetsrv enbscope uescope nrscope" \
|
||||||
-t oran_fhlib_5g --cmake-opt -Dxran_LOCATION=/opt/phy/fhi_lib/lib \
|
-t oran_fhlib_5g --cmake-opt -Dxran_LOCATION=/opt/phy/fhi_lib/lib \
|
||||||
--build-e2 --cmake-opt -DKPM_VERSION=$KPM_VERSION --cmake-opt -DE2AP_VERSION=$E2AP_VERSION \
|
--build-e2 --cmake-opt -DKPM_VERSION=$KPM_VERSION --cmake-opt -DE2AP_VERSION=$E2AP_VERSION && \
|
||||||
$BUILD_OPTION && \
|
|
||||||
# Mainly to see if the sanitize option was perfectly executed
|
# Mainly to see if the sanitize option was perfectly executed
|
||||||
ldd ran_build/build/nr-softmodem && \
|
ldd ran_build/build/nr-softmodem && \
|
||||||
ldd ran_build/build/liboran_fhlib_5g.so && \
|
ldd ran_build/build/liboran_fhlib_5g.so && \
|
||||||
|
|||||||
@@ -25,7 +25,6 @@ FROM ran-build-fhi72:latest AS ran-build
|
|||||||
|
|
||||||
#start from scratch for target executable
|
#start from scratch for target executable
|
||||||
FROM ubuntu:noble AS oai-nr-oru
|
FROM ubuntu:noble AS oai-nr-oru
|
||||||
ARG BUILD_OPTION
|
|
||||||
ENV DEBIAN_FRONTEND=noninteractive
|
ENV DEBIAN_FRONTEND=noninteractive
|
||||||
ENV TZ=Europe
|
ENV TZ=Europe
|
||||||
|
|
||||||
@@ -50,11 +49,6 @@ RUN apt-get update && \
|
|||||||
xz-utils \
|
xz-utils \
|
||||||
libnuma-dev \
|
libnuma-dev \
|
||||||
libyaml-cpp-dev && \
|
libyaml-cpp-dev && \
|
||||||
# if the --sanitize option was used to build, additional packages are required
|
|
||||||
/bin/bash -c 'if [[ "$BUILD_OPTION" = "--sanitize" ]]; then DEBIAN_FRONTEND=noninteractive apt-get install --yes \
|
|
||||||
libasan8 \
|
|
||||||
libubsan1 \
|
|
||||||
liblapacke; fi' && \
|
|
||||||
rm -rf /var/lib/apt/lists/*
|
rm -rf /var/lib/apt/lists/*
|
||||||
|
|
||||||
WORKDIR /opt/nr-oru/bin
|
WORKDIR /opt/nr-oru/bin
|
||||||
|
|||||||
Reference in New Issue
Block a user