From e1a3a891548df232fc45fed08e0913c41e0fd621 Mon Sep 17 00:00:00 2001 From: Alex Ferguson Date: Sat, 30 Oct 2010 21:42:37 +0300 Subject: jlime-2010.1.conf: Cleaned up, fixed XSERVER line. XSERVER was defined as SERVER, which is incorrect, and the file contained several redundant newlines. I also fixed the headers to make the file look more consistent. Signed-off-by: Alex Ferguson Signed-off-by: Kristoffer Ericson --- conf/distro/jlime-2010.1.conf | 24 ++++++++++-------------- 1 file changed, 10 insertions(+), 14 deletions(-) diff --git a/conf/distro/jlime-2010.1.conf b/conf/distro/jlime-2010.1.conf index 37e71d35b1..99e643395f 100644 --- a/conf/distro/jlime-2010.1.conf +++ b/conf/distro/jlime-2010.1.conf @@ -20,17 +20,15 @@ export FEED_URLS_jlime = "http://repository.jlime.com/" OVERRIDES .= ":jlime" -#<>------------------------------------------------------------------> -#<>What we want on the bootstrap image (extra) -#<> -#<>------------------------------------------------------------------< +# +# What we want on the bootstrap image (extra) +# DISTRO_EXTRA_RDEPENDS = "wireless-tools nano keymaps tslib-calibrate \ - console-tools tslib-tests parted dialog" + console-tools tslib-tests parted dialog" -#<>------------------------------------------------------------------> -#<>Our Image files should look abit better. -#<> -#<>------------------------------------------------------------------< +# +# Our Image files should look abit better. +# IMAGE_NAME = "${DISTRO_NAME}-${IMAGE_BASENAME}-${DISTRO_VERSION}-${MACHINE}" SPLASH = "psplash" @@ -84,11 +82,9 @@ LIBC ?= "eglibc" require conf/distro/include/sane-toolchain.inc require conf/distro/include/arm-thumb.inc - - PREFERRED_PROVIDER_virtual/libc = "${LIBC}" -PREFERRED_VERSION_eglibc ?= "2.11" -PREFERRED_VERSION_eglibc-initial ?= "2.11" +PREFERRED_VERSION_eglibc ?= "2.11" +PREFERRED_VERSION_eglibc-initial ?= "2.11" PREFERRED_VERSION_linux-libc-headers = "2.6.34" # @@ -107,7 +103,7 @@ PREFERRED_PROVIDER_virtual/libx11-native = "libx11-native" PREFERRED_PROVIDER_virtual/libsdl = "libsdl-x11" PREFERRED_PROVIDER_virtual/libgl = "mesa-xlib" PREFERRED_PROVIDER_tslib = "tslib" -SERVER ?= " xserver-xorg xf86-input-evdev xf86-input-keyboard xf86-input-mousexf86-video-fbdev " +XSERVER ?= " xserver-xorg xf86-input-evdev xf86-input-keyboard xf86-input-mouse xf86-video-fbdev " # # General Userspace -- cgit 1.2.3-korg