From 0bbdf7a4a72faa023843cd4bb4e26d4f1761d116 Mon Sep 17 00:00:00 2001
From: Robert Nelson <robertcnelson@gmail.com>
Date: Mon, 14 May 2018 13:01:16 -0500
Subject: [PATCH] bb.org: buster/bionic: use python3/pip3
Signed-off-by: Robert Nelson <robertcnelson@gmail.com>
---
configs/bb.org-debian-buster-efi-iot-v4.14.conf | 1 +
configs/bb.org-debian-buster-iot-v4.14.conf | 1 +
configs/bb.org-debian-buster-iot-v4.9.conf | 1 +
configs/bb.org-ubuntu-bionic-ros-iot-v4.14.conf | 1 +
target/chroot/beagleboard.org-bionic.sh | 12 +++++++-----
target/chroot/beagleboard.org-buster.sh | 8 ++++----
6 files changed, 15 insertions(+), 9 deletions(-)
diff --git a/configs/bb.org-debian-buster-efi-iot-v4.14.conf b/configs/bb.org-debian-buster-efi-iot-v4.14.conf
index 514e4f8d0..b4d505a50 100644
--- a/configs/bb.org-debian-buster-efi-iot-v4.14.conf
+++ b/configs/bb.org-debian-buster-efi-iot-v4.14.conf
@@ -73,6 +73,7 @@ deb_include=" \
python3 \
python3-dev \
python3-numpy \
+ python3-pip \
python3-setuptools \
rfkill \
rsync \
diff --git a/configs/bb.org-debian-buster-iot-v4.14.conf b/configs/bb.org-debian-buster-iot-v4.14.conf
index 2814d7fcf..df1677f15 100644
--- a/configs/bb.org-debian-buster-iot-v4.14.conf
+++ b/configs/bb.org-debian-buster-iot-v4.14.conf
@@ -73,6 +73,7 @@ deb_include=" \
python3 \
python3-dev \
python3-numpy \
+ python3-pip \
python3-setuptools \
rfkill \
rsync \
diff --git a/configs/bb.org-debian-buster-iot-v4.9.conf b/configs/bb.org-debian-buster-iot-v4.9.conf
index 68df931cc..8efb02571 100644
--- a/configs/bb.org-debian-buster-iot-v4.9.conf
+++ b/configs/bb.org-debian-buster-iot-v4.9.conf
@@ -73,6 +73,7 @@ deb_include=" \
python3 \
python3-dev \
python3-numpy \
+ python3-pip \
python3-setuptools \
rfkill \
rsync \
diff --git a/configs/bb.org-ubuntu-bionic-ros-iot-v4.14.conf b/configs/bb.org-ubuntu-bionic-ros-iot-v4.14.conf
index e3896cadc..36632b700 100644
--- a/configs/bb.org-ubuntu-bionic-ros-iot-v4.14.conf
+++ b/configs/bb.org-ubuntu-bionic-ros-iot-v4.14.conf
@@ -65,6 +65,7 @@ deb_include=" \
python3 \
python3-dev \
python3-numpy \
+ python3-pip \
python3-setuptools \
rfkill \
rsync \
diff --git a/target/chroot/beagleboard.org-bionic.sh b/target/chroot/beagleboard.org-bionic.sh
index 6e4b19673..77cdba8ef 100755
--- a/target/chroot/beagleboard.org-bionic.sh
+++ b/target/chroot/beagleboard.org-bionic.sh
@@ -153,8 +153,8 @@ setup_desktop () {
}
install_pip_pkgs () {
- if [ -f /usr/bin/python ] ; then
- if [ -f /usr/bin/pip ] ; then
+ if [ -f /usr/bin/python3 ] ; then
+ if [ -f /usr/bin/pip3 ] ; then
if [ -f /usr/bin/make ] ; then
echo "Installing pip packages"
git_repo="https://github.com/adafruit/adafruit-beaglebone-io-python.git"
@@ -163,9 +163,9 @@ install_pip_pkgs () {
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
+ python3 setup.py install
fi
- pip install iw_parse
+ pip3 install iw_parse
fi
fi
fi
@@ -322,7 +322,9 @@ install_git_repos () {
ros_initialize_rosdep () {
echo "ros: Initialize rosdep"
rosdep init
- su - ${rfs_username} -c "rosdep update"
+ rosdep update
+ ls -lha /home/
+ #su - ${rfs_username} -c "rosdep update"
echo "source /opt/ros/melodic/setup.bash" >> /home/${rfs_username}/.bashrc
}
diff --git a/target/chroot/beagleboard.org-buster.sh b/target/chroot/beagleboard.org-buster.sh
index 2f3916b75..2cd6c3b7f 100755
--- a/target/chroot/beagleboard.org-buster.sh
+++ b/target/chroot/beagleboard.org-buster.sh
@@ -153,8 +153,8 @@ setup_desktop () {
}
install_pip_pkgs () {
- if [ -f /usr/bin/python ] ; then
- if [ -f /usr/bin/pip ] ; then
+ if [ -f /usr/bin/python3 ] ; then
+ if [ -f /usr/bin/pip3 ] ; then
if [ -f /usr/bin/make ] ; then
echo "Installing pip packages"
git_repo="https://github.com/adafruit/adafruit-beaglebone-io-python.git"
@@ -163,9 +163,9 @@ install_pip_pkgs () {
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
+ python3 setup.py install
fi
- pip install iw_parse
+ pip3 install iw_parse
fi
fi
fi
--
GitLab