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

cmake_targets/CMakeLists.txt

@@ -548,7 +548,7 @@ set(HWLIB_IRIS_SOURCE
         ${OPENAIR_TARGETS}/ARCH/IRIS/USERSPACE/LIB/iris_lib.cpp
         )
 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)
 
 include_directories("${OPENAIR_TARGETS}/ARCH/mobipass/")

cmake_targets/tools/build_helper

@@ -386,8 +386,8 @@ install_soapy_from_source(){
     cd /tmp
     echo "Downloading SoapySDR"
     rm -rf /tmp/soapysdr
-    git clone https://github.com/pothosware/SoapySDR.git
-    cd soapysdr
+    git clone -b soapy-sdr-0.7.0 --single-branch https://github.com/pothosware/SoapySDR.git
+    cd SoapySDR
     #git checkout tags/release_003_010_001_001
     mkdir -p build
     cd build
@@ -399,8 +399,8 @@ install_soapy_from_source(){
     cd /tmp
     echo "Downloading SoapyRemote"
     rm -rf /tmp/soapyremote
-    git clone https://github.com/pothosware/SoapyRemote.git
-    cd soapyremote
+    git clone -b soapy-remote-0.5.0 --single-branch https://github.com/pothosware/SoapyRemote.git
+    cd SoapyRemote
     #git checkout tags/release_003_010_001_001
     mkdir -p build
     cd build
@@ -419,7 +419,7 @@ install_soapy_iris_from_source(){
     cd /tmp
     echo "Downloading 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
     mkdir -p build
     cd build
@@ -435,13 +435,13 @@ check_install_soapy () {
     #if [[ "$OS_DISTRO" == "ubuntu" ]]; then
         #first we remove old installation
     $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 apt-get update
-        $SUDO apt-get install -y soapysdr soapysdr-server libsoapysdr-dev python-soapysdr python3-soapysdr soapysdr-module-remote
+        #$SUDO add-apt-repository -y ppa:myriadrf/drivers
+        #$SUDO apt-get update
+        #$SUDO apt-get install -y soapysdr soapysdr-server libsoapysdr-dev python-soapysdr python3-soapysdr soapysdr-module-remote
 
     #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
-    #    install_soapy_from_source
+    install_soapy_from_source
     #fi
     install_soapy_iris_from_source