Commit 4f29e647 authored by Raphael Defosseux's avatar Raphael Defosseux

chore(ci): clarification on why we can/should install UHD from source

Signed-off-by: default avatarRaphael Defosseux <raphael.defosseux@eurecom.fr>
parent 28155091
...@@ -355,6 +355,7 @@ install_usrp_uhd_driver_from_source(){ ...@@ -355,6 +355,7 @@ install_usrp_uhd_driver_from_source(){
# Tested that patch for the following versions: # Tested that patch for the following versions:
# - 3.15.0.0 # - 3.15.0.0
git apply $OPENAIR_DIR/cmake_targets/tools/uhd-3.15-tdd-patch.diff git apply $OPENAIR_DIR/cmake_targets/tools/uhd-3.15-tdd-patch.diff
ret=$?;[[ $ret -ne 0 ]] && echo_fatal "Could not apply the TDD patch"
else else
# Tested that patch for the following versions: # Tested that patch for the following versions:
# - 4.0.0.0 # - 4.0.0.0
...@@ -364,10 +365,12 @@ install_usrp_uhd_driver_from_source(){ ...@@ -364,10 +365,12 @@ install_usrp_uhd_driver_from_source(){
# - 4.2.0.1 # - 4.2.0.1
# - 4.3.0.0-rc1 # - 4.3.0.0-rc1
git apply $OPENAIR_DIR/cmake_targets/tools/uhd-4.x-tdd-patch.diff git apply $OPENAIR_DIR/cmake_targets/tools/uhd-4.x-tdd-patch.diff
ret=$?;[[ $ret -ne 0 ]] && echo_fatal "Could not apply the TDD patch"
fi fi
else else
git checkout tags/v4.0.0.0 git checkout tags/v4.0.0.0
git apply $OPENAIR_DIR/cmake_targets/tools/uhd-4.x-tdd-patch.diff git apply $OPENAIR_DIR/cmake_targets/tools/uhd-4.x-tdd-patch.diff
ret=$?;[[ $ret -ne 0 ]] && echo_fatal "Could not apply the TDD patch"
fi fi
# Printing out the results of the patch to make sure it was properly applied # Printing out the results of the patch to make sure it was properly applied
git diff git diff
......
...@@ -90,13 +90,17 @@ After completing the build, the binaries are available in the `cmake_targets/ran ...@@ -90,13 +90,17 @@ After completing the build, the binaries are available in the `cmake_targets/ran
## Installing UHD from source ## Installing UHD from source
When installing the pre-requisites, especially the `UHD` driver, you can now specify if you want to install from source or not. Previously for Ubuntu distributions, when installing the pre-requisites, most of the packages are installed from PPA.
Especially the `UHD` driver, but you could not easily manage the version of `libuhd` that will be installed.
Now, when installing the pre-requisites, especially the `UHD` driver, you can now specify if you want to install from source or not.
- For `fedora`-based OS, it was already the case all the time. But now you can specify which version to install. - For `fedora`-based OS, it was already the case all the time. But now you can specify which version to install.
- For `ubuntu` OS, the Ettus PPA currently installs the following versions: - For `ubuntu` OS, you can still install from the Ettus PPA or select a version to install from source.
* `Ubuntu16.04`: --> version `3.15.0.0` * In case of PPA installation, you do nothing special, the script will install the latest version available on the PPA.
* `Ubuntu18.04`: --> version `4.1.0.0` - `./build_oai -I -w USRP`
* `Ubuntu20.04`: --> version `4.2.0.1` * In case of a installation from source, you do as followed:
```bash ```bash
export BUILD_UHD_FROM_SOURCE=True export BUILD_UHD_FROM_SOURCE=True
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment