From 680dff3cef9f39a4f62f96bf4d2c2e9e58cffa45 Mon Sep 17 00:00:00 2001
From: Robert Nelson <robertcnelson@gmail.com>
Date: Mon, 14 May 2018 11:28:18 -0500
Subject: [PATCH] buster/bionic: use native pip
Signed-off-by: Robert Nelson <robertcnelson@gmail.com>
---
target/chroot/beagleboard.org-bionic.sh | 28 ++++++++++---------------
target/chroot/beagleboard.org-buster.sh | 28 ++++++++++---------------
2 files changed, 22 insertions(+), 34 deletions(-)
diff --git a/target/chroot/beagleboard.org-bionic.sh b/target/chroot/beagleboard.org-bionic.sh
index bb51fca30..70dd229de 100755
--- a/target/chroot/beagleboard.org-bionic.sh
+++ b/target/chroot/beagleboard.org-bionic.sh
@@ -154,24 +154,18 @@ setup_desktop () {
install_pip_pkgs () {
if [ -f /usr/bin/python ] ; then
- wget https://bootstrap.pypa.io/get-pip.py || true
- if [ -f get-pip.py ] ; then
- python get-pip.py
- rm -f get-pip.py || true
-
- if [ -f /usr/local/bin/pip ] ; then
- if [ -f /usr/bin/make ] ; then
- echo "Installing pip packages"
- git_repo="https://github.com/adafruit/adafruit-beaglebone-io-python.git"
- git_target_dir="/opt/source/adafruit-beaglebone-io-python"
- git_clone
- if [ -f ${git_target_dir}/.git/config ] ; then
- cd ${git_target_dir}/
- sed -i -e 's:4.1.0:3.4.0:g' setup.py
- python setup.py install
- fi
- pip install iw_parse
+ if [ -f /usr/bin/pip ] ; then
+ if [ -f /usr/bin/make ] ; then
+ echo "Installing pip packages"
+ git_repo="https://github.com/adafruit/adafruit-beaglebone-io-python.git"
+ git_target_dir="/opt/source/adafruit-beaglebone-io-python"
+ git_clone
+ if [ -f ${git_target_dir}/.git/config ] ; then
+ cd ${git_target_dir}/
+ sed -i -e 's:4.1.0:3.4.0:g' setup.py
+ python setup.py install
fi
+ pip install iw_parse
fi
fi
fi
diff --git a/target/chroot/beagleboard.org-buster.sh b/target/chroot/beagleboard.org-buster.sh
index 3f92bbdce..2f3916b75 100755
--- a/target/chroot/beagleboard.org-buster.sh
+++ b/target/chroot/beagleboard.org-buster.sh
@@ -154,24 +154,18 @@ setup_desktop () {
install_pip_pkgs () {
if [ -f /usr/bin/python ] ; then
- wget https://bootstrap.pypa.io/get-pip.py || true
- if [ -f get-pip.py ] ; then
- python get-pip.py
- rm -f get-pip.py || true
-
- if [ -f /usr/local/bin/pip ] ; then
- if [ -f /usr/bin/make ] ; then
- echo "Installing pip packages"
- git_repo="https://github.com/adafruit/adafruit-beaglebone-io-python.git"
- git_target_dir="/opt/source/adafruit-beaglebone-io-python"
- git_clone
- if [ -f ${git_target_dir}/.git/config ] ; then
- cd ${git_target_dir}/
- sed -i -e 's:4.1.0:3.4.0:g' setup.py
- python setup.py install
- fi
- pip install iw_parse
+ if [ -f /usr/bin/pip ] ; then
+ if [ -f /usr/bin/make ] ; then
+ echo "Installing pip packages"
+ git_repo="https://github.com/adafruit/adafruit-beaglebone-io-python.git"
+ git_target_dir="/opt/source/adafruit-beaglebone-io-python"
+ git_clone
+ if [ -f ${git_target_dir}/.git/config ] ; then
+ cd ${git_target_dir}/
+ sed -i -e 's:4.1.0:3.4.0:g' setup.py
+ python setup.py install
fi
+ pip install iw_parse
fi
fi
fi
--
GitLab