Skip to content

O
OpenXG-RAN
Commit bfb7713f authored by Robert Schmidt's avatar Robert Schmidt
Browse files
Options

Merge remote-tracking branch 'origin/fix-u22' into integration_2022_wk19

parents 8dcea72a 3e3d73ef
Hide whitespace changes
Inline Side-by-side
Showing with 9 additions and 7 deletions
cmake_targets/tools/build_helper
View file @ bfb7713f
...@@ -381,7 +381,7 @@ check_install_usrp_uhd_driver(){ ...@@ -381,7 +381,7 @@ check_install_usrp_uhd_driver(){
$SUDO apt-get remove libuhd3.14.1 -y || true $SUDO apt-get remove libuhd3.14.1 -y || true
$SUDO apt-get remove libuhd3.15.0 -y || true $SUDO apt-get remove libuhd3.15.0 -y || true
local distribution=$(get_distribution_release) local distribution=$(get_distribution_release)
if [[ "$distribution" == "ubuntu18.04" ]]; then if [[ "$distribution" == "ubuntu18.04" || "$distribution" == "ubuntu20.04" || "$distribution" == "ubuntu22.04" ]]; then
$SUDO apt-get remove libuhd4.0.0 -y || true $SUDO apt-get remove libuhd4.0.0 -y || true
$SUDO apt-get remove libuhd4.1.0 -y || true $SUDO apt-get remove libuhd4.1.0 -y || true
fi fi
...@@ -410,13 +410,15 @@ check_install_usrp_uhd_driver(){ ...@@ -410,13 +410,15 @@ check_install_usrp_uhd_driver(){
x=$((x + 1)) x=$((x + 1))
done done
$SUDO apt-get update $SUDO apt-get update
$SUDO apt-get -y install python python-tk libboost-all-dev libusb-1.0-0-dev $SUDO apt-get -y install python-tk libboost-all-dev libusb-1.0-0-dev
if [[ "$distribution" == "ubuntu16.04" ]]; then case "$(get_distribution_release)" in
"ubuntu16.04")
$SUDO apt-get -y install libuhd-dev libuhd3.15.0 uhd-host $SUDO apt-get -y install libuhd-dev libuhd3.15.0 uhd-host
fi ;;
if [[ "$distribution" == "ubuntu18.04" ]]; then "ubuntu18.04" | "ubuntu20.04" | "ubuntu22.04")
$SUDO apt-get -y install libuhd-dev libuhd4.1.0 uhd-host $SUDO apt-get -y install libuhd-dev libuhd4.2.0 uhd-host
fi ;;
esac
elif [[ "$OS_BASEDISTRO" == "fedora" ]]; then elif [[ "$OS_BASEDISTRO" == "fedora" ]]; then
if [ $IS_CONTAINER -eq 0 ] if [ $IS_CONTAINER -eq 0 ]
then then
......
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