Commit 6c4e5dcc authored by Robert Schmidt's avatar Robert Schmidt

Don't redirect installation log files to a file

Similarly to the parent, don't redirect log files to a file. It makes
the CI more complicated, and also raises user awareness of what is being
installed.
parent 35361db7
...@@ -186,9 +186,7 @@ clean_all_files() { ...@@ -186,9 +186,7 @@ clean_all_files() {
############################################ ############################################
install_usrp_uhd_driver_from_source(){ install_usrp_uhd_driver_from_source(){
uhd_install_log=$OPENAIR_DIR/cmake_targets/log/uhd_install_log.txt echo_info "\nInstalling UHD driver from sources."
echo_info "\nInstalling UHD driver from sources. The log file for UHD driver installation is here: $uhd_install_log "
(
pushd /tmp pushd /tmp
echo "Cloning UHD driver repository" echo "Cloning UHD driver repository"
rm -rf /tmp/uhd rm -rf /tmp/uhd
...@@ -248,7 +246,6 @@ install_usrp_uhd_driver_from_source(){ ...@@ -248,7 +246,6 @@ install_usrp_uhd_driver_from_source(){
fi fi
popd popd
rm -rf /tmp/uhd rm -rf /tmp/uhd
) >& $uhd_install_log
} }
check_install_usrp_uhd_driver(){ check_install_usrp_uhd_driver(){
...@@ -345,9 +342,7 @@ install_usrp_uhd_driver() { ...@@ -345,9 +342,7 @@ install_usrp_uhd_driver() {
} }
install_bladerf_driver_from_source(){ install_bladerf_driver_from_source(){
bladerf_install_log=$OPENAIR_DIR/cmake_targets/log/bladerf_install_log.txt echo_info "\nInstalling BladeRF driver from sources."
echo_info "\nInstalling BladeRF driver from sources. The log file for BladeRF driver installation is here: $bladerf_install_log "
(
cd /tmp cd /tmp
echo "Downloading BladeRF driver" echo "Downloading BladeRF driver"
rm -rf /tmp/bladeRF rm -rf /tmp/bladeRF
...@@ -370,7 +365,6 @@ install_bladerf_driver_from_source(){ ...@@ -370,7 +365,6 @@ install_bladerf_driver_from_source(){
sudo mkdir -p /usr/share/Nuand/bladeRF sudo mkdir -p /usr/share/Nuand/bladeRF
sudo mv bladeRF_fw_latest.img /usr/share/Nuand/bladeRF/bladeRF_fw.img sudo mv bladeRF_fw_latest.img /usr/share/Nuand/bladeRF/bladeRF_fw.img
sudo mv hostedx40-latest.rbf /usr/share/Nuand/bladeRF/hostedx40.rbf sudo mv hostedx40-latest.rbf /usr/share/Nuand/bladeRF/hostedx40.rbf
) >& $bladerf_install_log
} }
check_install_bladerf_driver(){ check_install_bladerf_driver(){
...@@ -405,9 +399,7 @@ check_install_lmssdr_driver(){ ...@@ -405,9 +399,7 @@ check_install_lmssdr_driver(){
} }
install_soapy_from_source(){ install_soapy_from_source(){
soapy_install_log=$OPENAIR_DIR/cmake_targets/log/soapy_install_log.txt echo_info "\nInstalling Soapy EcoSystem from source."
echo_info "\nInstalling Soapy EcoSystem from source. The log file for Soapy installation is here: $soapy_install_log "
(
cd /tmp cd /tmp
echo "Downloading SoapySDR" echo "Downloading SoapySDR"
rm -rf /tmp/SoapySDR rm -rf /tmp/SoapySDR
...@@ -434,13 +426,10 @@ install_soapy_from_source(){ ...@@ -434,13 +426,10 @@ install_soapy_from_source(){
make -j`nproc` make -j`nproc`
$SUDO make install $SUDO make install
$SUDO ldconfig $SUDO ldconfig
) >& $soapy_install_log
} }
install_soapy_iris_from_source(){ install_soapy_iris_from_source(){
iris_install_log=$OPENAIR_DIR/cmake_targets/log/iris_install_log.txt echo_info "\nInstalling Iris driver from source."
echo_info "\nInstalling Iris driver from source. The log file for Iris driver installation is here: $iris_install_log "
(
cd /tmp cd /tmp
echo "Downloading SoapyIris" echo "Downloading SoapyIris"
rm -rf /tmp/sklk-soapyiris rm -rf /tmp/sklk-soapyiris
...@@ -453,7 +442,6 @@ install_soapy_iris_from_source(){ ...@@ -453,7 +442,6 @@ install_soapy_iris_from_source(){
make -j`nproc` make -j`nproc`
$SUDO make install $SUDO make install
$SUDO ldconfig $SUDO ldconfig
) >& $iris_install_log
} }
check_install_soapy () { check_install_soapy () {
...@@ -585,10 +573,7 @@ check_install_oai_software() { ...@@ -585,10 +573,7 @@ check_install_oai_software() {
} }
install_asn1c_from_source(){ install_asn1c_from_source(){
mkdir -p $OPENAIR_DIR/cmake_targets/log echo_info "\nInstalling ASN1."
asn1_install_log=$OPENAIR_DIR/cmake_targets/log/asn1c_install_log.txt
echo_info "\nInstalling ASN1. The log file for ASN1 installation is here: $asn1_install_log "
(
$SUDO $INSTALLER -y install bison flex $SUDO $INSTALLER -y install bison flex
$SUDO rm -rf /tmp/asn1c $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
...@@ -609,7 +594,6 @@ install_asn1c_from_source(){ ...@@ -609,7 +594,6 @@ install_asn1c_from_source(){
if [[ -v CI_ENV ]]; then if [[ -v CI_ENV ]]; then
$SUDO rm -rf /tmp/asn1c $SUDO rm -rf /tmp/asn1c
fi fi
) > $asn1_install_log 2>&1
} }
install_simde_from_source(){ install_simde_from_source(){
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment