summaryrefslogtreecommitdiffstats
path: root/meta/conf
diff options
context:
space:
mode:
Diffstat (limited to 'meta/conf')
-rw-r--r--meta/conf/distro/include/poky-fixed-revisions.inc2
-rw-r--r--meta/conf/distro/include/poky-moblin.inc6
2 files changed, 4 insertions, 4 deletions
diff --git a/meta/conf/distro/include/poky-fixed-revisions.inc b/meta/conf/distro/include/poky-fixed-revisions.inc
index 1302727228..8842181cd1 100644
--- a/meta/conf/distro/include/poky-fixed-revisions.inc
+++ b/meta/conf/distro/include/poky-fixed-revisions.inc
@@ -274,6 +274,6 @@ PREFERRED_VERSION_evince ?= "2.20.0"
274PREFERRED_VERSION_minimo ?= "0.02+cvs${SRCDATE_minimo}" 274PREFERRED_VERSION_minimo ?= "0.02+cvs${SRCDATE_minimo}"
275PREFERRED_VERSION_oprofile ?= "0.9.4" 275PREFERRED_VERSION_oprofile ?= "0.9.4"
276PREFERRED_VERSION_elfutils ?= "0.89" 276PREFERRED_VERSION_elfutils ?= "0.89"
277PREFERRED_VERSION_hal ?= "0.5.11+0.5.12rc1" 277PREFERRED_VERSION_hal ?= "0.5.13"
278PREFERRED_VERSION_hal-info ?= "20090414" 278PREFERRED_VERSION_hal-info ?= "20090414"
279 279
diff --git a/meta/conf/distro/include/poky-moblin.inc b/meta/conf/distro/include/poky-moblin.inc
index 612bc99228..5e9809be23 100644
--- a/meta/conf/distro/include/poky-moblin.inc
+++ b/meta/conf/distro/include/poky-moblin.inc
@@ -17,9 +17,9 @@ PREFERRED_VERSION_gcc-cross-intermediate ?= "${GCCVERSION}"
17PREFERRED_VERSION_gcc-cross-sdk ?= "4.3.1" 17PREFERRED_VERSION_gcc-cross-sdk ?= "4.3.1"
18PREFERRED_VERSION_binutils ?= "${BINUVERSION}" 18PREFERRED_VERSION_binutils ?= "${BINUVERSION}"
19PREFERRED_VERSION_binutils-cross ?= "${BINUVERSION}" 19PREFERRED_VERSION_binutils-cross ?= "${BINUVERSION}"
20PREFERRED_VERSION_linux-libc-headers ?= "2.6.29" 20PREFERRED_VERSION_linux-libc-headers ?= "2.6.30"
21PREFERRED_VERSION_glibc ?= "2.6.1" 21PREFERRED_VERSION_glibc ?= "2.9"
22PREFERRED_VERSION_glibc-initial ?= "2.6.1" 22PREFERRED_VERSION_glibc-initial ?= "2.9"
23PREFERRED_VERSION_elfutils ?= "0.131" 23PREFERRED_VERSION_elfutils ?= "0.131"
24 24
25require conf/distro/include/as-needed.inc 25require conf/distro/include/as-needed.inc