From: Kristoffer Ericson <kristoffer.ericson@gmail.com>
Date: Mon, 21 Dec 2009 15:36:09 +0000 (+0100)
Subject: Since we are working with 3 different archs (mips/sh3/arm)
X-Git-Tag: Release-2010-05/1~1222
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b7ff17c5a59b328695a4e8721aceb204de012711;p=openembedded.git

Since we are working with 3 different archs (mips/sh3/arm)
we require versions that compile on all those platforms.
We update the gcc/glibc versions so that sh3 starts
building again. We also adjust the imagefile naming
and some minor version settings.

Signed-off-by:Kristoffer Ericson <kristoffer.ericson@gmail.com>
---

diff --git a/conf/distro/jlime-2009.1.conf b/conf/distro/jlime-2009.1.conf
index 97de5cd257..61c2ce3a9f 100644
--- a/conf/distro/jlime-2009.1.conf
+++ b/conf/distro/jlime-2009.1.conf
@@ -26,12 +26,13 @@ DISTRO_EXTRA_RDEPENDS = "wireless-tools nano keymaps tslib-calibrate \
 #<>Our Image files should look abit better.
 #<>
 #<>------------------------------------------------------------------<
-IMAGE_NAME = "${IMAGE_BASENAME}-2009.1-${MACHINE}"
+IMAGE_NAME = "JLiMe-${IMAGE_BASENAME}-2009.1-${MACHINE}"
 SPLASH = "psplash"
 
 #
 # Naming schemes + packages
 #
+SRC_DIST_LOCAL = "copy"
 INHERIT += "debian package_tar package_ipk src_distribute_local src_distribute"
 IMAGE_FSTYPES = "tar.gz tar.bz2 jffs2"
 
@@ -60,11 +61,12 @@ 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.2.2"
-PREFERRED_VERSION_gcc-cross = "4.2.2"
-PREFERRED_VERSION_gcc-cross-initial = "4.2.2"
-PREFERRED_VERSION_gcc-cross-intermediate = "4.2.2"
+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"
@@ -86,8 +88,8 @@ LIBC = "glibc"
 require conf/distro/include/${LIBC}.inc
 
 PREFERRED_VERSION_linux-libc-headers = "2.6.25"
-PREFERRED_VERSION_glibc-initial = "2.6.1"
-PREFERRED_VERSION_glibc = "2.6.1"
+PREFERRED_VERSION_glibc-initial = "2.9"
+PREFERRED_VERSION_glibc = "2.9"
 
 #
 # Bootstrap & Init