From 70ad9c5f936142fea0bf8a89fc9c596f405fad05 Mon Sep 17 00:00:00 2001
From: Robert Nelson <robertcnelson@gmail.com>
Date: Fri, 4 Jul 2014 12:17:22 -0500
Subject: [PATCH] chroot: install kernel from repo (for bone)

Signed-off-by: Robert Nelson <robertcnelson@gmail.com>
---
 configs/OpenROV_debian_stable_armhf.conf         | 3 ++-
 configs/bb.org-console-debian-stable.conf        | 3 ++-
 configs/bb.org-console-debian-testing.conf       | 5 +++--
 configs/bb.org-debian-stable.conf                | 3 ++-
 configs/bb.org-debian-testing.conf               | 3 ++-
 configs/rcn-ee_console_debian_stable_armhf.conf  | 3 ++-
 configs/rcn-ee_console_debian_testing_armhf.conf | 3 ++-
 configs/rcn-ee_console_ubuntu_stable_armhf.conf  | 3 ++-
 configs/rcn-ee_console_ubuntu_testing_armhf.conf | 3 ++-
 scripts/chroot.sh                                | 6 ++++++
 10 files changed, 25 insertions(+), 10 deletions(-)

diff --git a/configs/OpenROV_debian_stable_armhf.conf b/configs/OpenROV_debian_stable_armhf.conf
index f2a4180f4..6c49e6b73 100644
--- a/configs/OpenROV_debian_stable_armhf.conf
+++ b/configs/OpenROV_debian_stable_armhf.conf
@@ -31,11 +31,12 @@ rfs_strip_locales="enable"
 rfs_default_locale="en_US.UTF-8"
 ##
 #https://rcn-ee.net/deb/wheezy-armhf/LATEST-omap-psp
-rfs_kernel="https://rcn-ee.net/deb/wheezy-armhf/v3.8.13-bone57/"
+rfs_kernel="https://rcn-ee.net/deb/wheezy-armhf/v3.8.13-bone58/"
 third_party_modules="enable"
 ##
 ##enable kernel repo: http://repos.rcn-ee.net/(debian|ubuntu)
 repo_rcnee="enable"
+repo_rcnee_pkg_list="linux-image-3.8.13-bone58"
 #
 repo_external="enable"
 repo_external_arch="armhf"
diff --git a/configs/bb.org-console-debian-stable.conf b/configs/bb.org-console-debian-stable.conf
index 9ec7149c1..5bb6c6297 100644
--- a/configs/bb.org-console-debian-stable.conf
+++ b/configs/bb.org-console-debian-stable.conf
@@ -40,11 +40,12 @@ rfs_opt_scripts="https://github.com/RobertCNelson/boot-scripts"
 #rfs_default_locale="en_US.UTF-8"
 ##
 #https://rcn-ee.net/deb/wheezy-armhf/LATEST-omap-psp
-rfs_kernel="https://rcn-ee.net/deb/wheezy-armhf/v3.8.13-bone57/"
+rfs_kernel="https://rcn-ee.net/deb/wheezy-armhf/v3.8.13-bone58/"
 third_party_modules="enable"
 ##
 ##enable kernel repo: http://repos.rcn-ee.net/(debian|ubuntu)
 repo_rcnee="enable"
+repo_rcnee_pkg_list="linux-image-3.8.13-bone58"
 #
 repo_external="enable"
 repo_external_arch="armhf"
diff --git a/configs/bb.org-console-debian-testing.conf b/configs/bb.org-console-debian-testing.conf
index f6b392ffe..f903cff07 100644
--- a/configs/bb.org-console-debian-testing.conf
+++ b/configs/bb.org-console-debian-testing.conf
@@ -40,11 +40,12 @@ rfs_opt_scripts="https://github.com/RobertCNelson/boot-scripts"
 #rfs_default_locale="en_US.UTF-8"
 ##
 #https://rcn-ee.net/deb/wheezy-armhf/LATEST-omap-psp
-#rfs_kernel="https://rcn-ee.net/deb/wheezy-armhf/v3.8.13-bone57/"
+#rfs_kernel="https://rcn-ee.net/deb/wheezy-armhf/v3.8.13-bone58/"
 #third_party_modules="enable"
 ##
 ##enable kernel repo: http://repos.rcn-ee.net/(debian|ubuntu)
 repo_rcnee="enable"
+repo_rcnee_pkg_list="linux-image-3.8.13-bone58"
 #
 #repo_external="enable"
 #repo_external_arch="armhf"
@@ -56,7 +57,7 @@ repo_rcnee="enable"
 #
 chroot_COPY_SETUP_SDCARD="enable"
 chroot_hook=""
