14.06: update to openjdk-7-jdk

Signed-off-by: Ryan Harkin <ryan.harkin@linaro.org>

4 files changed, 18 insertions, 6 deletions

diff --git a/android/images/armv8-android-juno-lsk/HOWTO_getsourceandbuild.txt b/android/images/armv8-android-juno-lsk/HOWTO_getsourceandbuild.txt
index 21cf30b..b004b83 100644
--- a/android/images/armv8-android-juno-lsk/HOWTO_getsourceandbuild.txt
+++ b/android/images/armv8-android-juno-lsk/HOWTO_getsourceandbuild.txt
@@ -24,9 +24,12 @@ The following simple steps download, install and compile a complete Linaro Andro
 * Download and install Ubuntu 12.04 64 bit or newer ("download":http://www.ubuntu.com)
 * Install the following packages:
 
-bc. sudo apt-get install zip curl flex bison build-essential git-core gnupg gperf zlib1g-dev libx11-dev x11proto-core-dev \
+bc. sudo apt-get update
+sudo apt-get install zip curl flex bison build-essential git-core gnupg gperf zlib1g-dev libx11-dev x11proto-core-dev \
 gcc-multilib g++-multilib libc6-dev-i386 ia32-libs lib32z-dev gcc-4.5 g++-4.5 cpp-4.5 gcc-4.5-multilib g++-4.5-multilib \
 uuid-dev openjdk-7-jdk ant lib32ncurses5-dev xsltproc
+sudo update-alternatives --config java
+sudo update-alternatives --config javac
 
 * Download the Android building script for this release from "here":http://releases.linaro.org/14.06/android/images/armv8-android-juno-lsk/linaro_android_build_cmds.sh or from the list of artifacts listed above.
 
diff --git a/android/images/armv8-juice-juno-lsk/HOWTO_getsourceandbuild.txt b/android/images/armv8-juice-juno-lsk/HOWTO_getsourceandbuild.txt
index b7ab740..8e7c5b2 100644
--- a/android/images/armv8-juice-juno-lsk/HOWTO_getsourceandbuild.txt
+++ b/android/images/armv8-juice-juno-lsk/HOWTO_getsourceandbuild.txt
@@ -24,9 +24,12 @@ The following simple steps download, install and compile a complete Linaro Andro
 * Download and install Ubuntu 12.04 64 bit or newer ("download":http://www.ubuntu.com)
 * Install the following packages:
 
-bc. sudo apt-get install zip curl flex bison build-essential git-core gnupg gperf zlib1g-dev libx11-dev x11proto-core-dev \
+bc. sudo apt-get update
+sudo apt-get install zip curl flex bison build-essential git-core gnupg gperf zlib1g-dev libx11-dev x11proto-core-dev \
 gcc-multilib g++-multilib libc6-dev-i386 ia32-libs lib32z-dev gcc-4.5 g++-4.5 cpp-4.5 gcc-4.5-multilib g++-4.5-multilib \
 uuid-dev openjdk-7-jdk ant lib32ncurses5-dev xsltproc
+sudo update-alternatives --config java
+sudo update-alternatives --config javac
 
 * Download the Android building script for this release from "here":http://releases.linaro.org/14.06/android/images/armv8-juice-juno-lsk/linaro_android_build_cmds.sh or from the list of artifacts listed above.
 
diff --git a/android/vexpress-lsk/HOWTO_getsourceandbuild.txt b/android/vexpress-lsk/HOWTO_getsourceandbuild.txt
index cf38352..b23ea8a 100644
--- a/android/vexpress-lsk/HOWTO_getsourceandbuild.txt
+++ b/android/vexpress-lsk/HOWTO_getsourceandbuild.txt
@@ -20,9 +20,12 @@ The following simple steps download, install and compile a complete Linaro Andro
 * Download and install Ubuntu 12.04 64 bit or newer ("download":http://www.ubuntu.com)
 * Install the following packages:
 
-bc. sudo apt-get install zip curl flex bison build-essential git-core gnupg gperf zlib1g-dev libx11-dev x11proto-core-dev \
+bc. sudo apt-get update
+sudo apt-get install zip curl flex bison build-essential git-core gnupg gperf zlib1g-dev libx11-dev x11proto-core-dev \
 gcc-multilib g++-multilib libc6-dev-i386 ia32-libs lib32z-dev gcc-4.5 g++-4.5 cpp-4.5 gcc-4.5-multilib g++-4.5-multilib \
-uboot-mkimage uuid-dev openjdk-6-jdk ant lib32ncurses5-dev xsltproc
+uboot-mkimage uuid-dev openjdk-7-jdk ant lib32ncurses5-dev xsltproc
+sudo update-alternatives --config java
+sudo update-alternatives --config javac
 
 * Download the Android building script for this release from "here":http://releases.linaro.org/14.06/android/vexpress-lsk/linaro_android_build_cmds.sh or from the list of artifacts listed above.
 
diff --git a/android/vexpress/HOWTO_getsourceandbuild.txt b/android/vexpress/HOWTO_getsourceandbuild.txt
index b06e528..7fe319e 100644
--- a/android/vexpress/HOWTO_getsourceandbuild.txt
+++ b/android/vexpress/HOWTO_getsourceandbuild.txt
@@ -20,9 +20,12 @@ The following simple steps download, install and compile a complete Linaro Andro
 * Download and install Ubuntu 12.04 64 bit or newer ("download":http://www.ubuntu.com)
 * Install the following packages:
 
-bc. sudo apt-get install zip curl flex bison build-essential git-core gnupg gperf zlib1g-dev libx11-dev x11proto-core-dev \
+bc. sudo apt-get update
+sudo apt-get install zip curl flex bison build-essential git-core gnupg gperf zlib1g-dev libx11-dev x11proto-core-dev \
 gcc-multilib g++-multilib libc6-dev-i386 ia32-libs lib32z-dev gcc-4.5 g++-4.5 cpp-4.5 gcc-4.5-multilib g++-4.5-multilib \
-uboot-mkimage uuid-dev openjdk-6-jdk ant lib32ncurses5-dev xsltproc
+uboot-mkimage uuid-dev openjdk-7-jdk ant lib32ncurses5-dev xsltproc
+sudo update-alternatives --config java
+sudo update-alternatives --config javac
 
 * Download the Android building script for this release from "here":http://releases.linaro.org/latest/android/vexpress/linaro_android_build_cmds.sh or from the list of artifacts listed above.