Modified and fixed common config

cmake_targets/tools/build_helper

@@ -307,7 +307,7 @@ check_install_usrp_uhd_driver(){
         $SUDO apt-get -y --allow-unauthenticated install libuhd-dev libuhd003 uhd-host
     elif [[ "$OS_BASEDISTRO" == "fedora" ]]; then
         $SUDO $INSTALLER -y install python boost libusb-devel libusbx-devel boost-devel python-mako python-docutils cmake
-        $SUDO pip install requests
+        $SUDO -H pip install requests
         if [[ "$OS_DISTRO" == "rhel" ]] || [[ "$OS_DISTRO" == "centos" ]]; then
             # until EPEL repo hasn't bumped UHD driver to >=3.10 in EPEL, build driver from source
             $SUDO $INSTALLER -y remove uhd uhd-devel uhd-firmware
@@ -490,8 +490,8 @@ check_install_additional_tools (){
 
   #The packages below are already installed for Redhat distros (RHEL, CentOS, Fedora)
   if [[ "$OS_DISTRO" == "ubuntu" ]]; then
-    $SUDO pip install paramiko
-    $SUDO pip install pyroute2 colorama
+    $SUDO -H pip install paramiko
+    $SUDO -H pip install pyroute2 colorama
     log_netiface=$OPENAIR_DIR/cmake_targets/log/netiface_install_log.txt
     echo_info "Installing Netinterfaces package. The logfile for installation is in $log_netiface"
     (
@@ -689,11 +689,14 @@ install_asn1c_from_source(){
     echo_info "\nInstalling ASN1. The log file for ASN1 installation is here: $asn1_install_log "
     (
     $SUDO rm -rf /tmp/asn1c
-    GIT_SSL_NO_VERIFY=true git clone https://gitlab.eurecom.fr/oai/asn1c.git /tmp/asn1c
+    #GIT_SSL_NO_VERIFY=true git clone https://gitlab.eurecom.fr/oai/asn1c.git /tmp/asn1c 
+    GIT_SSL_NO_VERIFY=true git clone https://github.com/velichkov/asn1c /tmp/asn1c
     cd /tmp/asn1c
-    ./configure
+    git checkout s1ap
+    test -f configure || autoreconf -iv
+    ./configure 
     make -j`nproc`
-    $SUDO make install
+    $SUDO make install 
     cd -
     $SUDO ldconfig
     ) > $asn1_install_log 2>&1

cmake_targets/tools/fix_asn1

@@ -23,7 +23,6 @@ reset_color="$(tput sgr0)"
 function error()
 {
   echo -e "$red_color"ERROR: "$@""$reset_color"
-  exit 1
 }
 
 function check_sha1()
@@ -94,7 +93,7 @@ function patch_rrc()
   case "$version" in
     Rel14 )
       echo "patching RRC files release 14"
-      apply_patches "$directory" RRC_Rel14 ${#RRC_Rel14[*]}
+       apply_patches "$directory" RRC_Rel14 ${#RRC_Rel14[*]}
       ;;
     Rel10 )
       echo "patching RRC files release 10"
@@ -115,7 +114,7 @@ function patch_nr_rrc()
   local version="$2"
 
   case "$version" in
-    Rel15 )
+    NR_Rel15 )
       echo "patching NR_RRC files release 15"
       apply_patches "$directory" NR_RRC_Rel15 ${#NR_RRC_Rel15[*]}
       ;;
@@ -175,16 +174,16 @@ function main()
 
   case "$module" in
     RRC )
-      patch_rrc "$directory" "$version"
+      #patch_rrc "$directory" "$version"
       ;;
     NR_RRC )
-      patch_nr_rrc "$directory" "$version"
+      #patch_nr_rrc "$directory" "$version"
       ;;
     X2AP )
-      patch_x2ap "$directory" "$version"
+      #patch_x2ap "$directory" "$version"
       ;;
     S1AP )
-      patch_s1ap "$directory" "$version"
+      #patch_s1ap "$directory" "$version"
       ;;
     * )
       error unknown module "$module"

cmake_targets/tools/generate_asn1

@@ -5,7 +5,6 @@ function main()
 mkdir -p $1
 cd $1
 shift
-
 #if this script is called with only 2 arguments (so 1 here after the shift), it's for RRC
 #(there may be a better way...)
 if [ $# -eq 1 ]; then
@@ -98,8 +97,8 @@ rm -f asnfix asnfix.c
 echo done with asnfix
 
 echo running asn1c
-
-asn1c -gen-PER -fcompound-names fixed_grammar.asn 2>&1 | grep -v -- '->' | grep -v '^Compiled' |grep -v sample
+ 
+asn1c -gen-PER -fcompound-names -no-gen-example fixed_grammar.asn 2>&1 | grep -v -- '->' | grep -v '^Compiled' |grep -v sample
 
 rm -f fixed_grammar.asn
 
@@ -107,7 +106,7 @@ echo asn1c done
 
 else
 
-asn1c -gen-PER -fcompound-names $* 2>&1 | grep -v -- '->' | grep -v '^Compiled' |grep -v sample
+asn1c -fcompound-names -fno-include-deps -gen-PER -no-gen-OER -no-gen-example $* 2>&1 | grep -v -- '->' | grep -v '^Compiled' |grep -v sample
 
 fi