diff options
| author | Martin Jansa <Martin.Jansa@gmail.com> | 2010-07-14 14:15:51 +0200 |
|---|---|---|
| committer | Martin Jansa <Martin.Jansa@gmail.com> | 2010-07-14 18:02:10 +0200 |
| commit | 2b80712f64286bfae19e40b276050a9392eb9557 (patch) | |
| tree | bcb65f169ab2712f65f86b90e60b740948a82371 | |
| parent | addca691de9e974d574d75fef91ceb4a1e60b921 (diff) | |
shr: include sane-toolchain-java.inc and angstrom-jalimo.conf, add largefile to DISTRO_FEATURES
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
| -rw-r--r-- | conf/distro/include/preferred-shr-versions.inc | 4 | ||||
| -rw-r--r-- | conf/distro/shr.conf | 7 |
2 files changed, 6 insertions, 5 deletions
diff --git a/conf/distro/include/preferred-shr-versions.inc b/conf/distro/include/preferred-shr-versions.inc index a8226264ee..7c2e9e8abb 100644 --- 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 52bcf180fa..f0167da3a8 100644 --- 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 ############################################################################# |