Commit 4766a694 authored by Raphael Defosseux's avatar Raphael Defosseux
Browse files

RHE7.6: UHD installation should be now correct


Signed-off-by: Raphael Defosseux's avatarRaphael Defosseux <raphael.defosseux@eurecom.fr>
parent d035be0d
...@@ -260,7 +260,7 @@ pipeline { ...@@ -260,7 +260,7 @@ pipeline {
expression {doRedHatBuild} expression {doRedHatBuild}
} }
steps { steps {
gitlabCommitStatus(name: "Build eNb-USRP-CentOS") { gitlabCommitStatus(name: "Build eNb-USRP-RHE") {
script { script {
try { try {
withCredentials([ withCredentials([
......
...@@ -492,7 +492,7 @@ function report_build { ...@@ -492,7 +492,7 @@ function report_build {
if [ -e ./archives/red_hat ] if [ -e ./archives/red_hat ]
then then
echo " <h2>Red Hat (CentOS Linux release 7.4.1708) -- Summary</h2>" >> ./build_results.html echo " <h2>Red Hat Enterprise Linux Server release 7.6) -- Summary</h2>" >> ./build_results.html
summary_table_header "Red Hat -- OAI Build eNB -- USRP option" ./archives/red_hat summary_table_header "Red Hat -- OAI Build eNB -- USRP option" ./archives/red_hat
summary_table_row "LTE SoftModem - Release 14" ./archives/red_hat/lte-softmodem.Rel14.txt "Built target lte-softmodem" ./enb_usrp_rh_row1.html summary_table_row "LTE SoftModem - Release 14" ./archives/red_hat/lte-softmodem.Rel14.txt "Built target lte-softmodem" ./enb_usrp_rh_row1.html
......
...@@ -311,15 +311,16 @@ install_usrp_uhd_driver() { ...@@ -311,15 +311,16 @@ install_usrp_uhd_driver() {
# On newer kernels, it fails to install # On newer kernels, it fails to install
$SUDO apt-get -y install uhd-host $SUDO apt-get -y install uhd-host
fi fi
# quick workaround for RHE7.6
local distribution=$(get_distribution_release)
if [ -z $1 ]; then if [ -z $1 ]; then
# quick workaround if [[ "$distribution" == "rhel7.6" ]]; then
if [[ "$OS_DISTRO" == "rhel7.6" ]]; then
$SUDO /usr/local/bin/uhd_images_downloader $SUDO /usr/local/bin/uhd_images_downloader
else else
$SUDO uhd_images_downloader $SUDO uhd_images_downloader
fi fi
else else
if [[ "$OS_DISTRO" == "rhel7.6" ]]; then if [[ "$distribution" == "rhel7.6" ]]; then
$SUDO /usr/local/bin/uhd_images_downloader -i $1 $SUDO /usr/local/bin/uhd_images_downloader -i $1
else else
$SUDO uhd_images_downloader -i $1 $SUDO uhd_images_downloader -i $1
......
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