summaryrefslogtreecommitdiffstats
path: root/meta/conf/distro
diff options
context:
space:
mode:
Diffstat (limited to 'meta/conf/distro')
-rw-r--r--meta/conf/distro/include/poky-default.inc4
-rw-r--r--meta/conf/distro/include/poky-moblin.inc2
2 files changed, 3 insertions, 3 deletions
diff --git a/meta/conf/distro/include/poky-default.inc b/meta/conf/distro/include/poky-default.inc
index a805de5b0e..f5882a278c 100644
--- a/meta/conf/distro/include/poky-default.inc
+++ b/meta/conf/distro/include/poky-default.inc
@@ -12,13 +12,13 @@ PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}gcc = "gcc-cross"
12PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}g++ = "gcc-cross" 12PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}g++ = "gcc-cross"
13 13
14GCCVERSION ?= "4.3.3" 14GCCVERSION ?= "4.3.3"
15BINUVERSION ?= "2.19" 15BINUVERSION ?= "2.20"
16GLIBCVERSION ?= "2.9" 16GLIBCVERSION ?= "2.9"
17LINUXLIBCVERSION ?= "2.6.29" 17LINUXLIBCVERSION ?= "2.6.29"
18 18
19# Temporary preferred version overrides for PPC 19# Temporary preferred version overrides for PPC
20GCCVERSION_powerpc ?= "4.2.3" 20GCCVERSION_powerpc ?= "4.2.3"
21BINUVERSION_powerpc ?= "2.19" 21BINUVERSION_powerpc ?= "2.20"
22GLIBCVERSION_powerpc ?= "2.6.1" 22GLIBCVERSION_powerpc ?= "2.6.1"
23LINUXLIBCVERSION_powerpc ?= "2.6.20" 23LINUXLIBCVERSION_powerpc ?= "2.6.20"
24PREFERRED_VERSION_u-boot-mkimage-native_powerpc ?= "2009.08" 24PREFERRED_VERSION_u-boot-mkimage-native_powerpc ?= "2009.08"
diff --git a/meta/conf/distro/include/poky-moblin.inc b/meta/conf/distro/include/poky-moblin.inc
index 1e5eb2e2f1..1314156a3b 100644
--- a/meta/conf/distro/include/poky-moblin.inc
+++ b/meta/conf/distro/include/poky-moblin.inc
@@ -8,7 +8,7 @@ PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}gcc = "gcc-cross"
8PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}g++ = "gcc-cross" 8PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}g++ = "gcc-cross"
9 9
10GCCVERSION ?= "4.3.3" 10GCCVERSION ?= "4.3.3"
11BINUVERSION = "2.18" 11BINUVERSION = "2.20"
12 12
13PREFERRED_VERSION_gcc ?= "${GCCVERSION}" 13PREFERRED_VERSION_gcc ?= "${GCCVERSION}"
14PREFERRED_VERSION_gcc-cross ?= "${GCCVERSION}" 14PREFERRED_VERSION_gcc-cross ?= "${GCCVERSION}"