diff options
| author | Stefan Schmidt <stefan@datenfreihafen.org> | 2009-09-13 19:47:16 +0000 |
|---|---|---|
| committer | Stefan Schmidt <stefan@datenfreihafen.org> | 2009-09-13 19:47:16 +0000 |
| commit | f16e56319742656189dcedf251bd2ea390d17c03 (patch) | |
| tree | da6fc09cbe15b76b6bb9eda5201cd5e13e7f94cd /conf/distro | |
| parent | 848446695abfdb3d3631d70ece7e74311f26d37c (diff) | |
| parent | 34e6a1ce23f1ef5f627447286c4ae768d8bcb1ad (diff) | |
Merge branch 'org.openembedded.dev' of git@git.openembedded.net:openembedded into org.openembedded.dev
Diffstat (limited to 'conf/distro')
| -rw-r--r-- | conf/distro/include/angstrom-2008-preferred-versions.inc | 2 | ||||
| -rw-r--r-- | conf/distro/include/sane-srcrevs.inc | 1 | ||||
| -rw-r--r-- | conf/distro/include/sane-toolchain.inc | 6 | ||||
| -rw-r--r-- | conf/distro/micro.conf | 1 |
4 files changed, 6 insertions, 4 deletions
diff --git a/conf/distro/include/angstrom-2008-preferred-versions.inc b/conf/distro/include/angstrom-2008-preferred-versions.inc index 32cfbfb403..0c0c83117e 100644 --- a/conf/distro/include/angstrom-2008-preferred-versions.inc +++ b/conf/distro/include/angstrom-2008-preferred-versions.inc @@ -11,7 +11,7 @@ PREFERRED_VERSION_glib-2.0-native = "2.18.0" PREFERRED_VERSION_glibmm = "2.18.0" PREFERRED_VERSION_glproto = "1.4.9" PREFERRED_VERSION_gst-pulse = "0.9.7" -PREFERRED_VERSION_gtk+ = "2.16.4" +PREFERRED_VERSION_gtk+ = "2.16.6" PREFERRED_VERSION_gtkmm = "2.14.1" PREFERRED_VERSION_hal = "0.5.13" PREFERRED_VERSION_libgemwidget = "1.0" diff --git a/conf/distro/include/sane-srcrevs.inc b/conf/distro/include/sane-srcrevs.inc index b88ac9bc8c..e3400a213b 100644 --- a/conf/distro/include/sane-srcrevs.inc +++ b/conf/distro/include/sane-srcrevs.inc @@ -86,6 +86,7 @@ SRCREV_pn-libexalt-dbus ?= "76" SRCREV_pn-libfakekey ?= "1455" SRCREV_pn-libgdbus ?= "aeab6e3c0185b271ca343b439470491b99cc587f" SRCREV_pn-libgsmd ?= "4505" +SRCREV_pn-libgee ?= "ea130c0837eefe404b53240f8c2ed642ae98a677" SRCREV_pn-libiac ?= "1590" SRCREV_pn-libjana = "749" SRCREV_pn-libmokogsmd2 ?= "4334" diff --git a/conf/distro/include/sane-toolchain.inc b/conf/distro/include/sane-toolchain.inc index 65cb7763d1..e2c6740e52 100644 --- a/conf/distro/include/sane-toolchain.inc +++ b/conf/distro/include/sane-toolchain.inc @@ -5,7 +5,7 @@ ############################################################################# # Base line versions, good for most things -PREFERRED_GCC_VERSION ?= "4.2.4" +PREFERRED_GCC_VERSION ?= "4.4.1" PREFERRED_BINUTILS ?= "2.18" # Prefer glibc 2.6 and uclibc 0.9.30, these have had the most testing. @@ -19,9 +19,9 @@ PREFERRED_VERSION_uclibc-initial ?= "0.9.30.1" # Some systems need a special gcc version PREFERRED_GCC_VERSION_486sx ?= "4.3.2" PREFERRED_GCC_VERSION_avr32 ?= "4.2.2" -PREFERRED_GCC_VERSION_armv7a ?= "4.3.1" +PREFERRED_GCC_VERSION_armv7a ?= "4.4.1" PREFERRED_GCC_VERSION_bfin ?= "4.1.2" -PREFERRED_GCC_VERSION_ppc405 ?= "4.1.1" +PREFERRED_GCC_VERSION_ppc405 ?= "4.4.1" PREFERRED_GCC_VERSION_xilinx-ml403 ?= "4.1.1" PREFERRED_GCC_VERSION_xilinx-ml403 ?= "4.1.1" diff --git a/conf/distro/micro.conf b/conf/distro/micro.conf index aca4a18caf..67e3aff3ca 100644 --- a/conf/distro/micro.conf +++ b/conf/distro/micro.conf @@ -61,6 +61,7 @@ MACHINE_KERNEL_VERSION = "2.6" # TOOLCHAIN ############################################################################# LIBC ?= "eglibc" +PREFERRED_BINUTILS = "2.19.51" require conf/distro/include/sane-toolchain.inc ############################################################################# |