From 9fa659e3d18f33f0724fea93ecdf5f3069a17c09 Mon Sep 17 00:00:00 2001
From: Robert Nelson <robertcnelson@gmail.com>
Date: Fri, 24 Jul 2015 19:48:11 -0500
Subject: [PATCH] x15: add vpdma-dra7xx-installer
Signed-off-by: Robert Nelson <robertcnelson@gmail.com>
---
configs/bb.org-debian-jessie-console-v4.1.conf | 2 +-
configs/bb.org-debian-jessie-console.conf | 2 +-
configs/bb.org-debian-jessie-lxqt-4gb-v3.14.conf | 2 +-
configs/bb.org-debian-jessie-lxqt-4gb-v4.1.conf | 2 +-
configs/bb.org-debian-jessie-lxqt-4gb.conf | 2 +-
configs/bb.org-debian-jessie-usbflasher.conf | 2 +-
configs/bb.org-debian-wheezy-console.conf | 2 +-
configs/machinekit-debian-wheezy.conf | 2 +-
configs/rcn-ee_console_debian_jessie_armhf.conf | 2 +-
configs/rcn-ee_console_debian_stretch_armhf.conf | 2 +-
configs/rcn-ee_console_debian_wheezy_armhf.conf | 2 +-
configs/rcn-ee_console_ubuntu_trusty_armhf.conf | 2 +-
configs/ros_indigo.conf | 2 +-
scripts/chroot.sh | 4 +++-
14 files changed, 16 insertions(+), 14 deletions(-)
diff --git a/configs/bb.org-debian-jessie-console-v4.1.conf b/configs/bb.org-debian-jessie-console-v4.1.conf
index 51f1ebc4d..2b0fef30a 100644
--- a/configs/bb.org-debian-jessie-console-v4.1.conf
+++ b/configs/bb.org-debian-jessie-console-v4.1.conf
@@ -44,7 +44,7 @@ rfs_ssh_user_pass="enable"
##enable kernel repo: http://repos.rcn-ee.com/(debian|ubuntu)
repo_rcnee="enable"
repo_rcnee_pkg_list="linux-image-4.1.3-ti-r6 \
-bb-customizations ipumm-dra7xx-installer rcn-ee-archive-keyring tiomapconf"
+bb-customizations ipumm-dra7xx-installer vpdma-dra7xx-installer rcn-ee-archive-keyring tiomapconf"
#
repo_rcnee_pkg_version="4.1.3-ti-r6"
#include_firmware="enable"
diff --git a/configs/bb.org-debian-jessie-console.conf b/configs/bb.org-debian-jessie-console.conf
index 7be268bae..2bcdec1bc 100644
--- a/configs/bb.org-debian-jessie-console.conf
+++ b/configs/bb.org-debian-jessie-console.conf
@@ -44,7 +44,7 @@ rfs_ssh_user_pass="enable"
##enable kernel repo: http://repos.rcn-ee.com/(debian|ubuntu)
repo_rcnee="enable"
repo_rcnee_pkg_list="linux-image-3.14.48-ti-r72 bb-customizations \
-ipumm-dra7xx-installer rcn-ee-archive-keyring tiomapconf"
+ipumm-dra7xx-installer vpdma-dra7xx-installer rcn-ee-archive-keyring tiomapconf"
#
repo_rcnee_pkg_version="3.14.48-ti-r72"
#include_firmware="enable"
diff --git a/configs/bb.org-debian-jessie-lxqt-4gb-v3.14.conf b/configs/bb.org-debian-jessie-lxqt-4gb-v3.14.conf
index 956e67b05..de41b0be1 100644
--- a/configs/bb.org-debian-jessie-lxqt-4gb-v3.14.conf
+++ b/configs/bb.org-debian-jessie-lxqt-4gb-v3.14.conf
@@ -56,7 +56,7 @@ rfs_ssh_user_pass="enable"
##enable kernel repo: http://repos.rcn-ee.com/(debian|ubuntu)
repo_rcnee="enable"
repo_rcnee_pkg_list="linux-image-4.1.3-armv7-x2 linux-image-3.14.48-ti-r72 bb-customizations \
-am335x-pru-package ap-hotspot ipumm-dra7xx-installer c9-core-installer chromium-browser \
+am335x-pru-package ap-hotspot ipumm-dra7xx-installer vpdma-dra7xx-installer c9-core-installer chromium-browser \
cmst compton-conf dart-1.10 device-tree-compiler libfm-tools libgl1-mesa-dri libsoc-dev \
libsoc2 lximage-qt lxqt-about lxqt-admin lxqt-common lxqt-config lxqt-globalkeys \
lxqt-notificationd lxqt-panel lxqt-policykit lxqt-runner lxqt-session obconf \
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 2482d1ec3..f5d924ef1 100644
--- a/configs/bb.org-debian-jessie-lxqt-4gb-v4.1.conf
+++ b/configs/bb.org-debian-jessie-lxqt-4gb-v4.1.conf
@@ -57,7 +57,7 @@ rfs_ssh_user_pass="enable"
repo_rcnee="enable"
repo_rcnee_pkg_list="linux-image-4.1.3-armv7-x2 linux-image-4.1.3-ti-r6 linux-headers-4.1.3-ti-r6\
bb-customizations \
-am335x-pru-package ap-hotspot ipumm-dra7xx-installer c9-core-installer chromium-browser \
+am335x-pru-package ap-hotspot ipumm-dra7xx-installer vpdma-dra7xx-installer c9-core-installer chromium-browser \
cmst compton-conf device-tree-compiler libfm-tools libgl1-mesa-dri libsoc-dev \
libsoc2 lximage-qt lxqt-about lxqt-admin lxqt-common lxqt-config lxqt-globalkeys \
lxqt-notificationd lxqt-panel lxqt-policykit lxqt-runner lxqt-session obconf \
diff --git a/configs/bb.org-debian-jessie-lxqt-4gb.conf b/configs/bb.org-debian-jessie-lxqt-4gb.conf
index 72b0aa843..d6b4015c1 100644
--- a/configs/bb.org-debian-jessie-lxqt-4gb.conf
+++ b/configs/bb.org-debian-jessie-lxqt-4gb.conf
@@ -56,7 +56,7 @@ rfs_ssh_user_pass="enable"
##enable kernel repo: http://repos.rcn-ee.com/(debian|ubuntu)
repo_rcnee="enable"
repo_rcnee_pkg_list="linux-image-3.8.13-bone72 bb-customizations \
-am335x-pru-package ap-hotspot ipumm-dra7xx-installer c9-core-installer chromium-browser \
+am335x-pru-package ap-hotspot ipumm-dra7xx-installer vpdma-dra7xx-installer c9-core-installer chromium-browser \
cmst compton-conf dart-1.10 device-tree-compiler libfm-tools libgl1-mesa-dri libsoc-dev \
libsoc2 lximage-qt lxqt-about lxqt-admin lxqt-common lxqt-config lxqt-globalkeys \
lxqt-notificationd lxqt-panel lxqt-policykit lxqt-runner lxqt-session obconf \
diff --git a/configs/bb.org-debian-jessie-usbflasher.conf b/configs/bb.org-debian-jessie-usbflasher.conf
index c8d49b9e7..1a5434310 100644
--- a/configs/bb.org-debian-jessie-usbflasher.conf
+++ b/configs/bb.org-debian-jessie-usbflasher.conf
@@ -44,7 +44,7 @@ rfs_ssh_user_pass="enable"
##enable kernel repo: http://repos.rcn-ee.com/(debian|ubuntu)
repo_rcnee="enable"
repo_rcnee_pkg_list="linux-image-4.1.3-ti-r6 \
-bb-customizations ipumm-dra7xx-installer rcn-ee-archive-keyring tiomapconf"
+bb-customizations ipumm-dra7xx-installer vpdma-dra7xx-installer rcn-ee-archive-keyring tiomapconf"
#
repo_rcnee_pkg_version="4.1.3-ti-r6"
#include_firmware="enable"
diff --git a/configs/bb.org-debian-wheezy-console.conf b/configs/bb.org-debian-wheezy-console.conf
index ceab14f47..ed1dcc8c8 100644
--- a/configs/bb.org-debian-wheezy-console.conf
+++ b/configs/bb.org-debian-wheezy-console.conf
@@ -44,7 +44,7 @@ rfs_ssh_user_pass="enable"
##enable kernel repo: http://repos.rcn-ee.com/(debian|ubuntu)
repo_rcnee="enable"
repo_rcnee_pkg_list="linux-image-3.8.13-bone72 \
-ipumm-dra7xx-installer rcn-ee-archive-keyring tiomapconf"
+ipumm-dra7xx-installer vpdma-dra7xx-installer rcn-ee-archive-keyring tiomapconf"
#
repo_rcnee_pkg_version="3.8.13-bone72"
#include_firmware="enable"
diff --git a/configs/machinekit-debian-wheezy.conf b/configs/machinekit-debian-wheezy.conf
index ca0d3c15a..bbd4e966b 100644
--- a/configs/machinekit-debian-wheezy.conf
+++ b/configs/machinekit-debian-wheezy.conf
@@ -51,7 +51,7 @@ rfs_ssh_user_pass="enable"
##enable kernel repo: http://repos.rcn-ee.com/(debian|ubuntu)
repo_rcnee="enable"
repo_rcnee_pkg_list="linux-image-3.8.13-xenomai-r72 bb-customizations \
-ipumm-dra7xx-installer rcn-ee-archive-keyring tiomapconf \
+ipumm-dra7xx-installer vpdma-dra7xx-installer rcn-ee-archive-keyring tiomapconf \
acpi-support-base am335x-pru-package libsoc2 libsoc-dev nodejs nodejs-legacy npm \
xinput-calibrator xserver-xorg-video-modesetting c9-core-installer"
#
diff --git a/configs/rcn-ee_console_debian_jessie_armhf.conf b/configs/rcn-ee_console_debian_jessie_armhf.conf
index a1d06171f..57f7219a0 100644
--- a/configs/rcn-ee_console_debian_jessie_armhf.conf
+++ b/configs/rcn-ee_console_debian_jessie_armhf.conf
@@ -44,7 +44,7 @@ rfs_ssh_user_pass="enable"
repo_rcnee="enable"
repo_rcnee_pkg_list="linux-image-4.1.3-armv7-x2 linux-image-4.1.3-ti-r6 \
bb-customizations \
-ipumm-dra7xx-installer connman rcn-ee-archive-keyring tiomapconf"
+ipumm-dra7xx-installer vpdma-dra7xx-installer connman rcn-ee-archive-keyring tiomapconf"
repo_rcnee_pkg_version="4.1.3-ti-r6"
include_firmware="enable"
#
diff --git a/configs/rcn-ee_console_debian_stretch_armhf.conf b/configs/rcn-ee_console_debian_stretch_armhf.conf
index ffccbb46b..e835c7d07 100644
--- a/configs/rcn-ee_console_debian_stretch_armhf.conf
+++ b/configs/rcn-ee_console_debian_stretch_armhf.conf
@@ -44,7 +44,7 @@ rfs_ssh_user_pass="enable"
repo_rcnee="enable"
repo_rcnee_pkg_list="linux-image-4.1.3-armv7-x2 linux-image-4.1.3-ti-r6 \
bb-customizations \
-ipumm-dra7xx-installer connman rcn-ee-archive-keyring tiomapconf"
+ipumm-dra7xx-installer vpdma-dra7xx-installer connman rcn-ee-archive-keyring tiomapconf"
repo_rcnee_pkg_version="4.1.3-ti-r6"
include_firmware="enable"
#
diff --git a/configs/rcn-ee_console_debian_wheezy_armhf.conf b/configs/rcn-ee_console_debian_wheezy_armhf.conf
index 8af61ea0e..c43c46b3b 100644
--- a/configs/rcn-ee_console_debian_wheezy_armhf.conf
+++ b/configs/rcn-ee_console_debian_wheezy_armhf.conf
@@ -37,7 +37,7 @@ rfs_ssh_user_pass="enable"
repo_rcnee="enable"
repo_rcnee_pkg_list="linux-image-4.1.3-armv7-x2 linux-image-4.1.3-ti-r6 \
bb-customizations \
-ipumm-dra7xx-installer rcn-ee-archive-keyring tiomapconf"
+ipumm-dra7xx-installer vpdma-dra7xx-installer rcn-ee-archive-keyring tiomapconf"
repo_rcnee_pkg_version="4.1.3-ti-r6"
include_firmware="enable"
#
diff --git a/configs/rcn-ee_console_ubuntu_trusty_armhf.conf b/configs/rcn-ee_console_ubuntu_trusty_armhf.conf
index 2aadf64a2..e0d4adba4 100644
--- a/configs/rcn-ee_console_ubuntu_trusty_armhf.conf
+++ b/configs/rcn-ee_console_ubuntu_trusty_armhf.conf
@@ -43,7 +43,7 @@ rfs_ssh_user_pass="enable"
repo_rcnee="enable"
repo_rcnee_pkg_list="linux-image-4.1.3-armv7-x2 linux-image-4.1.3-ti-r6 \
bb-customizations \
-ipumm-dra7xx-installer rcn-ee-archive-keyring tiomapconf"
+ipumm-dra7xx-installer vpdma-dra7xx-installer rcn-ee-archive-keyring tiomapconf"
repo_rcnee_pkg_version="4.1.3-ti-r6"
include_firmware="enable"
#
diff --git a/configs/ros_indigo.conf b/configs/ros_indigo.conf
index a95c1f686..e70b039ec 100644
--- a/configs/ros_indigo.conf
+++ b/configs/ros_indigo.conf
@@ -36,7 +36,7 @@ rfs_ssh_user_pass="enable"
##enable kernel repo: http://repos.rcn-ee.com/(debian|ubuntu)
repo_rcnee="enable"
repo_rcnee_pkg_list="linux-image-4.1.3-armv7-x2 linux-image-3.14.48-ti-r72 \
-ipumm-dra7xx-installer rcn-ee-archive-keyring tiomapconf"
+ipumm-dra7xx-installer vpdma-dra7xx-installer rcn-ee-archive-keyring tiomapconf"
#repo_rcnee_pkg_version="3.14.48-ti-r72"
include_firmware="enable"
#
diff --git a/scripts/chroot.sh b/scripts/chroot.sh
index b6fc77ea3..75eaea2b1 100755
--- a/scripts/chroot.sh
+++ b/scripts/chroot.sh
@@ -847,7 +847,9 @@ cat > ${DIR}/chroot_script.sh <<-__EOF__
if [ -d /var/cache/ti-pru-cgt-installer/ ] ; then
rm -rf /var/cache/ti-pru-cgt-installer/ || true
fi
-
+ if [ -d /var/cache/vpdma-dra7xx-installer/ ] ; then
+ rm -rf /var/cache/vpdma-dra7xx-installer/ || true
+ fi
rm -f /usr/sbin/policy-rc.d
if [ "x\${distro}" = "xUbuntu" ] ; then
--
GitLab