conf/distro/jlime-2010.1.conf: Update jlime config

* Use less hardcoded strings in IMAGE_NAME
* Bump coreutils version
* Bump binutils version
* Switch from kdrive to xserver-xorg-kdrive.
* Make possible to override TARGET_OS.

Signed-off-by: Filip Zyzniewski <filip.zyzniewski@gmail.com>
Signed-off-by: Kristoffer Ericson <kristoffer.ericson@gmail.com>

diff --git a/conf/distro/jlime-2010.1.conf b/conf/distro/jlime-2010.1.conf
index c60d65d..9e18e9c 100644 (file)
--- a/conf/distro/jlime-2010.1.conf
+++ b/conf/distro/jlime-2010.1.conf
@@ -31,7 +31,7 @@ DISTRO_EXTRA_RDEPENDS = "wireless-tools nano keymaps tslib-calibrate \
 #<>Our Image files should look abit better.
 #<>
 #<>------------------------------------------------------------------<
-IMAGE_NAME = "JLiMe-${IMAGE_BASENAME}-2009.1-${MACHINE}"
+IMAGE_NAME = "${DISTRO_NAME}-${IMAGE_BASENAME}-${DISTRO_VERSION}-${MACHINE}"
 SPLASH = "psplash"
 
 #
@@ -71,14 +71,14 @@ PREFERRED_VERSION_gcc = "4.4.2"
 PREFERRED_VERSION_gcc-cross = "4.4.2"
 PREFERRED_VERSION_gcc-cross-initial = "4.4.2"
 PREFERRED_VERSION_gcc-cross-intermediate = "4.4.2"
-PREFERRED_VERSION_binutils = "2.18"
-PREFERRED_VERSION_binutils-cross = "2.18"
-PREFERRED_VERSION_coreutils-native = "6.0"
+PREFERRED_VERSION_binutils = "2.20"
+PREFERRED_VERSION_binutils-cross = "2.20"
+PREFERRED_VERSION_coreutils-native = "7.2"
 
 #
 # Target OS & FPU system
 # 
-TARGET_OS = "linux"
+TARGET_OS ?= "linux"
 TARGET_FPU_sh = "soft"
 TARGET_FPU_arm = "soft"
 TARGET_FPU_armeb = "soft"
@@ -103,13 +103,14 @@ require conf/distro/include/sane-srcrevs.inc
 # Framebuffer & X
 #
 require conf/distro/include/preferred-xorg-versions-X11R7.5.inc
-PREFERRED_PROVIDER_xserver = "xserver-kdrive"
 PREFERRED_PROVIDER_virtual/libx11 = "libx11"
 PREFERRED_PROVIDER_virtual/libsdl = "libsdl-x11"
+PREFERRED_PROVIDER_virtual/libgl = "mesa-xlib"
 PREFERRED_PROVIDER_tslib = "tslib"
 PREFERRED_VERSION_mesa = "7.6"
 PREFERRED_VERSION_mesa-dri = "7.6"
 PREFERRED_VERSION_mesa-xlib = "7.6"
+SERVER ?= " xserver-xorg xf86-input-evdev xf86-input-keyboard xf86-input-mousexf86-video-fbdev " 
 
 #
 # General Userspace