From 3fdbadb3b9faff31b3c5da446a484e524cf0bf38 Mon Sep 17 00:00:00 2001
From: Robert Nelson <robertcnelson@gmail.com>
Date: Tue, 8 Nov 2016 16:04:51 -0600
Subject: [PATCH] jessie/stretch: pru-software-support-package is now packaged

Signed-off-by: Robert Nelson <robertcnelson@gmail.com>
---
 configs/bb.org-debian-jessie-iot-2gb-v4.4.conf    | 1 +
 configs/bb.org-debian-jessie-iot-v4.1.conf        | 1 +
 configs/bb.org-debian-jessie-iot-v4.4.conf        | 1 +
 configs/bb.org-debian-jessie-iot-v4.9.conf        | 1 +
 configs/bb.org-debian-jessie-lxqt-2gb-v4.1.conf   | 1 +
 configs/bb.org-debian-jessie-lxqt-2gb-v4.4.conf   | 1 +
 configs/bb.org-debian-jessie-lxqt-4gb-v4.1.conf   | 1 +
 configs/bb.org-debian-jessie-lxqt-4gb-v4.4.conf   | 1 +
 configs/bb.org-debian-jessie-lxqt-4gb.conf        | 1 +
 configs/bb.org-debian-jessie-tester-2gb-v4.1.conf | 1 +
 configs/bb.org-debian-stretch-iot-v4.9.conf       | 1 +
 configs/bb.org-debian-stretch-wayland-v4.4.conf   | 1 +
 configs/machinekit-debian-jessie.conf             | 1 +
 configs/seeed-debian-jessie-gcp-iot-v4.4.conf     | 1 +
 configs/seeed-debian-jessie-iot-v4.1.conf         | 1 +
 configs/seeed-debian-jessie-iot-v4.4.conf         | 1 +
 configs/seeed-debian-jessie-lxqt-4gb-v4.1.conf    | 1 +
 configs/seeed-debian-jessie-lxqt-4gb-v4.4.conf    | 1 +
 target/chroot/beagleboard.org-console-jessie.sh   | 7 -------
 target/chroot/beagleboard.org-jessie.sh           | 7 -------
 target/chroot/beagleboard.org-stretch.sh          | 7 -------
 target/chroot/machinekit-jessie.sh                | 7 -------
 target/chroot/seeed-jessie.sh                     | 7 -------
 23 files changed, 18 insertions(+), 35 deletions(-)

