Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
openairinterface5G
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Merge Requests
23
Merge Requests
23
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Commits
Open sidebar
oai
openairinterface5G
Commits
39f26e94
Commit
39f26e94
authored
Feb 17, 2017
by
Cedric Roux
Browse files
Options
Browse Files
Download
Plain Diff
Merge remote-tracking branch 'origin/enhancement-211-snapping' into develop_integration_w07
parents
e62f569b
e3186c17
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
17 additions
and
2 deletions
+17
-2
cmake_targets/build_oai
cmake_targets/build_oai
+9
-1
cmake_targets/snap_environment.sh
cmake_targets/snap_environment.sh
+3
-0
cmake_targets/tools/build_helper
cmake_targets/tools/build_helper
+5
-1
No files found.
cmake_targets/build_oai
View file @
39f26e94
...
...
@@ -306,6 +306,10 @@ function main() {
UE_AUTOTEST_TRACE
=
"True"
echo_info
"Enabling autotest specific trace for UE"
shift
1
;;
--uhd-images-dir
)
UHD_IMAGES_DIR
=
$2
echo_info
"Downloading UHD images in the indicated location"
shift
2
;;
-h
|
--help
)
print_help
exit
1
;;
...
...
@@ -376,6 +380,10 @@ function main() {
echo_info
"Flags for Deadline scheduler:
$DEADLINE_SCHEDULER_FLAG_USER
"
echo_info
"Flags for CPU Affinity:
$CPU_AFFINITY_FLAG_USER
"
if
[
-n
"
$UHD_IMAGES_DIR
"
]
&&
[
-z
"
$INSTALL_EXTERNAL
"
]
;
then
echo_error
"UHD images download settings will not be applied without -I present"
exit
fi
############################################
# setting and printing OAI envs, we should check here
############################################
...
...
@@ -413,7 +421,7 @@ function main() {
echo_info
"installing packages for USRP support"
check_install_usrp_uhd_driver
if
[
!
"
$DISABLE_HARDWARE_DEPENDENCY
"
==
"True"
]
;
then
install_usrp_uhd_driver
install_usrp_uhd_driver
$UHD_IMAGES_DIR
fi
fi
if
[
"
$HW
"
==
"OAI_BLADERF"
]
;
then
...
...
cmake_targets/snap_environment.sh
0 → 100755
View file @
39f26e94
#!/bin/sh
export
UHD_IMAGES_DIR
=
$SNAP
/uhd_images
exec
$@
cmake_targets/tools/build_helper
View file @
39f26e94
...
...
@@ -216,7 +216,11 @@ install_usrp_uhd_driver() {
# We move uhd-host apart because it depends on linux kernel version
# On newer kernels, it fails to install
$SUDO apt-get -y install uhd-host
$SUDO uhd_images_downloader
if [ -z $1 ]; then
$SUDO uhd_images_downloader
else
$SUDO uhd_images_downloader -i $1
fi
}
check_install_bladerf_driver(){
...
...
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