maki/openairinterface5g
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/iris_hw_new' into develop_integration_2018_w51

Browse Source
This commit is contained in:
Raphael Defosseux
2018-12-20 10:43:46 +01:00
parent 3b915b37ff c76bbd13f1
commit 81e81ab469
2 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cmake_targets/CMakeLists.txt
+1 -1
View File
@@ -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
+10 -10
View File
@@ -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(){
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 soapyremote cd SoapyRemote
#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(){
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(){
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