From 765bd6df6ff6d67b8e4c4edc34c90a37fffe0615 Mon Sep 17 00:00:00 2001 From: Cedric Roux Date: Tue, 12 Jan 2016 09:44:01 +0100 Subject: [PATCH 1/3] Remove redirection to a log file of some functions in cmake_targets/tools/build_helper because 'apt-get' may trigger interactive sessions. --- cmake_targets/tools/build_helper | 21 --------------------- 1 file changed, 21 deletions(-) diff --git a/cmake_targets/tools/build_helper b/cmake_targets/tools/build_helper index a1fefec3ce..84c7d8ee21 100755 --- a/cmake_targets/tools/build_helper +++ b/cmake_targets/tools/build_helper @@ -163,33 +163,22 @@ install_gnutls_from_source(){ check_install_usrp_uhd_driver(){ - log_file=$OPENAIR_DIR/cmake_targets/log/check_install_usrp_uhd_driver_log.txt - echo_info "\nIn function: check_install_usrp_uhd_driver(). Installing USRP Drivers : The logfile for the installation is located here: $log_file " - ( v=$(lsb_release -cs) $SUDO apt-add-repository "deb http://files.ettus.com/binaries/uhd/repo/uhd/ubuntu/$v $v main" $SUDO apt-get update $SUDO apt-get -y install python python-tk libboost-all-dev libusb-1.0-0-dev $SUDO apt-get -y install -t `lsb_release -cs` uhd --force-yes - ) >& $log_file } check_install_bladerf_driver(){ - log_file=$OPENAIR_DIR/cmake_targets/log/check_install_bladerf_driver_log.txt - echo_info "\nIn function: check_install_bladerf_driver(). Install BLADERF drivers : The logfile for the installation is located here: $log_file " - ( $SUDO add-apt-repository -y ppa:bladerf/bladerf $SUDO apt-get update $SUDO apt-get install -y bladerf libbladerf-dev $SUDO apt-get install -y bladerf-firmware-fx3 $SUDO apt-get install -y bladerf-fpga-hostedx40 bladeRF-cli --flash-firmware /usr/share/Nuand/bladeRF/bladeRF_fw.img - ) >& $log_file } check_install_additional_tools (){ - log_file=$OPENAIR_DIR/cmake_targets/log/check_install_additional_tools_log.txt - echo_info "\nIn function: check_install_oai_software(). Installing optional OAI packages : The logfile for the installation is located here: $log_file " - ( $SUDO apt-get update $SUDO apt-get install -y \ check \ @@ -212,14 +201,9 @@ check_install_additional_tools (){ vlan \ ctags \ ntpdate - ) >& $log_file } check_install_oai_software() { - - log_file=$OPENAIR_DIR/cmake_targets/log/check_install_oai_software_log.txt - echo_info "\nIn function: check_install_oai_software(). Installing mandatory OAI packages : The logfile for the installation is located here: $log_file " - ( $SUDO apt-get update $SUDO apt-get install -y \ autoconf \ @@ -290,16 +274,12 @@ check_install_oai_software() { fi $SUDO pip install paramiko $SUDO pip install pyroute2 - ) > $log_file 2>&1 install_asn1c_from_source $SUDO rm -fr /opt/ssh $SUDO git clone https://gist.github.com/2190472.git /opt/ssh } install_asn1c_from_source(){ - asn1_install_dir=$OPENAIR_DIR/cmake_targets/log/asn1c_install_log.txt - echo_info "\nInstalling ASN1. The log file for ASN1 installation is here: $asn1_install_dir " - ( rm -rf /tmp/asn1c-r1516 mkdir -p /tmp/asn1c-r1516 cd /tmp/asn1c-r1516 @@ -310,7 +290,6 @@ install_asn1c_from_source(){ ./configure make -j`nproc` $SUDO make install - ) > $asn1_install_dir 2>&1 } ################################################# From cd34b4499bc6276c06aaaa850c58b0b98d56bf06 Mon Sep 17 00:00:00 2001 From: Cedric Roux Date: Tue, 12 Jan 2016 16:34:25 +0100 Subject: [PATCH 2/3] put back logs for asn1c installation --- cmake_targets/tools/build_helper | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/cmake_targets/tools/build_helper b/cmake_targets/tools/build_helper index 84c7d8ee21..7d360ca437 100755 --- a/cmake_targets/tools/build_helper +++ b/cmake_targets/tools/build_helper @@ -280,6 +280,9 @@ check_install_oai_software() { } install_asn1c_from_source(){ + asn1_install_dir=$OPENAIR_DIR/cmake_targets/log/asn1c_install_log.txt + echo_info "\nInstalling ASN1. The log file for ASN1 installation is here: $asn1_install_dir " + ( rm -rf /tmp/asn1c-r1516 mkdir -p /tmp/asn1c-r1516 cd /tmp/asn1c-r1516 @@ -289,7 +292,8 @@ install_asn1c_from_source(){ patch -p0 < $OPENAIR_DIR/openair2/RRC/LITE/MESSAGES/asn1c/asn1cpatch.p0 ./configure make -j`nproc` - $SUDO make install + $SUDO make install + ) > $asn1_install_dir 2>&1 } ################################################# From 48898710848ec8296cfa048d552be3c6f9a9bd98 Mon Sep 17 00:00:00 2001 From: Cedric Roux Date: Tue, 12 Jan 2016 16:43:41 +0100 Subject: [PATCH 3/3] remove phpmyadmin from the installed additional tools --- cmake_targets/tools/build_helper | 1 - 1 file changed, 1 deletion(-) diff --git a/cmake_targets/tools/build_helper b/cmake_targets/tools/build_helper index 7d360ca437..db88780f5b 100755 --- a/cmake_targets/tools/build_helper +++ b/cmake_targets/tools/build_helper @@ -188,7 +188,6 @@ check_install_additional_tools (){ libboost-all-dev \ libpthread-stubs0-dev \ openvpn \ - phpmyadmin \ pkg-config \ python-dev \ python-pexpect \