diff --git a/targets/PROJECTS/GENERIC-LTE-EPC/start_enb.bash b/targets/PROJECTS/GENERIC-LTE-EPC/start_enb.bash index 2272399c6f475fe0ec050ac57cc382db66d07644..92f19f8407ac4774bcb1c8c1a66e6341a3bd49f3 100755 --- a/targets/PROJECTS/GENERIC-LTE-EPC/start_enb.bash +++ b/targets/PROJECTS/GENERIC-LTE-EPC/start_enb.bash @@ -126,7 +126,7 @@ test_command_install_package "iperf" "iperf" test_command_install_package "ip" "iproute" test_command_install_script "ovs-vsctl" "$OPENAIRCN_DIR/SCRIPTS/install_openvswitch1.9.0.bash" test_command_install_package "tunctl" "uml-utilities" -test_command_install_lib "/usr/lib/libconfig.so" "libconfig-dev" +#test_command_install_lib "/usr/lib/libconfig.so" "libconfig-dev" test_command_install_script "asn1c" "$OPENAIRCN_DIR/SCRIPTS/install_asn1c_0.9.24.modified.bash" @@ -208,23 +208,29 @@ fi ####################################################### # USIM, NVRAM files ####################################################### +export NVRAM_DIR=$THIS_SCRIPT_PATH + if [ ! -f $OPENAIRCN_DIR/NAS/EURECOM-NAS/bin/ue_data ]; then make --directory=$OPENAIRCN_DIR/NAS/EURECOM-NAS veryveryclean make --directory=$OPENAIRCN_DIR/NAS/EURECOM-NAS PROCESS=UE + rm .ue.nvram fi if [ ! -f $OPENAIRCN_DIR/NAS/EURECOM-NAS/bin/usim_data ]; then make --directory=$OPENAIRCN_DIR/NAS/EURECOM-NAS veryveryclean make --directory=$OPENAIRCN_DIR/NAS/EURECOM-NAS PROCESS=UE + rm .usim.nvram fi if [ ! -f .ue.nvram ]; then # generate .ue_emm.nvram .ue.nvram - $OPENAIRCN_DIR/NAS/EURECOM-NAS/bin/ue_data -g + $OPENAIRCN_DIR/NAS/EURECOM-NAS/bin/ue_data --gen fi if [ ! -f .usim.nvram ]; then # generate .usim.nvram - $OPENAIRCN_DIR/NAS/EURECOM-NAS/bin/usim_data -g + $OPENAIRCN_DIR/NAS/EURECOM-NAS/bin/usim_data --gen fi +$OPENAIRCN_DIR/NAS/EURECOM-NAS/bin/ue_data --print +$OPENAIRCN_DIR/NAS/EURECOM-NAS/bin/usim_data --print ################################################## # LAUNCH eNB + UE executable @@ -233,13 +239,14 @@ echo "Bringup UE interface" pkill oaisim bash_exec "rmmod $IP_DRIVER_NAME" > /dev/null 2>&1 -#bash_exec "make --directory=$OPENAIR_TARGETS/SIMU/USER $MAKE_LTE_ACCESS_STRATUM_TARGET " -make --directory=$OPENAIR_TARGETS/SIMU/USER $MAKE_LTE_ACCESS_STRATUM_TARGET -j`grep -c ^processor /proc/cpuinfo ` || exit 1 - cecho "make $MAKE_IP_DRIVER_TARGET $MAKE_LTE_ACCESS_STRATUM_TARGET ....." $green #bash_exec "make --directory=$OPENAIR2_DIR $MAKE_IP_DRIVER_TARGET " make --directory=$OPENAIR2_DIR $MAKE_IP_DRIVER_TARGET || exit 1 +#bash_exec "make --directory=$OPENAIR_TARGETS/SIMU/USER $MAKE_LTE_ACCESS_STRATUM_TARGET " +make --directory=$OPENAIR_TARGETS/SIMU/USER $MAKE_LTE_ACCESS_STRATUM_TARGET -j`grep -c ^processor /proc/cpuinfo ` || exit 1 + + bash_exec "insmod $OPENAIR2_DIR/NETWORK_DRIVER/UE_IP/$IP_DRIVER_NAME.ko" bash_exec "ip route flush cache" @@ -274,8 +281,9 @@ rotate_log_file $ITTI_LOG_FILE STDOUT_LOG_FILE=./stdout_enb_ue.log rotate_log_file $STDOUT_LOG_FILE +cd $THIS_SCRIPT_PATH nohup xterm -e $OPENAIRCN_DIR/NAS/EURECOM-NAS/bin/UserProcess & -gdb --args $OPENAIR_TARGETS/SIMU/USER/oaisim -a -u1 -l7 -K $ITTI_LOG_FILE --enb-conf $CONFIG_FILE_ENB 2>&1 | tee $STDOUT_LOG_FILE +gdb --args $OPENAIR_TARGETS/SIMU/USER/oaisim -a -u1 -l9 -K $ITTI_LOG_FILE --enb-conf $CONFIG_FILE_ENB 2>&1 | tee $STDOUT_LOG_FILE diff --git a/targets/PROJECTS/GENERIC-LTE-EPC/start_epc.bash b/targets/PROJECTS/GENERIC-LTE-EPC/start_epc.bash index c43eca995075b309b12d1ecd62b7f5e09d163d03..a9fa01a5ecf16eb298e78138dfc6a93e94cb87f3 100755 --- a/targets/PROJECTS/GENERIC-LTE-EPC/start_epc.bash +++ b/targets/PROJECTS/GENERIC-LTE-EPC/start_epc.bash @@ -125,9 +125,9 @@ test_command_install_package "tunctl" "uml-utilities" test_command_install_package "bison" "bison" "--force-yes" test_command_install_package "flex" "flex" "--force-yes" test_command_install_package "libtool" "libtool" "--force-yes" -test_command_install_lib "/usr/lib/libconfig.so" "libconfig-dev" "--force-yes" +#test_command_install_lib "/usr/lib/libconfig.so" "libconfig-dev" "--force-yes" #test_command_install_lib "/usr/lib/libsctp-dev.so" "libsctp-dev" "--force-yes" -test_command_install_lib "/usr/lib/libsctp.so" "libsctp1" "--force-yes" +#test_command_install_lib "/usr/lib/libsctp.so" "libsctp1" "--force-yes" #test_command_install_lib "/usr/lib/libpthread-stubs0-dev.so" "libpthread-stubs0-dev" "--force-yes" if [ ! -d /usr/local/etc/freeDiameter ] then @@ -175,9 +175,13 @@ else fi if [ ! -f $OBJ_DIR/Makefile ] then - #echo_success "Invoking autogen" - #bash_exec "./autogen.sh" - #cd ./$OBJ_DIR + if [ ! -n "m4" ] + then + mkdir -m 777 m4 + fi + echo_success "Invoking autogen" + bash_exec "./autogen.sh" + cd ./$OBJ_DIR echo_success "Invoking configure" ../configure --enable-standalone-epc --enable-raw-socket-for-sgi LDFLAGS=-L/usr/local/lib else