From 9929437c16698ca8012142a9279374732a08732e Mon Sep 17 00:00:00 2001 From: Lionel Gauthier <lionel.gauthier@eurecom.fr> Date: Fri, 10 Apr 2015 12:24:28 +0000 Subject: [PATCH] sync git-svn-id: http://svn.eurecom.fr/openair4G/trunk@7114 818b1a75-f10b-46b9-bf7c-635c3b92a50f --- .../autotests/run_compilation_autotests.bash | 4 ++-- cmake_targets/autotests/run_exec_autotests.bash | 4 ++-- cmake_targets/oaisim_build_oai/CMakeLists.template | 13 +++++++------ .../oaisim_mme_build_oai/CMakeLists.template | 2 +- 4 files changed, 12 insertions(+), 11 deletions(-) diff --git a/cmake_targets/autotests/run_compilation_autotests.bash b/cmake_targets/autotests/run_compilation_autotests.bash index 28a97538a6..5f3dc600eb 100755 --- a/cmake_targets/autotests/run_compilation_autotests.bash +++ b/cmake_targets/autotests/run_compilation_autotests.bash @@ -1,7 +1,7 @@ #!/bin/bash -if [ -s $OPENAIR_DIR/cmake_targets/tools/build_helper.bash ] ; then - source $OPENAIR_DIR/cmake_targets/tools/build_helper.bash +if [ -s $OPENAIR_DIR/cmake_targets/tools/build_helper ] ; then + source $OPENAIR_DIR/cmake_targets/tools/build_helper else echo "Error: no file in the file tree: is OPENAIR_DIR variable set?" exit 1 diff --git a/cmake_targets/autotests/run_exec_autotests.bash b/cmake_targets/autotests/run_exec_autotests.bash index 5b2b523524..d5939140d8 100755 --- a/cmake_targets/autotests/run_exec_autotests.bash +++ b/cmake_targets/autotests/run_exec_autotests.bash @@ -1,7 +1,7 @@ #!/bin/bash -if [ -s $OPENAIR_DIR/cmake_targets/tools/build_helper.bash ] ; then - source $OPENAIR_DIR/cmake_targets/tools/build_helper.bash +if [ -s $OPENAIR_DIR/cmake_targets/tools/build_helper ] ; then + source $OPENAIR_DIR/cmake_targets/tools/build_helper else echo "Error: no file in the file tree: is OPENAIR_DIR variable set?" exit 1 diff --git a/cmake_targets/oaisim_build_oai/CMakeLists.template b/cmake_targets/oaisim_build_oai/CMakeLists.template index 40482459dc..9b36a341dd 100644 --- a/cmake_targets/oaisim_build_oai/CMakeLists.template +++ b/cmake_targets/oaisim_build_oai/CMakeLists.template @@ -9,7 +9,7 @@ set ( DRIVER2013 True ) set ( EMOS False ) set ( ENABLE_FXP True ) set ( ENABLE_ITTI True ) -set ( ENABLE_NAS_UE_LOGGING True ) +set ( ENABLE_NAS_UE_LOGGING False ) set ( ENABLE_NEW_MULTICAST True ) set ( ENABLE_PDCP_NETLINK_FIFO False ) set ( ENABLE_PGM_TRANSPORT True ) @@ -17,14 +17,15 @@ set ( ENABLE_RAL False ) set ( ENABLE_SECURITY True ) set ( ENABLE_STANDALONE_EPC False) set ( ENABLE_USE_CPU_EXECUTION_TIME True ) -set ( ENABLE_USE_MME True ) +set ( ENABLE_USE_MME False ) set ( ENABLE_USE_RAW_SOCKET_FOR_SGI True) set ( ENABLE_VCD_FIFO True ) +set ( ENB_MODE True ) set ( EXMIMO_IOT True ) set ( HARD_RT False ) set ( JUMBO_FRAME True ) set ( LARGE_SCALE False ) -set ( LINK_PDCP_TO_GTPV1U True ) +set ( LINK_ENB_PDCP_TO_GTPV1U False) set ( LINUX_LIST False ) set ( LINUX True ) set ( LOCALIZATION False ) @@ -32,13 +33,13 @@ set ( LOG_NO_THREAD False ) set ( LOWLATENCY False ) set ( MAC_CONTEXT 1 ) set ( MAX_NUM_CCs 1 ) -set ( MIH_C_MEDIEVAL_EXTENSIONS True ) +set ( MIH_C_MEDIEVAL_EXTENSIONS False ) set ( MSG_PRINT False ) set ( MU_RECEIVER False ) set ( NAS_ADDRESS_FIX False ) +set ( NAS_BUILT_IN_UE False) set ( NAS_MME False ) -set ( NAS_NETLINK False ) -set ( NAS_UE True ) +set ( NAS_UE False ) set ( NB_ANTENNAS_RX "2" ) set ( NB_ANTENNAS_TX "2" ) set ( NB_ANTENNAS_TXRX "2" ) diff --git a/cmake_targets/oaisim_mme_build_oai/CMakeLists.template b/cmake_targets/oaisim_mme_build_oai/CMakeLists.template index 9eb0a81ff9..5191f281d9 100644 --- a/cmake_targets/oaisim_mme_build_oai/CMakeLists.template +++ b/cmake_targets/oaisim_mme_build_oai/CMakeLists.template @@ -27,7 +27,7 @@ set ( EXMIMO_IOT False ) set ( HARD_RT False ) set ( JUMBO_FRAME False ) set ( LARGE_SCALE False ) -set ( LINK_PDCP_TO_GTPV1U False ) +set ( LINK_ENB_PDCP_TO_GTPV1U True) set ( LINUX_LIST False ) set ( LINUX False ) set ( LOCALIZATION False ) -- 2.26.2