From cd88397982ec55665cc8a9389020aa6161e92c9a Mon Sep 17 00:00:00 2001
From: Robert Nelson <robertcnelson@gmail.com>
Date: Wed, 23 Nov 2016 11:44:50 -0600
Subject: [PATCH] chroot: beagle-tester depends on /usr/lib/libroboticscape.so
Signed-off-by: Robert Nelson <robertcnelson@gmail.com>
---
.../chroot/beagleboard.org-console-jessie.sh | 24 ++++++++++-------
target/chroot/beagleboard.org-jessie.sh | 26 +++++++++++--------
target/chroot/beagleboard.org-stretch.sh | 22 +++++++++++-----
target/chroot/machinekit-jessie.sh | 24 ++++++++++-------
target/chroot/seeed-jessie.sh | 24 ++++++++++-------
5 files changed, 72 insertions(+), 48 deletions(-)
diff --git a/target/chroot/beagleboard.org-console-jessie.sh b/target/chroot/beagleboard.org-console-jessie.sh
index 8e4755d75..4f667e248 100755
--- a/target/chroot/beagleboard.org-console-jessie.sh
+++ b/target/chroot/beagleboard.org-console-jessie.sh
@@ -296,24 +296,28 @@ install_git_repos () {
fi
fi
+ if [ ! -f /usr/lib/libroboticscape.so ] ; then
+ git_repo="https://github.com/StrawsonDesign/Robotics_Cape_Installer"
+ git_target_dir="/opt/source/Robotics_Cape_Installer"
+ git_clone
+ fi
+
#beagle-tester
git_repo="https://github.com/jadonk/beagle-tester"
git_target_dir="/opt/source/beagle-tester"
git_clone
if [ -f ${git_target_dir}/.git/config ] ; then
- cd ${git_target_dir}/
- if [ -f /usr/bin/make ] ; then
- make
- make install || true
- if [ ! "x${image_type}" = "xtester-2gb" ] ; then
- systemctl disable beagle-tester.service || true
+ if [ -f /usr/lib/libroboticscape.so ] ; then
+ cd ${git_target_dir}/
+ if [ -f /usr/bin/make ] ; then
+ make
+ make install || true
+ if [ ! "x${image_type}" = "xtester-2gb" ] ; then
+ systemctl disable beagle-tester.service || true
+ fi
fi
fi
fi
-
- git_repo="https://github.com/StrawsonDesign/Robotics_Cape_Installer"
- git_target_dir="/opt/source/Robotics_Cape_Installer"
- git_clone
}
install_build_pkgs () {
diff --git a/target/chroot/beagleboard.org-jessie.sh b/target/chroot/beagleboard.org-jessie.sh
index 91cab5d51..2a7cf5ab2 100755
--- a/target/chroot/beagleboard.org-jessie.sh
+++ b/target/chroot/beagleboard.org-jessie.sh
@@ -308,24 +308,28 @@ install_git_repos () {
fi
fi
+ if [ ! -f /usr/lib/libroboticscape.so ] ; then
+ git_repo="https://github.com/StrawsonDesign/Robotics_Cape_Installer"
+ git_target_dir="/opt/source/Robotics_Cape_Installer"
+ git_clone
+ fi
+
#beagle-tester
git_repo="https://github.com/jadonk/beagle-tester"
git_target_dir="/opt/source/beagle-tester"
git_clone
if [ -f ${git_target_dir}/.git/config ] ; then
- cd ${git_target_dir}/
- if [ -f /usr/bin/make ] ; then
- make
- make install || true
-# if [ ! "x${image_type}" = "xtester-2gb" ] ; then
-# systemctl disable beagle-tester.service || true
-# fi
+ if [ -f /usr/lib/libroboticscape.so ] ; then
+ cd ${git_target_dir}/
+ if [ -f /usr/bin/make ] ; then
+ make
+ make install || true
+# if [ ! "x${image_type}" = "xtester-2gb" ] ; then
+# systemctl disable beagle-tester.service || true
+# fi
+ fi
fi
fi
-
- git_repo="https://github.com/StrawsonDesign/Robotics_Cape_Installer"
- git_target_dir="/opt/source/Robotics_Cape_Installer"
- git_clone
}
install_build_pkgs () {
diff --git a/target/chroot/beagleboard.org-stretch.sh b/target/chroot/beagleboard.org-stretch.sh
index 623e8b572..bba9a081c 100755
--- a/target/chroot/beagleboard.org-stretch.sh
+++ b/target/chroot/beagleboard.org-stretch.sh
@@ -307,18 +307,26 @@ install_git_repos () {
fi
fi
+ if [ ! -f /usr/lib/libroboticscape.so ] ; then
+ git_repo="https://github.com/StrawsonDesign/Robotics_Cape_Installer"
+ git_target_dir="/opt/source/Robotics_Cape_Installer"
+ git_clone
+ fi
+
#beagle-tester
git_repo="https://github.com/jadonk/beagle-tester"
git_target_dir="/opt/source/beagle-tester"
git_clone
if [ -f ${git_target_dir}/.git/config ] ; then
- cd ${git_target_dir}/
- if [ -f /usr/bin/make ] ; then
- make
- make install || true
-# if [ ! "x${image_type}" = "xtester-2gb" ] ; then
-# systemctl disable beagle-tester.service || true
-# fi
+ if [ -f /usr/lib/libroboticscape.so ] ; then
+ cd ${git_target_dir}/
+ if [ -f /usr/bin/make ] ; then
+ make
+ make install || true
+# if [ ! "x${image_type}" = "xtester-2gb" ] ; then
+# systemctl disable beagle-tester.service || true
+# fi
+ fi
fi
fi
}
diff --git a/target/chroot/machinekit-jessie.sh b/target/chroot/machinekit-jessie.sh
index a37806b54..1d7dfb1e8 100755
--- a/target/chroot/machinekit-jessie.sh
+++ b/target/chroot/machinekit-jessie.sh
@@ -319,25 +319,29 @@ install_git_repos () {
fi
fi
+ if [ ! -f /usr/lib/libroboticscape.so ] ; then
+ git_repo="https://github.com/StrawsonDesign/Robotics_Cape_Installer"
+ git_target_dir="/opt/source/Robotics_Cape_Installer"
+ git_clone
+ fi
+
#beagle-tester
git_repo="https://github.com/jadonk/beagle-tester"
git_target_dir="/opt/source/beagle-tester"
git_clone
if [ -f ${git_target_dir}/.git/config ] ; then
- cd ${git_target_dir}/
- if [ -f /usr/bin/make ] ; then
- make
- make install || true
- if [ ! "x${image_type}" = "xtester-2gb" ] ; then
- systemctl disable beagle-tester.service || true
+ if [ -f /usr/lib/libroboticscape.so ] ; then
+ cd ${git_target_dir}/
+ if [ -f /usr/bin/make ] ; then
+ make
+ make install || true
+ if [ ! "x${image_type}" = "xtester-2gb" ] ; then
+ systemctl disable beagle-tester.service || true
+ fi
fi
fi
fi
- git_repo="https://github.com/StrawsonDesign/Robotics_Cape_Installer"
- git_target_dir="/opt/source/Robotics_Cape_Installer"
- git_clone
-
# Build a dtc compiler that works with the 3.8.13 kernel
if [ -f /usr/bin/make ] ; then
if [ -f /opt/scripts/tools/dtc/dtc-3.8.x.sh ] ; then
diff --git a/target/chroot/seeed-jessie.sh b/target/chroot/seeed-jessie.sh
index 23ac65b21..7ff25e6aa 100755
--- a/target/chroot/seeed-jessie.sh
+++ b/target/chroot/seeed-jessie.sh
@@ -381,24 +381,28 @@ install_git_repos () {
fi
fi
+ if [ ! -f /usr/lib/libroboticscape.so ] ; then
+ git_repo="https://github.com/StrawsonDesign/Robotics_Cape_Installer"
+ git_target_dir="/opt/source/Robotics_Cape_Installer"
+ git_clone
+ fi
+
#beagle-tester
git_repo="https://github.com/jadonk/beagle-tester"
git_target_dir="/opt/source/beagle-tester"
git_clone
if [ -f ${git_target_dir}/.git/config ] ; then
- cd ${git_target_dir}/
- if [ -f /usr/bin/make ] ; then
- make
- make install || true
- if [ ! "x${image_type}" = "xtester-2gb" ] ; then
- systemctl disable beagle-tester.service || true
+ if [ -f /usr/lib/libroboticscape.so ] ; then
+ cd ${git_target_dir}/
+ if [ -f /usr/bin/make ] ; then
+ make
+ make install || true
+ if [ ! "x${image_type}" = "xtester-2gb" ] ; then
+ systemctl disable beagle-tester.service || true
+ fi
fi
fi
fi
-
- git_repo="https://github.com/StrawsonDesign/Robotics_Cape_Installer"
- git_target_dir="/opt/source/Robotics_Cape_Installer"
- git_clone
}
install_build_pkgs () {
--
GitLab