From e73b981c678287c970583aff3defaf4708633231 Mon Sep 17 00:00:00 2001 From: Tully Foote Date: Fri, 28 Oct 2016 09:28:20 -0700 Subject: [PATCH] updating pip invocation to avoid https://github.com/pypa/pip/issues/3826 --- doc/ardupilot/readme.md | 4 +++- packaging/build_package.sh | 4 ++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/doc/ardupilot/readme.md b/doc/ardupilot/readme.md index 65a24e1..89a3ef4 100644 --- a/doc/ardupilot/readme.md +++ b/doc/ardupilot/readme.md @@ -124,8 +124,10 @@ git submodule update --init --recursive ~~~ ### Install mavproxy + +You will need mavproxy installed from pip on your system. ~~~ -sudo pip install --target=/opt/sasc/lib/python/site-packages/ mavproxy --install-option="--install-scripts=/opt/sasc/bin" +sudo pip install mavproxy ~~~ # Run Simulation from binary installation diff --git a/packaging/build_package.sh b/packaging/build_package.sh index dfcb1b1..c57595c 100755 --- a/packaging/build_package.sh +++ b/packaging/build_package.sh @@ -39,7 +39,7 @@ git clone https://github.com/tfoote/ardupilot.git -b uctf-dev echo "Building Ardupilot..." cd ardupilot export PATH=${PATH}:${WS}/ardupilot/Tools/autotest -./Tools/scripts/install-prereqs-ubuntu.sh +# ./Tools/scripts/install-prereqs-ubuntu.sh git submodule update --init --recursive ./waf configure --prefix=${INSTALL} ./waf @@ -47,7 +47,7 @@ git submodule update --init --recursive echo "Installing mavproxy" -pip install mavproxy --target=${INSTALL}/lib/python/site-packages/ --install-option="--install-scripts=/opt/sasc/bin" +pip install mavproxy --system --target=${INSTALL}/lib/python/site-packages/ --install-option="--install-scripts=/opt/sasc/bin" echo "generating control file"