shr: include sane-toolchain-java.inc and angstrom-jalimo.conf, add largefile to DISTR...

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>

diff --git a/conf/distro/include/preferred-shr-versions.inc b/conf/distro/include/preferred-shr-versions.inc
index a822626..7c2e9e8 100644 (file)
--- a/conf/distro/include/preferred-shr-versions.inc
+++ b/conf/distro/include/preferred-shr-versions.inc
@@ -10,10 +10,6 @@ PREFERRED_VERSION_mtd-utils-native = "1.2.0+git"
 PREFERRED_VERSION_strace = "4.5.15"
 PREFERRED_VERSION_emacs-x11 = "23.1"
 
-# We need this for jamvm
-PREFERRED_VERSION_classpath = "0.98"
-PREFERRED_VERSION_classpath-native = "0.98"
-
 # we need new headers for libc, now OLDEST_KERNEL_linux-gnueabi = "2.6.24"
 # and 2.6.31 for fsodeviced
 LINUX_LIBC_HEADERS_VERSION ?= "2.6.32"

diff --git a/conf/distro/shr.conf b/conf/distro/shr.conf
index 52bcf18..f0167da 100644 (file)
--- a/conf/distro/shr.conf
+++ b/conf/distro/shr.conf
@@ -99,7 +99,7 @@ ILLUME_THEME = "e-wm-theme-illume-gry"
 # Use bluetooth 4.0
 DISTRO_BLUETOOTH_MANAGER = "bluez4"
 # We want images supporting the following features (for task-base)
-DISTRO_FEATURES = "ipv4 ipv6 wifi ppp ext2 vfat bluetooth usbgadget usbhost"
+DISTRO_FEATURES = "largefile ipv4 ipv6 wifi ppp ext2 vfat bluetooth usbgadget usbhost"
 # Following features are for ARM and E500 based machines
 DISTRO_FEATURES += " eabi "
 # Use-like features
@@ -160,6 +160,11 @@ PREFERRED_VERSION_eglibc-initial     ?= "2.12"
 PREFERRED_GCC_VERSION                ?= "4.5"
 require conf/distro/include/sane-toolchain.inc
 
+# Set some java bits
+require conf/distro/include/sane-toolchain-java.inc
+require conf/distro/include/angstrom-jalimo.conf
+
+
 #############################################################################
 # PREFERRED PROVIDERS
 #############################################################################