diff --git a/configs/bb.org-debian-jessie-console-v4.1.conf b/configs/bb.org-debian-jessie-console-v4.1.conf index 51f1ebc4d9052fefb4a004db58e90fc4d0c63421..2b0fef30abea0aeff702e42ed5838bb38eb3ce9b 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 7be268baed5cf2085f3958412750767fb61c7006..2bcdec1bced4cc66d76831954eb62229e1b1493a 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 956e67b05a18124eeb6941fa5d17544c95991ae2..de41b0be1d1042710269211b4a01ab1ece5a4883 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 2482d1ec34a50ee3e39cbf79c0950dab75ebb0ab..f5d924ef1e22ee5239053597ae2a3f43170dda59 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 72b0aa8439063f9957fdff5a5276facdf4e1394e..d6b4015c1b54f5b59ffc364827c638fc499467f1 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 c8d49b9e73b055c16f28305e3163c259f482c8ae..1a543431000b5a1cc13dc37e0360a3f1537d1959 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 ceab14f470759bc655422e71c4f9749953c6896b..ed1dcc8c85934a1e429d9a03a8d9bf3a93a88b8e 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 ca0d3c15a86f10e8b344b4cf3d772e4d39a6cff9..bbd4e966bc98e0c11fa3a55a6b05be6126616bfc 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 a1d06171fee87ecd708d89501f1f29cc5ff1ca3a..57f7219a08866c33578fecc74ea3c8ca00b9bd27 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 ffccbb46bd4b1e0ff57dc0dc48cb91e635386ed7..e835c7d072bb4c23093bd8a3acc41d6ed19a7d28 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 8af61ea0e8836f1c2ff598f2a1bd7b894a9180a7..c43c46b3b8a883622645597470ed0edba4be67d5 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 2aadf64a236e222c01e6f7f6f884eb2a1621ed73..e0d4adba4c5604d9af8aa0c62648cdcdfbbd0347 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 a95c1f686786f571000a7edb6ccd5455fd947582..e70b039ec6ebcd53e8635b046fb78b9f7e461f9f 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 b6fc77ea30bb18634c5033a67d7e88ebb344942c..75eaea2b14f8b368dccc1ae202b0d69ed544a764 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