diff --git a/configs/OpenROV_debian_stable_armhf.conf b/configs/OpenROV_debian_stable_armhf.conf index f2a4180f4240ffbf753b4f826f6987f03acb1b5a..6c49e6b73e5f8db3e8785431fcbd6f79c8d7a049 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 9ec7149c1b05824bef666459f763e34ea1f43dd0..5bb6c62973bdade7068d4d139337d5764d314484 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 f6b392ffef00734f6f35d5a2cf6a12620b0e7bfe..f903cff0754d7ee4bfb5ac85ac31e5875dc6ecf5 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 9f469acb6b98cf34b4fb6aa1ef6c9e693d96195b..da89eefb4ed400b252f1b8156b35519e67eafff1 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 d33adde69ad070bdb261480ddd265479d70336e7..ca4d89f57dc8ec65703f27f57ffc84dc4f2a885b 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 1b8ac408741c3fb81f4f1aa75fba1dd1c1982817..f07d069d8ada4ac6ecc0b30fce71b16c0ad41c44 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 fb1e518fb43d5b399cad9f6b0cd1ac2962a71125..b6539f0b6cfad1ffa763e6df5a065df8195864d1 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 bc1cc7bb736c96f51c93ba0e0257ff9c3bbeac72..cb0ab29fcc645d46025b5a62137d1dfcb3c44673 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 f3c4eddc0036ca65d589e9c28c9754482c8c997e..b05cf99aa4f95746032ae052006618ed13fbb9bf 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 00c177c23bfcf139ec79e9bb80593335b4353ab0..f7c9953b12793d3dfb3d4b0fc90bde306a879eca 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 () {