-chroot_script="beagleboard.org-console-testing.sh"
+#chroot_script="beagleboard.org-console-testing.sh"
 chroot_uenv_txt="beagleboard.org.txt"
 chroot_flasher_uenv_txt="beagleboard.org-flasher.txt"
 chroot_tarball="enable"
diff --git a/configs/bb.org-debian-stable.conf b/configs/bb.org-debian-stable.conf
index 9f469acb6..da89eefb4 100644
--- a/configs/bb.org-debian-stable.conf
+++ b/configs/bb.org-debian-stable.conf
@@ -42,11 +42,12 @@ rfs_default_desktop="LXDE"
 rfs_default_locale="en_US.UTF-8"
 ##
 #https://rcn-ee.net/deb/wheezy-armhf/LATEST-omap-psp
-rfs_kernel="https://rcn-ee.net/deb/wheezy-armhf/v3.8.13-bone57/"
+rfs_kernel="https://rcn-ee.net/deb/wheezy-armhf/v3.8.13-bone58/"
 third_party_modules="enable"
 ##
 ##enable kernel repo: http://repos.rcn-ee.net/(debian|ubuntu)
 repo_rcnee="enable"
+repo_rcnee_pkg_list="linux-image-3.8.13-bone58"
 #
 repo_external="enable"
 repo_external_arch="armhf"
diff --git a/configs/bb.org-debian-testing.conf b/configs/bb.org-debian-testing.conf
index d33adde69..ca4d89f57 100644
--- a/configs/bb.org-debian-testing.conf
+++ b/configs/bb.org-debian-testing.conf
@@ -32,11 +32,12 @@ rfs_strip_locales="enable"
 rfs_default_locale="en_US.UTF-8"
 ##
 #https://rcn-ee.net/deb/jessie-armhf/LATEST-omap-psp
-rfs_kernel="https://rcn-ee.net/deb/jessie-armhf/v3.8.13-bone57/"
+rfs_kernel="https://rcn-ee.net/deb/jessie-armhf/v3.8.13-bone58/"
 third_party_modules="enable"
 ##
 ##enable kernel repo: http://repos.rcn-ee.net/(debian|ubuntu)
 repo_rcnee="enable"
+repo_rcnee_pkg_list="linux-image-3.8.13-bone58"
 #
 #repo_external="enable"
 #repo_external_arch="armhf"
diff --git a/configs/rcn-ee_console_debian_stable_armhf.conf b/configs/rcn-ee_console_debian_stable_armhf.conf
index 1b8ac4087..f07d069d8 100644
--- a/configs/rcn-ee_console_debian_stable_armhf.conf
+++ b/configs/rcn-ee_console_debian_stable_armhf.conf
@@ -33,11 +33,12 @@ rfs_default_locale="en_US.UTF-8"
 #https://rcn-ee.net/deb/wheezy-armhf/LATEST-armv7-lpae
 #https://rcn-ee.net/deb/wheezy-armhf/LATEST-armv7
 #https://rcn-ee.net/deb/wheezy-armhf/LATEST-omap-psp
-rfs_kernel="https://rcn-ee.net/deb/wheezy-armhf/v3.15.2-armv7-lpae-x4/ https://rcn-ee.net/deb/wheezy-armhf/v3.15.2-armv7-x2/ https://rcn-ee.net/deb/wheezy-armhf/v3.8.13-bone57/"
+rfs_kernel="https://rcn-ee.net/deb/wheezy-armhf/v3.15.2-armv7-lpae-x4/ https://rcn-ee.net/deb/wheezy-armhf/v3.15.2-armv7-x2/ https://rcn-ee.net/deb/wheezy-armhf/v3.8.13-bone58/"
 #third_party_modules="enable"
 ##
 ##enable kernel repo: http://repos.rcn-ee.net/(debian|ubuntu)
 repo_rcnee="enable"
+repo_rcnee_pkg_list="linux-image-3.8.13-bone58"
 #
 chroot_COPY_SETUP_SDCARD="enable"
 #chroot_very_small_image=""
diff --git a/configs/rcn-ee_console_debian_testing_armhf.conf b/configs/rcn-ee_console_debian_testing_armhf.conf
index fb1e518fb..b6539f0b6 100644
--- a/configs/rcn-ee_console_debian_testing_armhf.conf
+++ b/configs/rcn-ee_console_debian_testing_armhf.conf
@@ -34,10 +34,11 @@ rfs_default_locale="en_US.UTF-8"
 #https://rcn-ee.net/deb/jessie-armhf/LATEST-armv7-lpae
 #https://rcn-ee.net/deb/jessie-armhf/LATEST-armv7
 #https://rcn-ee.net/deb/jessie-armhf/LATEST-omap-psp
