Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
O
OpenXG-RAN
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
spbro
OpenXG-RAN
Commits
4766a694
Commit
4766a694
authored
Feb 13, 2019
by
Raphael Defosseux
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
RHE7.6: UHD installation should be now correct
Signed-off-by:
Raphael Defosseux
<
raphael.defosseux@eurecom.fr
>
parent
d035be0d
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
6 additions
and
5 deletions
+6
-5
ci-scripts/Jenkinsfile-gitlab
ci-scripts/Jenkinsfile-gitlab
+1
-1
ci-scripts/reportBuildLocally.sh
ci-scripts/reportBuildLocally.sh
+1
-1
cmake_targets/tools/build_helper
cmake_targets/tools/build_helper
+4
-3
No files found.
ci-scripts/Jenkinsfile-gitlab
View file @
4766a694
...
@@ -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
([
...
...
ci-scripts/reportBuildLocally.sh
View file @
4766a694
...
@@ -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
...
...
cmake_targets/tools/build_helper
View file @
4766a694
...
@@ -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
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment