From 71af065b486ce1dcc77414e063f0971bdb15c654 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20Leroy?= <frederic.leroy@b-com.com>
Date: Thu, 23 Jun 2016 15:19:56 +0200
Subject: [PATCH] build_helper: move uhd to not break apt-get remove
uhd is not part of ubuntu standard repositories >= 14.04.
Move the removal of uhd in its own space and do not fail if it doesn't exists.
---
cmake_targets/tools/build_helper | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/cmake_targets/tools/build_helper b/cmake_targets/tools/build_helper
index 36d3410349..3d7b4045ae 100755
--- a/cmake_targets/tools/build_helper
+++ b/cmake_targets/tools/build_helper
@@ -213,7 +213,8 @@ install_gnutls_from_source(){
check_install_usrp_uhd_driver(){
#first we remove old installation
- $SUDO apt-get remove uhd libuhd-dev libuhd003 uhd-host -y
+ $SUDO apt-get remove -y uhd || true
+ $SUDO apt-get remove libuhd-dev libuhd003 uhd-host -y
v=$(lsb_release -cs)
$SUDO apt-add-repository --remove "deb http://files.ettus.com/binaries/uhd/repo/uhd/ubuntu/$v $v main"
#The new USRP repository
--
GitLab