[oe-commits] Kristoffer Ericson : Update jlime-2009.1 distro file:

[git version control]

Module: openembedded.git
Branch: shr/merge
Commit: 0d07b6f539cc125d9111662e41095ca392c8a3dc
URL:    http://gitweb.openembedded.net/?p=openembedded.git&a=commit;h=0d07b6f539cc125d9111662e41095ca392c8a3dc

Author: Kristoffer Ericson <kristoffer.ericson at gmail.com>
Date:   Sun Dec 27 20:32:13 2009 +0100

Update jlime-2009.1 distro file:
* Remove src_distribute
* src_distribute_local change copy into symlink
* remove gettext, e2fsprogs version binding.

Signed-off-by: Alex Ferguson <thoughtmonster at gmail.com>
Signed-off-by: Kristoffer Ericson <kristoffer.ericson at gmail.com>

---

 conf/distro/jlime-2009.1.conf |   19 +++++++++++--------
 1 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/conf/distro/jlime-2009.1.conf b/conf/distro/jlime-2009.1.conf
index 61c2ce3..0d3cc0b 100644
--- a/conf/distro/jlime-2009.1.conf
+++ b/conf/distro/jlime-2009.1.conf
@@ -15,6 +15,8 @@ DISTRO_VERSION = "2009.1"
 DISTRO_TYPE = "release"
 export FEED_URLS_jlime = "http://repository.jlime.com/"
 
+OVERRIDES .= ":jlime"
+
 #<>------------------------------------------------------------------>
 #<>What we want on the bootstrap image (extra) 
 #<>                                            
@@ -32,8 +34,8 @@ SPLASH = "psplash"
 #
 # Naming schemes + packages
 #
-SRC_DIST_LOCAL = "copy"
-INHERIT += "debian package_tar package_ipk src_distribute_local src_distribute"
+INHERIT += "debian package_tar package_ipk src_distribute_local"
+SRC_DIST_LOCAL ?= "symlink"
 IMAGE_FSTYPES = "tar.gz tar.bz2 jffs2"
 
 #
@@ -60,8 +62,6 @@ PREFERRED_PROVIDER_avahi = "avahi"
 PREFERRED_PROVIDER_gtk+ = "gtk+"
 PREFERRED_PROVIDER_virtual/libqte2 = "qte-mt-static"
 PREFERRED_PROVIDER_bluez-libs = "bluez-libs"
-PREFERRED_VERSION_gettext-native = "0.14.1"
-PREFERRED_VERSION_gettext = "0.14.1"
 
 PREFERRED_VERSION_gcc = "4.4.2"
 PREFERRED_VERSION_gcc-cross = "4.4.2"
@@ -70,9 +70,6 @@ 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_e2fsprogs-libs-native = "1.35"
-
-PREFERRED_VERSION_cdparanoia  = "10.2"
 
 #
 # Target OS & FPU system
@@ -87,7 +84,7 @@ TARGET_FPU_mips = "soft"
 LIBC = "glibc"
 require conf/distro/include/${LIBC}.inc
 
-PREFERRED_VERSION_linux-libc-headers = "2.6.25"
+PREFERRED_VERSION_linux-libc-headers = "2.6.31"
 PREFERRED_VERSION_glibc-initial = "2.9"
 PREFERRED_VERSION_glibc = "2.9"
 
@@ -106,3 +103,9 @@ PREFERRED_PROVIDER_tslib = "tslib"
 PREFERRED_PROVIDER_virtual/libsdl = "libsdl-x11"
 PREFERRED_PROVIDER_xserver = "xserver-kdrive"
 require conf/distro/include/preferred-xorg-versions-X11R7.5.inc
+
+#
+# General Userspace
+#
+PREFERRED_VERSION_cdparanoia  = "10.2"
+require conf/distro/include/preferred-opie-versions-1.2.4.inc
\ No newline at end of file