-rfs_kernel="https://rcn-ee.net/deb/jessie-armhf/v3.15.2-armv7-lpae-x4/ https://rcn-ee.net/deb/jessie-armhf/v3.15.2-armv7-x2/ https://rcn-ee.net/deb/jessie-armhf/v3.8.13-bone57/"
+rfs_kernel="https://rcn-ee.net/deb/jessie-armhf/v3.15.2-armv7-lpae-x4/ https://rcn-ee.net/deb/jessie-armhf/v3.15.2-armv7-x2/ https://rcn-ee.net/deb/jessie-armhf/v3.8.13-bone58/"
 ##
 ##enable kernel repo: http://repos.rcn-ee.net/(debian|ubuntu)
 repo_rcnee="enable"
+repo_rcnee_pkg_list="linux-image-3.8.13-bone58"
 #
 chroot_COPY_SETUP_SDCARD="enable"
 #chroot_very_small_image=""
diff --git a/configs/rcn-ee_console_ubuntu_stable_armhf.conf b/configs/rcn-ee_console_ubuntu_stable_armhf.conf
index bc1cc7bb7..cb0ab29fc 100644
--- a/configs/rcn-ee_console_ubuntu_stable_armhf.conf
+++ b/configs/rcn-ee_console_ubuntu_stable_armhf.conf
@@ -33,10 +33,11 @@ rfs_default_locale="en_US.UTF-8"
 #https://rcn-ee.net/deb/trusty-armhf/LATEST-armv7-lpae
 #https://rcn-ee.net/deb/trusty-armhf/LATEST-armv7
 #https://rcn-ee.net/deb/trusty-armhf/LATEST-omap-psp
-rfs_kernel="https://rcn-ee.net/deb/trusty-armhf/v3.15.2-armv7-lpae-x4/ https://rcn-ee.net/deb/trusty-armhf/v3.15.2-armv7-x2/ https://rcn-ee.net/deb/trusty-armhf/v3.8.13-bone57/"
+rfs_kernel="https://rcn-ee.net/deb/trusty-armhf/v3.15.2-armv7-lpae-x4/ https://rcn-ee.net/deb/trusty-armhf/v3.15.2-armv7-x2/ https://rcn-ee.net/deb/trusty-armhf/v3.8.13-bone58/"
 ##
 ##enable kernel repo: http://repos.rcn-ee.net/(debian|ubuntu)
 repo_rcnee="enable"
+repo_rcnee_pkg_list="linux-image-3.8.13-bone58"
 #
 chroot_COPY_SETUP_SDCARD="enable"
 #chroot_very_small_image=""
diff --git a/configs/rcn-ee_console_ubuntu_testing_armhf.conf b/configs/rcn-ee_console_ubuntu_testing_armhf.conf
index f3c4eddc0..b05cf99aa 100644
--- a/configs/rcn-ee_console_ubuntu_testing_armhf.conf
+++ b/configs/rcn-ee_console_ubuntu_testing_armhf.conf
@@ -33,10 +33,11 @@ rfs_default_locale="en_US.UTF-8"
 #https://rcn-ee.net/deb/utopic-armhf/LATEST-armv7-lpae
 #https://rcn-ee.net/deb/utopic-armhf/LATEST-armv7
 #https://rcn-ee.net/deb/utopic-armhf/LATEST-omap-psp
-rfs_kernel="https://rcn-ee.net/deb/utopic-armhf/v3.15.2-armv7-lpae-x4/ https://rcn-ee.net/deb/utopic-armhf/v3.15.2-armv7-x2/ https://rcn-ee.net/deb/utopic-armhf/v3.8.13-bone57/"
+rfs_kernel="https://rcn-ee.net/deb/utopic-armhf/v3.15.2-armv7-lpae-x4/ https://rcn-ee.net/deb/utopic-armhf/v3.15.2-armv7-x2/ https://rcn-ee.net/deb/utopic-armhf/v3.8.13-bone58/"
 ##
 ##enable kernel repo: http://repos.rcn-ee.net/(debian|ubuntu)
 repo_rcnee="enable"
+repo_rcnee_pkg_list="linux-image-3.8.13-bone58"
 #
 chroot_COPY_SETUP_SDCARD="enable"
 #chroot_very_small_image=""
diff --git a/scripts/chroot.sh b/scripts/chroot.sh
index 00c177c23..f7c9953b1 100755
--- a/scripts/chroot.sh
+++ b/scripts/chroot.sh
@@ -115,6 +115,12 @@ check_defines () {
 	else
 		deb_additional_pkgs="$(echo ${deb_additional_pkgs} | sed 's/,/ /g')"
 	fi
+
+	if [ "x${repo_rcnee}" = "xenable" ] ; then
+		if [ ! "x${repo_rcnee_pkg_list}" = "x" ] ; then
+			deb_additional_pkgs="${deb_additional_pkgs} ${repo_rcnee_pkg_list}"
+		fi
+	fi
 }
 
 report_size () {
-- 
GitLab