Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
O
OpenXG UE
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
Michael Black
OpenXG UE
Commits
528bc424
Commit
528bc424
authored
Dec 20, 2018
by
Raphael Defosseux
Browse files
Options
Browse Files
Download
Plain Diff
Merge remote-tracking branch 'origin/iris_hw_new' into develop_integration_2018_w51
parents
0640fc2d
01e29367
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
11 additions
and
11 deletions
+11
-11
cmake_targets/CMakeLists.txt
cmake_targets/CMakeLists.txt
+1
-1
cmake_targets/tools/build_helper
cmake_targets/tools/build_helper
+10
-10
No files found.
cmake_targets/CMakeLists.txt
View file @
528bc424
...
@@ -548,7 +548,7 @@ set(HWLIB_IRIS_SOURCE
...
@@ -548,7 +548,7 @@ set(HWLIB_IRIS_SOURCE
${
OPENAIR_TARGETS
}
/ARCH/IRIS/USERSPACE/LIB/iris_lib.cpp
${
OPENAIR_TARGETS
}
/ARCH/IRIS/USERSPACE/LIB/iris_lib.cpp
)
)
add_library
(
oai_irisdevif MODULE
${
HWLIB_IRIS_SOURCE
}
)
add_library
(
oai_irisdevif MODULE
${
HWLIB_IRIS_SOURCE
}
)
target_include_directories
(
oai_irisdevif PRIVATE /usr/local/lib/SoapySDR/modules0.
6
/
)
target_include_directories
(
oai_irisdevif PRIVATE /usr/local/lib/SoapySDR/modules0.
7
/
)
target_link_libraries
(
oai_irisdevif SoapySDR
)
target_link_libraries
(
oai_irisdevif SoapySDR
)
include_directories
(
"
${
OPENAIR_TARGETS
}
/ARCH/mobipass/"
)
include_directories
(
"
${
OPENAIR_TARGETS
}
/ARCH/mobipass/"
)
...
...
cmake_targets/tools/build_helper
View file @
528bc424
...
@@ -386,8 +386,8 @@ install_soapy_from_source(){
...
@@ -386,8 +386,8 @@ install_soapy_from_source(){
cd /tmp
cd /tmp
echo "Downloading SoapySDR"
echo "Downloading SoapySDR"
rm -rf /tmp/soapysdr
rm -rf /tmp/soapysdr
git clone https://github.com/pothosware/SoapySDR.git
git clone
-b soapy-sdr-0.7.0 --single-branch
https://github.com/pothosware/SoapySDR.git
cd
soapysdr
cd
SoapySDR
#git checkout tags/release_003_010_001_001
#git checkout tags/release_003_010_001_001
mkdir -p build
mkdir -p build
cd build
cd build
...
@@ -399,8 +399,8 @@ install_soapy_from_source(){
...
@@ -399,8 +399,8 @@ install_soapy_from_source(){
cd /tmp
cd /tmp
echo "Downloading SoapyRemote"
echo "Downloading SoapyRemote"
rm -rf /tmp/soapyremote
rm -rf /tmp/soapyremote
git clone https://github.com/pothosware/SoapyRemote.git
git clone
-b soapy-remote-0.5.0 --single-branch
https://github.com/pothosware/SoapyRemote.git
cd
soapyr
emote
cd
SoapyR
emote
#git checkout tags/release_003_010_001_001
#git checkout tags/release_003_010_001_001
mkdir -p build
mkdir -p build
cd build
cd build
...
@@ -419,7 +419,7 @@ install_soapy_iris_from_source(){
...
@@ -419,7 +419,7 @@ install_soapy_iris_from_source(){
cd /tmp
cd /tmp
echo "Downloading SoapyIris"
echo "Downloading SoapyIris"
rm -rf /tmp/sklk-soapyiris
rm -rf /tmp/sklk-soapyiris
git clone https://github.com/skylarkwireless/sklk-soapyiris.git
git clone
-b soapy-iris-2018.08.0.1 --single-branch
https://github.com/skylarkwireless/sklk-soapyiris.git
cd sklk-soapyiris
cd sklk-soapyiris
mkdir -p build
mkdir -p build
cd build
cd build
...
@@ -434,14 +434,14 @@ install_soapy_iris_from_source(){
...
@@ -434,14 +434,14 @@ install_soapy_iris_from_source(){
check_install_soapy () {
check_install_soapy () {
#if [[ "$OS_DISTRO" == "ubuntu" ]]; then
#if [[ "$OS_DISTRO" == "ubuntu" ]]; then
#first we remove old installation
#first we remove old installation
$SUDO apt-get remove -y soapysdr soapysdr-server libsoapysdr-dev python-soapysdr python3-soapysdr soapysdr-module-remote || true
$SUDO apt-get remove -y soapysdr soapysdr-server libsoapysdr-dev python-soapysdr python3-soapysdr soapysdr-module-remote || true
$SUDO add-apt-repository -y ppa:myriadrf/drivers
#
$SUDO add-apt-repository -y ppa:myriadrf/drivers
$SUDO apt-get update
#
$SUDO apt-get update
$SUDO apt-get install -y soapysdr soapysdr-server libsoapysdr-dev python-soapysdr python3-soapysdr soapysdr-module-remote
#
$SUDO apt-get install -y soapysdr soapysdr-server libsoapysdr-dev python-soapysdr python3-soapysdr soapysdr-module-remote
#elif [[ "$OS_BASEDISTRO" == "fedora" ]]; then
#elif [[ "$OS_BASEDISTRO" == "fedora" ]]; then
# $SUDO $INSTALLER -y install software-properties-common python3-software-properties python-software-properties subversion git python3 python-numpy python3-numpy cmake swig python-dev
# $SUDO $INSTALLER -y install software-properties-common python3-software-properties python-software-properties subversion git python3 python-numpy python3-numpy cmake swig python-dev
#
install_soapy_from_source
install_soapy_from_source
#fi
#fi
install_soapy_iris_from_source
install_soapy_iris_from_source
...
...
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