From 557e3ba8003b8ac4404c83164077b4ecd7f0c86c Mon Sep 17 00:00:00 2001 From: Robert Schmidt Date: Sun, 18 Jun 2023 05:56:37 +0200 Subject: [PATCH] Make ethernet off by default in build_oai If it was one, build_oai without parameters would attempt to build the ethernet library. However, this is unexpected, and will lead to an error (as it is by default off in CMake). Set it to off, and build it where required. --- cmake_targets/build_oai | 2 +- docker/Dockerfile.build.rhel9 | 2 +- docker/Dockerfile.build.rocky | 2 +- docker/Dockerfile.build.ubuntu20 | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/cmake_targets/build_oai b/cmake_targets/build_oai index 02379e197c..63bc83845d 100755 --- a/cmake_targets/build_oai +++ b/cmake_targets/build_oai @@ -41,7 +41,7 @@ XFORMS="True" SKIP_SHARED_LIB_FLAG="False" PRINT_STATS="False" HW="None" -TP="Ethernet" +TP="None" EPC=0 VERBOSE_CI=0 VERBOSE_COMPILE=0 diff --git a/docker/Dockerfile.build.rhel9 b/docker/Dockerfile.build.rhel9 index 3aa94d3ade..1a12843ea4 100644 --- a/docker/Dockerfile.build.rhel9 +++ b/docker/Dockerfile.build.rhel9 @@ -35,4 +35,4 @@ COPY . . RUN /bin/sh oaienv && \ cd cmake_targets && \ mkdir -p log && \ - ./build_oai --eNB --gNB --RU --UE --nrUE --ninja --build-lib "telnetsrv enbscope uescope nrscope" -w USRP --verbose-ci --noavx512 -c + ./build_oai --eNB --gNB --RU --UE --nrUE --ninja --build-lib "telnetsrv enbscope uescope nrscope" -w USRP -t Ethernet --verbose-ci --noavx512 -c diff --git a/docker/Dockerfile.build.rocky b/docker/Dockerfile.build.rocky index 1522844601..468869b277 100644 --- a/docker/Dockerfile.build.rocky +++ b/docker/Dockerfile.build.rocky @@ -35,4 +35,4 @@ COPY . . RUN /bin/sh oaienv && \ cd cmake_targets && \ mkdir -p log && \ - ./build_oai --eNB --gNB --RU --UE --nrUE --ninja --build-lib "telnetsrv enbscope uescope nrscope" -w USRP --verbose-ci --noavx512 -c + ./build_oai --eNB --gNB --RU --UE --nrUE --ninja --build-lib "telnetsrv enbscope uescope nrscope" -w USRP -t Ethernet --verbose-ci --noavx512 -c diff --git a/docker/Dockerfile.build.ubuntu20 b/docker/Dockerfile.build.ubuntu20 index fd4de7c22a..8186ca06f4 100644 --- a/docker/Dockerfile.build.ubuntu20 +++ b/docker/Dockerfile.build.ubuntu20 @@ -35,4 +35,4 @@ COPY . . RUN /bin/sh oaienv && \ cd cmake_targets && \ mkdir -p log && \ - ./build_oai --eNB --gNB --RU --UE --nrUE --ninja --build-lib "telnetsrv enbscope uescope nrscope nrqtscope" -w USRP --verbose-ci --noavx512 -c --cmake-opt -DCMAKE_C_FLAGS=-Werror --cmake-opt -DCMAKE_CXX_FLAGS=-Werror + ./build_oai --eNB --gNB --RU --UE --nrUE --ninja --build-lib "telnetsrv enbscope uescope nrscope nrqtscope" -w USRP -t Ethernet --verbose-ci --noavx512 -c --cmake-opt -DCMAKE_C_FLAGS=-Werror --cmake-opt -DCMAKE_CXX_FLAGS=-Werror