diff options
Diffstat (limited to 'conf/distro')
| -rw-r--r-- | conf/distro/angstrom-2007.1.conf | 6 | ||||
| -rw-r--r-- | conf/distro/include/sane-srcdates.inc | 2 | ||||
| -rw-r--r-- | conf/distro/jlime-donkey.conf | 19 |
3 files changed, 10 insertions, 17 deletions
diff --git a/conf/distro/angstrom-2007.1.conf b/conf/distro/angstrom-2007.1.conf index f593194ba6..d3b22626bb 100644 --- a/conf/distro/angstrom-2007.1.conf +++ b/conf/distro/angstrom-2007.1.conf @@ -8,7 +8,7 @@ #DISTRO_VERSION = "2007.1" DISTRO_VERSION = "test-${DATE}" -DISTRO_REVISION = "10" +DISTRO_REVISION = "11" require conf/distro/include/angstrom.inc require conf/distro/include/sane-srcdates.inc @@ -33,7 +33,7 @@ FEED_ARCH_akita = "armv5te" FEED_ARCH_c7x0 = "armv5te" FEED_ARCH_h2200 = "armv5te" FEED_ARCH_h4000 = "armv5te" -FEED_ARCH_h5xxx = "armv5te" +FEED_ARCH_h5000 = "armv5te" FEED_ARCH_htcuniversal = "armv5te" FEED_ARCH_hx2000 = "armv5te" FEED_ARCH_hx4700 = "armv5te" @@ -156,6 +156,8 @@ PREFERRED_VERSION_linux-libc-headers_guinness ?= "2.6.18" PREFERRED_VERSION_linux-libc-headers ?= "2.6.15.99" PREFERRED_VERSION_glibc ?= "2.5" + +PREFERRED_VERSION_glibc-intermediate_guinness ?= "2.4" PREFERRED_VERSION_glibc-intermediate ?= "2.5" # To use an EABI compatible version 3 series gcc, either uncomment diff --git a/conf/distro/include/sane-srcdates.inc b/conf/distro/include/sane-srcdates.inc index ffde56224c..b3bf85a918 100644 --- a/conf/distro/include/sane-srcdates.inc +++ b/conf/distro/include/sane-srcdates.inc @@ -21,7 +21,7 @@ SRCDATE_xxf86vmext ?= "20060814" # Matchbox / O-hand SRCDATE_contacts ?= "20060707" SRCDATE_dates ?= "20060707" -SRCDATE_fstests ?= "20061111" +SRCDATE_fstests ?= "20061122" SRCDATE_eds-dbus ?= "20060707" SRCDATE_libmatchbox ?= "20060612" SRCDATE_libfakekey ?= "20051101" diff --git a/conf/distro/jlime-donkey.conf b/conf/distro/jlime-donkey.conf index 2390106023..054d7be8f8 100644 --- a/conf/distro/jlime-donkey.conf +++ b/conf/distro/jlime-donkey.conf @@ -13,14 +13,14 @@ export FEED_URLS_jlime = "donkey##http://donkey-${ARCH}.jlime.com" #<>-----------------------------------------------------------------< PREFERRED_PROVIDER_task-bootstrap = "task-bootstrap" - #<>-----------------------------------------------------------------> #<> We will set CVS DATE when things are known to work. #<>-----------------------------------------------------------------< PREFERRED_PROVIDERS += "virtual/${TARGET_PREFIX}gcc-initial:gcc-cross-initial" PREFERRED_PROVIDERS += "virtual/${TARGET_PREFIX}gcc:gcc-cross" PREFERRED_PROVIDERS += "virtual/${TARGET_PREFIX}g++:gcc-cross" - +PREFERRED_PROVIDER_virtual/sh3-linux-libc-for-gcc = "glibc-intermediate" +PREFERRED_PROVIDER_virtual/arm-linux-libc-for-gcc = "glibc-intermediate" #<>-----------------------------------------------------------------> #<> We want this so we can crosscompile the kernel using gcc 3.4.3 @@ -50,18 +50,9 @@ PREFERRED_VERSION_gcc = "4.1.1" PREFERRED_VERSION_gcc-cross = "4.1.1" PREFERRED_VERSION_gcc-cross-initial = "4.1.1" PREFERRED_VERSION_linux-libc-headers = "2.6.15.99" -PREFERRED_VERSION_glibc = "2.4" -PREFERRED_VERSION_glibc-intermediate = "2.4" - -#<>-----------------------------------------------------------------> -#<>Patch for bitbake bug: -#<>Due to bitbake not grabbing glibc 2.4 properly -#<>we need to override it to be sure. Do it for both supported archs -#<>-----------------------------------------------------------------< - -#Add proper line to your local.conf (sh3 for 6xx, arm for 7xx) -#PREFERRED_PROVIDER_virtual/arm-linux-libc-for-gcc = "glibc-intermediate" -#PREFERRED_PROVIDER_virtual/sh3-linux-libc-for-gcc = "glibc-intermediate" +PREFERRED_VERSION_glibc = "2.5" +PREFERRED_VERSION_glibc-initial = "2.3.2" +PREFERRED_VERSION_glibc-intermediate = "2.5" #<>------------------------------------------------------------------> #<> |