Merge remote-tracking branch 'origin/ci-fixes' into integration_2024_w13

docker/Dockerfile.build.rhel9

@@ -35,4 +35,8 @@ 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 -t Ethernet --noavx512 -c
+    CXXFLAGS="-Werror -fstack-protector-strong" CFLAGS="-Werror -fstack-protector-strong" ./build_oai -c --ninja \
+      --eNB --gNB --RU --UE --nrUE \
+      --build-lib "telnetsrv enbscope uescope nrscope" \
+      -w USRP -t Ethernet \
+      --noavx512

docker/Dockerfile.build.ubuntu20

@@ -42,6 +42,6 @@ RUN /bin/sh oaienv && \
       -w USRP -t Ethernet \
       --build-e2 --cmake-opt -DXAPP_MULTILANGUAGE=OFF \
       --noavx512 \
-      --cmake-opt -DCMAKE_C_FLAGS=-Werror --cmake-opt -DCMAKE_CXX_FLAGS=-Werror $BUILD_OPTION && \
+      --cmake-opt -DCMAKE_C_FLAGS="-Werror -fstack-protector-strong" --cmake-opt -DCMAKE_CXX_FLAGS="-Werror -fstack-protector-strong" $BUILD_OPTION && \
     # Mainly to see if the sanitize option was perfectly executed
     ldd ran_build/build/nr-softmodem

docker/Dockerfile.gNB.aw2s.rhel9

@@ -47,6 +47,7 @@ RUN dnf update -y && \
         libXpm \
         libX11 \
         atlas \
+        gdb \
         lksctp-tools \
         tzdata \
         net-tools \

docker/Dockerfile.gNB.aw2s.rocky

@@ -48,6 +48,7 @@ RUN dnf update -y && \
         libXpm \
         libX11 \
         atlas \
+        gdb \
         lksctp-tools \
         tzdata \
         net-tools \

docker/Dockerfile.gNB.aw2s.ubuntu20

@@ -51,6 +51,7 @@ RUN apt-get update && \
         libblas3 \
         libatlas3-base \
         libconfig9 \
+        gdb \
         openssl \
         net-tools \
         iproute2 \

docker/debug_core_image.sh

@@ -10,9 +10,10 @@ die() {
   exit 1
 }
 
+# for mounting into docker, need absolute path -> realpath
 IMAGE=$1
-COREDUMP=$2
-SOURCES=$3
+COREDUMP=$(realpath $2)
+SOURCES=$(realpath $3)
 
 set -x
 
@@ -32,6 +33,9 @@ docker image inspect $IMAGE > /dev/null || exit 1
 if [ $(grep "oai-gnb:" <<< $IMAGE) ] || [ $(grep "oai-gnb-aerial:" <<< $IMAGE) ]; then
   EXEC=bin/nr-softmodem
   TYPEPATH=oai-gnb
+elif [ $(grep "oai-gnb-aw2s:" <<< $IMAGE) ]; then
+  EXEC=bin/nr-softmodem
+  TYPEPATH=oai-gnb-aw2s
 elif [ $(grep "oai-nr-ue:" <<< $IMAGE) ]; then
   EXEC=bin/nr-uesoftmodem
   TYPEPATH=oai-nr-ue