From b22f2d888ae6c8e5072443e04edc8cb906660611 Mon Sep 17 00:00:00 2001 From: Raymond Knopp Date: Sun, 10 Feb 2019 14:32:47 +0100 Subject: [PATCH 1/4] minor changes in CMakelists.txt for building on RHEL7.6. Note, the optional packages in /etc/yum.repos.d/redhat.repo by setting "enabled = 1" in [rhel-6-server-optional-rpms] section --- cmake_targets/tools/build_helper | 1 + 1 file changed, 1 insertion(+) diff --git a/cmake_targets/tools/build_helper b/cmake_targets/tools/build_helper index acfb75b1a8..685bdb0b0b 100755 --- a/cmake_targets/tools/build_helper +++ b/cmake_targets/tools/build_helper @@ -102,6 +102,7 @@ check_supported_distribution() { "ubuntu14.04") return 0 ;; "fedora24") return 0 ;; "rhel7") return 0 ;; + "rhel7.6") return 0 ;; "centos7") return 0 ;; esac return 1 From b7cbb43130b62ce04d7101e0ae6d080a11b5f7a9 Mon Sep 17 00:00:00 2001 From: Raymond Knopp Date: Tue, 12 Feb 2019 17:24:18 +0100 Subject: [PATCH 2/4] minor change for UHD on RHEL7.6 --- cmake_targets/tools/build_helper | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cmake_targets/tools/build_helper b/cmake_targets/tools/build_helper index 685bdb0b0b..995fd7063d 100755 --- a/cmake_targets/tools/build_helper +++ b/cmake_targets/tools/build_helper @@ -312,9 +312,9 @@ install_usrp_uhd_driver() { $SUDO apt-get -y install uhd-host fi if [ -z $1 ]; then - $SUDO uhd_images_downloader + $SUDO /usr/local/bin/uhd_images_downloader else - $SUDO uhd_images_downloader -i $1 + $SUDO /usr/local/bin/uhd_images_downloader -i $1 fi } From d035be0dd33e4a2614761508fd8aadb0fd06fae1 Mon Sep 17 00:00:00 2001 From: Raphael Defosseux Date: Wed, 13 Feb 2019 10:04:40 +0100 Subject: [PATCH 3/4] Fix for all other OS versions Signed-off-by: Raphael Defosseux --- cmake_targets/tools/build_helper | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/cmake_targets/tools/build_helper b/cmake_targets/tools/build_helper index 995fd7063d..ad69ca3794 100755 --- a/cmake_targets/tools/build_helper +++ b/cmake_targets/tools/build_helper @@ -312,9 +312,18 @@ install_usrp_uhd_driver() { $SUDO apt-get -y install uhd-host fi if [ -z $1 ]; then - $SUDO /usr/local/bin/uhd_images_downloader + # quick workaround + if [[ "$OS_DISTRO" == "rhel7.6" ]]; then + $SUDO /usr/local/bin/uhd_images_downloader + else + $SUDO uhd_images_downloader + fi else - $SUDO /usr/local/bin/uhd_images_downloader -i $1 + if [[ "$OS_DISTRO" == "rhel7.6" ]]; then + $SUDO /usr/local/bin/uhd_images_downloader -i $1 + else + $SUDO uhd_images_downloader -i $1 + fi fi } From 4766a694c866bf6b0472761b8102b635866f3fde Mon Sep 17 00:00:00 2001 From: Raphael Defosseux Date: Wed, 13 Feb 2019 10:37:00 +0100 Subject: [PATCH 4/4] RHE7.6: UHD installation should be now correct Signed-off-by: Raphael Defosseux --- ci-scripts/Jenkinsfile-gitlab | 2 +- ci-scripts/reportBuildLocally.sh | 2 +- cmake_targets/tools/build_helper | 7 ++++--- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/ci-scripts/Jenkinsfile-gitlab b/ci-scripts/Jenkinsfile-gitlab index fc0290fc44..18c208359e 100644 --- a/ci-scripts/Jenkinsfile-gitlab +++ b/ci-scripts/Jenkinsfile-gitlab @@ -260,7 +260,7 @@ pipeline { expression {doRedHatBuild} } steps { - gitlabCommitStatus(name: "Build eNb-USRP-CentOS") { + gitlabCommitStatus(name: "Build eNb-USRP-RHE") { script { try { withCredentials([ diff --git a/ci-scripts/reportBuildLocally.sh b/ci-scripts/reportBuildLocally.sh index bfce7acd8f..e2259da48a 100755 --- a/ci-scripts/reportBuildLocally.sh +++ b/ci-scripts/reportBuildLocally.sh @@ -492,7 +492,7 @@ function report_build { if [ -e ./archives/red_hat ] then - echo "

Red Hat (CentOS Linux release 7.4.1708) -- Summary

" >> ./build_results.html + echo "

Red Hat Enterprise Linux Server release 7.6) -- Summary

" >> ./build_results.html 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 diff --git a/cmake_targets/tools/build_helper b/cmake_targets/tools/build_helper index ad69ca3794..048ba300e7 100755 --- a/cmake_targets/tools/build_helper +++ b/cmake_targets/tools/build_helper @@ -311,15 +311,16 @@ install_usrp_uhd_driver() { # On newer kernels, it fails to install $SUDO apt-get -y install uhd-host fi + # quick workaround for RHE7.6 + local distribution=$(get_distribution_release) if [ -z $1 ]; then - # quick workaround - if [[ "$OS_DISTRO" == "rhel7.6" ]]; then + if [[ "$distribution" == "rhel7.6" ]]; then $SUDO /usr/local/bin/uhd_images_downloader else $SUDO uhd_images_downloader fi else - if [[ "$OS_DISTRO" == "rhel7.6" ]]; then + if [[ "$distribution" == "rhel7.6" ]]; then $SUDO /usr/local/bin/uhd_images_downloader -i $1 else $SUDO uhd_images_downloader -i $1