diff --git a/configs/bb.org-debian-jessie-iot-2gb-v4.4.conf b/configs/bb.org-debian-jessie-iot-2gb-v4.4.conf
index 4bd217849..735a2e213 100644
--- a/configs/bb.org-debian-jessie-iot-2gb-v4.4.conf
+++ b/configs/bb.org-debian-jessie-iot-2gb-v4.4.conf
@@ -138,6 +138,7 @@ repo_rcnee_pkg_list="	\
 	libsoc-dev	\
 	libsoc2	\
 	linux-image-4.4.30-ti-r64	\
+	pru-software-support-package	\
 	rcn-ee-archive-keyring	\
 	rcnee-access-point	\
 	ti-pru-cgt-installer	\
diff --git a/configs/bb.org-debian-jessie-iot-v4.1.conf b/configs/bb.org-debian-jessie-iot-v4.1.conf
index a38226498..2de9802d8 100644
--- a/configs/bb.org-debian-jessie-iot-v4.1.conf
+++ b/configs/bb.org-debian-jessie-iot-v4.1.conf
@@ -141,6 +141,7 @@ repo_rcnee_pkg_list="	\
 	libsoc-dev	\
 	libsoc2	\
 	linux-image-4.1.30-ti-r69	\
+	pru-software-support-package	\
 	rcn-ee-archive-keyring	\
 	rcnee-access-point	\
 	ti-pru-cgt-installer	\
diff --git a/configs/bb.org-debian-jessie-iot-v4.4.conf b/configs/bb.org-debian-jessie-iot-v4.4.conf
index 32779d63f..a37a93e72 100644
--- a/configs/bb.org-debian-jessie-iot-v4.4.conf
+++ b/configs/bb.org-debian-jessie-iot-v4.4.conf
@@ -141,6 +141,7 @@ repo_rcnee_pkg_list="	\
 	libsoc-dev	\
 	libsoc2	\
 	linux-image-4.4.30-ti-r64	\
+	pru-software-support-package	\
 	rcn-ee-archive-keyring	\
 	rcnee-access-point	\
 	ti-pru-cgt-installer	\
diff --git a/configs/bb.org-debian-jessie-iot-v4.9.conf b/configs/bb.org-debian-jessie-iot-v4.9.conf
index 9790a03a0..b19c56ae5 100644
--- a/configs/bb.org-debian-jessie-iot-v4.9.conf
+++ b/configs/bb.org-debian-jessie-iot-v4.9.conf
@@ -141,6 +141,7 @@ repo_rcnee_pkg_list="	\
 	libsoc-dev	\
 	libsoc2	\
 	linux-image-4.9.0-rc3-ti-r2	\
+	pru-software-support-package	\
 	rcn-ee-archive-keyring	\
 	rcnee-access-point	\
 	ti-pru-cgt-installer	\
diff --git a/configs/bb.org-debian-jessie-lxqt-2gb-v4.1.conf b/configs/bb.org-debian-jessie-lxqt-2gb-v4.1.conf
index d282e81cf..cddbcae44 100644
--- a/configs/bb.org-debian-jessie-lxqt-2gb-v4.1.conf
+++ b/configs/bb.org-debian-jessie-lxqt-2gb-v4.1.conf
@@ -145,6 +145,7 @@ repo_rcnee_pkg_list="	\
 	lxqt-sudo	\
 	obconf	\
 	pcmanfm-qt	\
+	pru-software-support-package	\
 	qterminal	\
 	rcn-ee-archive-keyring	\
 	rcnee-access-point	\
diff --git a/configs/bb.org-debian-jessie-lxqt-2gb-v4.4.conf b/configs/bb.org-debian-jessie-lxqt-2gb-v4.4.conf
index 5b20b85cd..46e42e822 100644
--- a/configs/bb.org-debian-jessie-lxqt-2gb-v4.4.conf
+++ b/configs/bb.org-debian-jessie-lxqt-2gb-v4.4.conf
@@ -145,6 +145,7 @@ repo_rcnee_pkg_list="	\
 	lxqt-sudo	\
 	obconf	\
 	pcmanfm-qt	\
+	pru-software-support-package	\
 	qterminal	\
 	rcn-ee-archive-keyring	\
 	rcnee-access-point	\
diff --git a/configs/bb.org-debian-jessie-lxqt-4gb-v4.1.conf b/configs/bb.org-debian-jessie-lxqt-4gb-v4.1.conf
index 410ceb229..629fd6a1f 100644
--- a/configs/bb.org-debian-jessie-lxqt-4gb-v4.1.conf
+++ b/configs/bb.org-debian-jessie-lxqt-4gb-v4.1.conf
@@ -176,6 +176,7 @@ repo_rcnee_pkg_list="	\
 	mesa-utils-extra	\
 	obconf	\
 	pcmanfm-qt	\
+	pru-software-support-package	\
 	qps	\
 	qterminal	\
 	qupzilla	\
diff --git a/configs/bb.org-debian-jessie-lxqt-4gb-v4.4.conf b/configs/bb.org-debian-jessie-lxqt-4gb-v4.4.conf
index 3e73c89d3..fe107d498 100644
--- a/configs/bb.org-debian-jessie-lxqt-4gb-v4.4.conf
+++ b/configs/bb.org-debian-jessie-lxqt-4gb-v4.4.conf
@@ -176,6 +176,7 @@ repo_rcnee_pkg_list="	\
 	mesa-utils-extra	\
 	obconf	\
 	pcmanfm-qt	\
+	pru-software-support-package	\
 	qps	\
 	qterminal	\
 	qupzilla	\
diff --git a/configs/bb.org-debian-jessie-lxqt-4gb.conf b/configs/bb.org-debian-jessie-lxqt-4gb.conf
index 3d57a0249..7fdca855c 100644
--- a/configs/bb.org-debian-jessie-lxqt-4gb.conf
+++ b/configs/bb.org-debian-jessie-lxqt-4gb.conf
@@ -175,6 +175,7 @@ repo_rcnee_pkg_list="	\
 	mesa-utils-extra	\
 	obconf	\
 	pcmanfm-qt	\
+	pru-software-support-package	\
 	qps	\
 	qterminal	\
 	qupzilla	\
diff --git a/configs/bb.org-debian-jessie-tester-2gb-v4.1.conf b/configs/bb.org-debian-jessie-tester-2gb-v4.1.conf
index c66c7afd6..10aca3e9d 100644
--- a/configs/bb.org-debian-jessie-tester-2gb-v4.1.conf
+++ b/configs/bb.org-debian-jessie-tester-2gb-v4.1.conf
@@ -125,6 +125,7 @@ repo_rcnee_pkg_list="	\
 	haveged	\
 	jekyll	\
 	linux-image-4.1.30-ti-r69	\
+	pru-software-support-package	\
 	rcn-ee-archive-keyring	\
 	rcnee-access-point	\
 	tiomapconf	\
diff --git a/configs/bb.org-debian-stretch-iot-v4.9.conf b/configs/bb.org-debian-stretch-iot-v4.9.conf
index 4eb50b04b..b75ad6dc3 100644
--- a/configs/bb.org-debian-stretch-iot-v4.9.conf
+++ b/configs/bb.org-debian-stretch-iot-v4.9.conf
@@ -106,6 +106,7 @@ repo_rcnee_pkg_list="	\
 	bb-customizations	\
 	linux-image-4.9.0-rc3-ti-r2	\
 	nodejs	\
+	pru-software-support-package	\
 	rcn-ee-archive-keyring	\
 "
 
