diff --git a/targets/PROJECTS/SPECTRA/build_all.bash b/targets/PROJECTS/SPECTRA/build_all.bash index 7fef52389ff88c2c552f84ed365f507f40847a49..4b385dd92b261495cf1c7aa7423e3befc0cf9303 100755 --- a/targets/PROJECTS/SPECTRA/build_all.bash +++ b/targets/PROJECTS/SPECTRA/build_all.bash @@ -43,6 +43,7 @@ fi ############################### # COMPILE LTE_RAL_UE ############################### +echo_success "Compiling Radio Access Layer UE (RAL)" cd $OPENAIR3_DIR/RAL-LTE/LTE_RAL_UE make all @@ -50,6 +51,7 @@ make all ############################### # COMPILE LTE_RAL_ENB ############################### +echo_success "Compiling Radio Access Layer eNB (RAL)" cd $OPENAIR3_DIR/RAL-LTE/LTE_RAL_ENB make all @@ -57,6 +59,7 @@ make all ############################### # COMPILE rrm_std_cellular ############################### +echo_success "Compiling RRM" cd $OPENAIR_TARGETS/SIMU/USER make rrm_std_cellular if [[ $? -eq 2 ]] ; then @@ -67,6 +70,7 @@ fi ############################### # COMPILE IP kernel drivers ############################### +echo_success "Compiling IP Drivers" cd $OPENAIR2_DIR make naslite_netlink_ether.ko cd $OPENAIR2_DIR/NAS/DRIVER/LITE/RB_TOOL/ diff --git a/targets/PROJECTS/SPECTRA/utils.bash b/targets/PROJECTS/SPECTRA/utils.bash index 00fd90a48374520a99108868f0e3d0889137115e..cbeee50a4dc9114f7d1c7825e22a5b6aef9d6eab 100755 --- a/targets/PROJECTS/SPECTRA/utils.bash +++ b/targets/PROJECTS/SPECTRA/utils.bash @@ -160,7 +160,11 @@ test_install_asn1c_4_rrc_cellular() { if [ -d $OPENAIR2_DIR/RRC/LITE/MESSAGES/asn1c/asn1c ]; then if [ -x $OPENAIR2_DIR/RRC/LITE/MESSAGES/asn1c/asn1c/asn1c/asn1c ]; then if [ -x /usr/local/bin/asn1c ]; then - diff /usr/local/bin/asn1c $OPENAIR2_DIR/RRC/LITE/MESSAGES/asn1c/asn1c/asn1c/asn1c || return 0 + diff /usr/local/bin/asn1c $OPENAIR2_DIR/RRC/LITE/MESSAGES/asn1c/asn1c/asn1c/asn1c >/dev/null 2>&1; + if [ $? -eq 0 ]; then + echo_success "asn1c for RRC cellular installed" + return 0 + fi fi echo_warning "Installing asn1c for RRC cellular..." cd $OPENAIR2_DIR/RRC/LITE/MESSAGES/asn1c/asn1c @@ -171,7 +175,6 @@ test_install_asn1c_4_rrc_cellular() { echo_warning "asn1c for RRC cellular is not installed in $OPENAIR2_DIR/RRC/LITE/MESSAGES/asn1c/. Installing it" cd $OPENAIR2_DIR/RRC/LITE/MESSAGES/asn1c svn co https://asn1c.svn.sourceforge.net/svnroot/asn1c/trunk asn1c - fi echo_warning "Configuring and building and installing asn1c for RRC cellular..." cd $OPENAIR2_DIR/RRC/LITE/MESSAGES/asn1c/asn1c @@ -315,6 +318,7 @@ check_for_root_rights() { ########################################################### declare -x OPENAIR_DIR="" +declare -x OPENAIR_HOME="" declare -x OPENAIR1_DIR="" declare -x OPENAIR2_DIR="" declare -x OPENAIR3_DIR="" @@ -324,6 +328,7 @@ declare -x OPENAIR_TARGETS="" set_openair cecho "OPENAIR_DIR = $OPENAIR_DIR" $green +cecho "OPENAIR_HOME = $OPENAIR_HOME" $green cecho "OPENAIR1_DIR = $OPENAIR1_DIR" $green cecho "OPENAIR2_DIR = $OPENAIR2_DIR" $green cecho "OPENAIR3_DIR = $OPENAIR3_DIR" $green