maki/openairinterface5g
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

No diffs!

Browse Source 
git-svn-id: http://svn.eurecom.fr/openair4G/trunk@4952 818b1a75-f10b-46b9-bf7c-635c3b92a50f
This commit is contained in:
Lionel Gauthier
2014-01-27 13:46:05 +00:00
parent b20af8178b
commit 0453417c78
4 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
targets/PROJECTS/SPECTRA/build_all.bash
+2 -2
View File
@@ -29,9 +29,9 @@ test_install_package linux-headers-`uname -r`
test_install_package "tshark" "--force-yes" test_install_package "tshark" "--force-yes"
# for ODTONE git clone # for ODTONE git clone
test_install_package "git" test_install_package "git"
test_install_asn1c_4_rrc_cellular test_install_asn1c_4_rrc_cellular
echo_success "\n###############################" echo_success "\n###############################"
echo_success "# COMPILE oaisim" echo_success "# COMPILE oaisim"
targets/PROJECTS/SPECTRA/env_802dot21.bash
+3 -3
View File
@@ -25,7 +25,7 @@ export UE_MIH_USER_CONF_FILE=ue_lte_user.conf
ENV_SCRIPT_SOURCED="?" ENV_SCRIPT_SOURCED="?"
ENV_SCRIPT_ERRORS="no" ENV_SCRIPT_ERRORS="no"
if [[ $BASH_SOURCE != $0 ]]; then if [[ $BASH_SOURCE != $0 ]]; then
THIS_SCRIPT_PATH=${BASH_SOURCE%env_802dot21.bash} THIS_SCRIPT_PATH=${BASH_SOURCE%env_802dot21.bash}
[[ x"$THIS_SCRIPT_PATH" == x ]] && THIS_SCRIPT_PATH="./" [[ x"$THIS_SCRIPT_PATH" == x ]] && THIS_SCRIPT_PATH="./"
ENV_SCRIPT_SOURCED="yes" ENV_SCRIPT_SOURCED="yes"
@@ -46,7 +46,7 @@ if [ ! -d $BOOST_ROOT ]; then
ENV_SCRIPT_ERRORS="yes" ENV_SCRIPT_ERRORS="yes"
else else
command -v b2 >/dev/null 2>&1 command -v b2 >/dev/null 2>&1
if [ $? -ne 0 ]; then if [ $? -ne 0 ]; then
echo_warning "Program b2 is not installed or not in the PATH variable. Trying to resolve..." >&2 echo_warning "Program b2 is not installed or not in the PATH variable. Trying to resolve..." >&2
if [[ -x "$BOOST_ROOT/b2" ]]; then if [[ -x "$BOOST_ROOT/b2" ]]; then
echo_success "Program b2 found in dir $BOOST_ROOT." >&2 echo_success "Program b2 found in dir $BOOST_ROOT." >&2
@@ -58,7 +58,7 @@ else
export PATH=$PATH:$BOOST_ROOT export PATH=$PATH:$BOOST_ROOT
fi fi
command -v $BOOST_ROOT/b2 >/dev/null 2>&1 command -v $BOOST_ROOT/b2 >/dev/null 2>&1
if [ $? -eq 0 ]; then if [ $? -eq 0 ]; then
echo_success "Program b2 is now reachable by the PATH variable during the execution of this script." >&2 echo_success "Program b2 is now reachable by the PATH variable during the execution of this script." >&2
else else
echo_error "Built of b2 failed. Please help yourself" >&2 echo_error "Built of b2 failed. Please help yourself" >&2
targets/PROJECTS/SPECTRA/start_enb.bash
+2 -2
View File
@@ -110,7 +110,7 @@ ENB_MIHF_ID=`cat $ODTONE_MIH_EXE_DIR/$ENB_MIH_F_CONF_FILE | grep id | grep \= |
#remove 2 last digits (vitualization, index on 2 digits) #remove 2 last digits (vitualization, index on 2 digits)
ENB_RAL_LINK_ID_STRIPPED=${ENB_RAL_LINK_ID%%??} ENB_RAL_LINK_ID_STRIPPED=${ENB_RAL_LINK_ID%%??}
#xterm -hold -e gdb --args #xterm -hold -e gdb --args
$OPENAIR_TARGETS/SIMU/USER/oaisim -a -K $LOG_FILE -l9 -u0 -b1 -M0 -p2 -g1 -D $EMULATION_DEV_INTERFACE \ $OPENAIR_TARGETS/SIMU/USER/oaisim -a -K $LOG_FILE -l9 -u0 -b1 -M0 -p2 -g1 -D $EMULATION_DEV_INTERFACE \
--enb-ral-listening-port $ENB_RAL_LISTENING_PORT \ --enb-ral-listening-port $ENB_RAL_LISTENING_PORT \
--enb-ral-link-id $ENB_RAL_LINK_ID_STRIPPED \ --enb-ral-link-id $ENB_RAL_LINK_ID_STRIPPED \
@@ -123,7 +123,7 @@ wait_process_started oaisim
# start MIH-USER # start MIH-USER
# wait for emulation start # wait for emulation start
tshark -c 500 -i $EMULATION_DEV_INTERFACE > /dev/null 2>&1 tshark -c 500 -i $EMULATION_DEV_INTERFACE > /dev/null 2>&1
#xterm -hold -e $ODTONE_MIH_EXE_DIR/$ENB_MIH_USER --conf.file $ODTONE_MIH_EXE_DIR/$ENB_MIH_USER_CONF_FILE & #xterm -hold -e $ODTONE_MIH_EXE_DIR/$ENB_MIH_USER --conf.file $ODTONE_MIH_EXE_DIR/$ENB_MIH_USER_CONF_FILE &
#wait_process_started $ENB_MIH_USER #wait_process_started $ENB_MIH_USER
targets/PROJECTS/SPECTRA/utils.bash
+1 -1
View File
@@ -41,7 +41,7 @@ trim ()
echo "$1" | sed -n '1h;1!H;${;g;s/^[ \t]*//g;s/[ \t]*$//g;p;}' echo "$1" | sed -n '1h;1!H;${;g;s/^[ \t]*//g;s/[ \t]*$//g;p;}'
} }
trim2() trim2()
{ {
local var=$@ local var=$@
var="${var#"${var%%[![:space:]]*}"}" # remove leading whitespace characters var="${var#"${var%%[![:space:]]*}"}" # remove leading whitespace characters