diff --git a/configs/bb.org-debian-stretch-wayland-v4.4.conf b/configs/bb.org-debian-stretch-wayland-v4.4.conf
index 1e51a0456..45feedfdd 100644
--- a/configs/bb.org-debian-stretch-wayland-v4.4.conf
+++ b/configs/bb.org-debian-stretch-wayland-v4.4.conf
@@ -110,6 +110,7 @@ repo_rcnee_pkg_list="	\
 	ipumm-dra7xx-installer	\
 	linux-image-4.4.30-ti-r64	\
 	nodejs	\
+	pru-software-support-package	\
 	rcn-ee-archive-keyring	\
 	ti-c6000-cgt-v8.1.x-installer	\
 	ti-llvm-3.6	\
diff --git a/configs/machinekit-debian-jessie.conf b/configs/machinekit-debian-jessie.conf
index ac06219df..2ecd21bc9 100644
--- a/configs/machinekit-debian-jessie.conf
+++ b/configs/machinekit-debian-jessie.conf
@@ -154,6 +154,7 @@ repo_rcnee_pkg_list="	\
 	libsoc-dev	\
 	libsoc2	\
 	linux-image-3.8.13-xenomai-r81	\
+	pru-software-support-package	\
 	rcn-ee-archive-keyring	\
 	rcnee-access-point	\
 	tiomapconf	\
diff --git a/configs/seeed-debian-jessie-gcp-iot-v4.4.conf b/configs/seeed-debian-jessie-gcp-iot-v4.4.conf
index e742fbd7b..39a17e216 100644
--- a/configs/seeed-debian-jessie-gcp-iot-v4.4.conf
+++ b/configs/seeed-debian-jessie-gcp-iot-v4.4.conf
@@ -145,6 +145,7 @@ repo_rcnee_pkg_list="	\
 	libsoc-dev	\
 	libsoc2	\
 	linux-image-4.4.30-ti-r64	\
+	pru-software-support-package	\
 	rcn-ee-archive-keyring	\
 	rcnee-access-point	\
 	seeed-wificonfig-installer	\
diff --git a/configs/seeed-debian-jessie-iot-v4.1.conf b/configs/seeed-debian-jessie-iot-v4.1.conf
index 8c6b153ba..595f79854 100644
--- a/configs/seeed-debian-jessie-iot-v4.1.conf
+++ b/configs/seeed-debian-jessie-iot-v4.1.conf
@@ -145,6 +145,7 @@ repo_rcnee_pkg_list="	\
 	libsoc2	\
 	linux-headers-4.1.30-ti-r69	\
 	linux-image-4.1.30-ti-r69	\
+	pru-software-support-package	\
 	rcn-ee-archive-keyring	\
 	rcnee-access-point	\
 	seeed-wificonfig-installer	\
diff --git a/configs/seeed-debian-jessie-iot-v4.4.conf b/configs/seeed-debian-jessie-iot-v4.4.conf
index 0ac525aa8..ea3e4a0a0 100644
--- a/configs/seeed-debian-jessie-iot-v4.4.conf
+++ b/configs/seeed-debian-jessie-iot-v4.4.conf
@@ -144,6 +144,7 @@ repo_rcnee_pkg_list="	\
 	libsoc-dev	\
 	libsoc2	\
 	linux-image-4.4.30-ti-r64	\
+	pru-software-support-package	\
 	rcn-ee-archive-keyring	\
 	rcnee-access-point	\
 	seeed-wificonfig-installer	\
diff --git a/configs/seeed-debian-jessie-lxqt-4gb-v4.1.conf b/configs/seeed-debian-jessie-lxqt-4gb-v4.1.conf
index 3a9304157..51648e9d7 100644
--- a/configs/seeed-debian-jessie-lxqt-4gb-v4.1.conf
+++ b/configs/seeed-debian-jessie-lxqt-4gb-v4.1.conf
@@ -177,6 +177,7 @@ repo_rcnee_pkg_list="	\
 	mesa-utils-extra	\
 	obconf	\
 	pcmanfm-qt	\
+	pru-software-support-package	\
 	qps	\
 	qterminal	\
 	qupzilla	\
diff --git a/configs/seeed-debian-jessie-lxqt-4gb-v4.4.conf b/configs/seeed-debian-jessie-lxqt-4gb-v4.4.conf
index 61bbbaed1..8b6e1fd43 100644
--- a/configs/seeed-debian-jessie-lxqt-4gb-v4.4.conf
+++ b/configs/seeed-debian-jessie-lxqt-4gb-v4.4.conf
@@ -177,6 +177,7 @@ repo_rcnee_pkg_list="	\
 	mesa-utils-extra	\
 	obconf	\
 	pcmanfm-qt	\
+	pru-software-support-package	\
 	qps	\
 	qterminal	\
 	qupzilla	\
diff --git a/target/chroot/beagleboard.org-console-jessie.sh b/target/chroot/beagleboard.org-console-jessie.sh
index caf287fd7..06f1df066 100755
--- a/target/chroot/beagleboard.org-console-jessie.sh
+++ b/target/chroot/beagleboard.org-console-jessie.sh
@@ -296,13 +296,6 @@ install_git_repos () {
 		fi
 	fi
 
-	#am335x-pru-package
-	if [ -f /usr/include/prussdrv.h ] ; then
-		git_repo="git://git.ti.com/pru-software-support-package/pru-software-support-package.git"
-		git_target_dir="/opt/source/pru-software-support-package"
-		git_clone
-	fi
-
 	#beagle-tester
 	git_repo="https://github.com/jadonk/beagle-tester"
 	git_target_dir="/opt/source/beagle-tester"
diff --git a/target/chroot/beagleboard.org-jessie.sh b/target/chroot/beagleboard.org-jessie.sh
index 36eb7232a..526651848 100755
--- a/target/chroot/beagleboard.org-jessie.sh
+++ b/target/chroot/beagleboard.org-jessie.sh
@@ -308,13 +308,6 @@ install_git_repos () {
 		fi
 	fi
 
-	#am335x-pru-package
-	if [ -f /usr/include/prussdrv.h ] ; then
-		git_repo="git://git.ti.com/pru-software-support-package/pru-software-support-package.git"
-		git_target_dir="/opt/source/pru-software-support-package"
-		git_clone
-	fi
-
 	#beagle-tester
 	git_repo="https://github.com/jadonk/beagle-tester"
 	git_target_dir="/opt/source/beagle-tester"
diff --git a/target/chroot/beagleboard.org-stretch.sh b/target/chroot/beagleboard.org-stretch.sh
index b68682ccc..f9eb2a44f 100755
--- a/target/chroot/beagleboard.org-stretch.sh
+++ b/target/chroot/beagleboard.org-stretch.sh
@@ -307,13 +307,6 @@ install_git_repos () {
 		fi
 	fi
 
-	#am335x-pru-package
-	if [ -f /usr/include/prussdrv.h ] ; then
-		git_repo="git://git.ti.com/pru-software-support-package/pru-software-support-package.git"
-		git_target_dir="/opt/source/pru-software-support-package"
-		git_clone
-	fi
-
 	#beagle-tester
 	git_repo="https://github.com/jadonk/beagle-tester"
 	git_target_dir="/opt/source/beagle-tester"
diff --git a/target/chroot/machinekit-jessie.sh b/target/chroot/machinekit-jessie.sh
index 979ac34dc..b84dfa3de 100755
--- a/target/chroot/machinekit-jessie.sh
+++ b/target/chroot/machinekit-jessie.sh
@@ -319,13 +319,6 @@ install_git_repos () {
 		fi
 	fi
 
-	#am335x-pru-package
-	if [ -f /usr/include/prussdrv.h ] ; then
-		git_repo="git://git.ti.com/pru-software-support-package/pru-software-support-package.git"
-		git_target_dir="/opt/source/pru-software-support-package"
-		git_clone
-	fi
-
 	#beagle-tester
 	git_repo="https://github.com/jadonk/beagle-tester"
 	git_target_dir="/opt/source/beagle-tester"
diff --git a/target/chroot/seeed-jessie.sh b/target/chroot/seeed-jessie.sh
index 919bebefa..616c8ae7d 100755
--- a/target/chroot/seeed-jessie.sh
+++ b/target/chroot/seeed-jessie.sh
@@ -381,13 +381,6 @@ install_git_repos () {
 		fi
 	fi
 
-	#am335x-pru-package
-	if [ -f /usr/include/prussdrv.h ] ; then
-		git_repo="git://git.ti.com/pru-software-support-package/pru-software-support-package.git"
-		git_target_dir="/opt/source/pru-software-support-package"
-		git_clone
-	fi
-
 	#beagle-tester
 	git_repo="https://github.com/jadonk/beagle-tester"
 	git_target_dir="/opt/source/beagle-tester"
-- 
GitLab