[ELDK] [PATCH 5/5] Java support for eldk-5.3/armv7a (Vybrid VF6xx)

[Sergei Poselenov]

commit 25ff895ae75b882da99dfa679bfb70e1a835afe6
Author: Sergei Poselenov <sposelenov at emcraft.com>
Date:   Tue Jan 28 20:58:19 2014 +0400

    RT #93275. Fixed Java version to actual. Fixed install.sh to
    provide symlink to java-qte-sdk only.

    Signed-off-by: Sergei Poselenov <sposelenov at emcraft.com>

diff --git a/meta-eldk/conf/local.conf.sample
b/meta-eldk/conf/local.conf.sample index 09d8ea8..d479428 100644
--- a/meta-eldk/conf/local.conf.sample
+++ b/meta-eldk/conf/local.conf.sample
@@ -221,6 +221,6 @@ NO32LIBS = "1"
 # Java build settings
 PREFERRED_PROVIDER_virtual/java-native = "jamvm-native"
 PREFERRED_PROVIDER_virtual/javac-native = "ecj-bootstrap-native"
-PREFERRED_VERSION_openjdk-7-jre = "03b21-2.1.8"
+PREFERRED_VERSION_openjdk-7-jre = "25b30-2.3.12"
 PREFERRED_VERSION_icedtea7-native = "2.1.3"
 PREFERRED_PROVIDER_openjdk-7-jre = "openjdk-7-jre"
diff --git a/meta-eldk/tools/installer/install.sh
b/meta-eldk/tools/installer/install.sh index e9f1b25..e37dc84 100755
--- a/meta-eldk/tools/installer/install.sh
+++ b/meta-eldk/tools/installer/install.sh
@@ -333,6 +333,9 @@ core-image-${img}-generic-${MACHINE}.tar*)
 		${DRY_RUN} mkdir -p ${rootfs_path} || exit 1
 		echo -e "*** Installing ${tarball}\n    into
${rootfs_path}" >&2 ${DRY_RUN} sudo tar xpf ${tarball} -C ${rootfs_path}
+		if [ "$img" = "java-qte-sdk" ] ; then
+		    ${DRY_RUN} ln -s rootfs-${img}
${inst_path}/rootfs-qte-sdk
+		fi
 	done
 fi