diff options
author | Richard Purdie <richard@openedhand.com> | 2006-12-19 19:21:44 +0000 |
---|---|---|
committer | Richard Purdie <richard@openedhand.com> | 2006-12-19 19:21:44 +0000 |
commit | 01303ccecf5e0cc24fdd1a67071d1cfd9ead545e (patch) | |
tree | 1e2edef8ac953335757a173c1a1f56012a58b413 /meta | |
parent | 44e5910db472a5963bd0e837c6ec7dae51b5ea28 (diff) | |
download | poky-01303ccecf5e0cc24fdd1a67071d1cfd9ead545e.tar.gz |
distro.confs: Set SRCDATEs for exmap-console, elfutils and bump psplash
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@1048 311d38ba-8fff-0310-9ca6-ca027cbcb966
Diffstat (limited to 'meta')
-rw-r--r-- | meta/conf/distro/include/poky-eabi-csl2005q3-2.inc | 1 | ||||
-rw-r--r-- | meta/conf/distro/include/poky-eabi.inc | 1 | ||||
-rw-r--r-- | meta/conf/distro/include/poky-eabi2.inc | 1 | ||||
-rw-r--r-- | meta/conf/distro/include/poky-eabi3.inc | 1 | ||||
-rw-r--r-- | meta/conf/distro/poky.conf | 6 |
5 files changed, 8 insertions, 2 deletions
diff --git a/meta/conf/distro/include/poky-eabi-csl2005q3-2.inc b/meta/conf/distro/include/poky-eabi-csl2005q3-2.inc index 0235e91028..9d2e8cb20f 100644 --- a/meta/conf/distro/include/poky-eabi-csl2005q3-2.inc +++ b/meta/conf/distro/include/poky-eabi-csl2005q3-2.inc | |||
@@ -12,6 +12,7 @@ PREFERRED_VERSION_binutils ?= "2.16+csl-arm-2005q3-2" | |||
12 | PREFERRED_VERSION_binutils-cross ?= "2.16+csl-arm-2005q3-2" | 12 | PREFERRED_VERSION_binutils-cross ?= "2.16+csl-arm-2005q3-2" |
13 | PREFERRED_VERSION_glibc ?= "2.3.6+csl-arm-2005q3-2" | 13 | PREFERRED_VERSION_glibc ?= "2.3.6+csl-arm-2005q3-2" |
14 | PREFERRED_VERSION_glibc-intermediate ?= "2.3.6+csl-arm-2005q3-2" | 14 | PREFERRED_VERSION_glibc-intermediate ?= "2.3.6+csl-arm-2005q3-2" |
15 | PREFERRED_VERSION_elfutils ?= "0.108" | ||
15 | 16 | ||
16 | PREFERRED_VERSION_linux-libc-headers ?= "2.6.12rc3+csl-arm-2005q3-2" | 17 | PREFERRED_VERSION_linux-libc-headers ?= "2.6.12rc3+csl-arm-2005q3-2" |
17 | 18 | ||
diff --git a/meta/conf/distro/include/poky-eabi.inc b/meta/conf/distro/include/poky-eabi.inc index d35ec8e441..80cbfcc8ea 100644 --- a/meta/conf/distro/include/poky-eabi.inc +++ b/meta/conf/distro/include/poky-eabi.inc | |||
@@ -16,6 +16,7 @@ PREFERRED_VERSION_binutils-cross ?= "2.16.91.0.7" | |||
16 | PREFERRED_VERSION_linux-libc-headers ?= "2.6.15.99" | 16 | PREFERRED_VERSION_linux-libc-headers ?= "2.6.15.99" |
17 | PREFERRED_VERSION_glibc ?= "2.4" | 17 | PREFERRED_VERSION_glibc ?= "2.4" |
18 | PREFERRED_VERSION_glibc-intermediate ?= "2.4" | 18 | PREFERRED_VERSION_glibc-intermediate ?= "2.4" |
19 | PREFERRED_VERSION_elfutils ?= "0.108" | ||
19 | 20 | ||
20 | #Use the ARM EABI when building for an ARM cpu. We can't use overrides | 21 | #Use the ARM EABI when building for an ARM cpu. We can't use overrides |
21 | #here because this breaks all places where ":=" is used. | 22 | #here because this breaks all places where ":=" is used. |
diff --git a/meta/conf/distro/include/poky-eabi2.inc b/meta/conf/distro/include/poky-eabi2.inc index 2833f3090e..97b8b92727 100644 --- a/meta/conf/distro/include/poky-eabi2.inc +++ b/meta/conf/distro/include/poky-eabi2.inc | |||
@@ -13,6 +13,7 @@ PREFERRED_VERSION_binutils-cross ?= "2.16.91.0.7" | |||
13 | PREFERRED_VERSION_linux-libc-headers ?= "2.6.15.99" | 13 | PREFERRED_VERSION_linux-libc-headers ?= "2.6.15.99" |
14 | PREFERRED_VERSION_glibc ?= "2.4" | 14 | PREFERRED_VERSION_glibc ?= "2.4" |
15 | PREFERRED_VERSION_glibc-intermediate ?= "2.4" | 15 | PREFERRED_VERSION_glibc-intermediate ?= "2.4" |
16 | PREFERRED_VERSION_elfutils ?= "0.108" | ||
16 | 17 | ||
17 | #Use the ARM EABI when building for an ARM cpu. We can't use overrides | 18 | #Use the ARM EABI when building for an ARM cpu. We can't use overrides |
18 | #here because this breaks all places where ":=" is used. | 19 | #here because this breaks all places where ":=" is used. |
diff --git a/meta/conf/distro/include/poky-eabi3.inc b/meta/conf/distro/include/poky-eabi3.inc index 427cdaa5c7..0df08caa52 100644 --- a/meta/conf/distro/include/poky-eabi3.inc +++ b/meta/conf/distro/include/poky-eabi3.inc | |||
@@ -13,6 +13,7 @@ PREFERRED_VERSION_binutils-cross ?= "2.17+csl-arm-2006q1-6" | |||
13 | PREFERRED_VERSION_linux-libc-headers ?= "2.6.15.99" | 13 | PREFERRED_VERSION_linux-libc-headers ?= "2.6.15.99" |
14 | PREFERRED_VERSION_glibc ?= "2.4" | 14 | PREFERRED_VERSION_glibc ?= "2.4" |
15 | PREFERRED_VERSION_glibc-intermediate ?= "2.4" | 15 | PREFERRED_VERSION_glibc-intermediate ?= "2.4" |
16 | PREFERRED_VERSION_elfutils ?= "0.108" | ||
16 | 17 | ||
17 | #Use the ARM EABI when building for an ARM cpu. We can't use overrides | 18 | #Use the ARM EABI when building for an ARM cpu. We can't use overrides |
18 | #here because this breaks all places where ":=" is used. | 19 | #here because this breaks all places where ":=" is used. |
diff --git a/meta/conf/distro/poky.conf b/meta/conf/distro/poky.conf index 4bd512f60f..d42f59289a 100644 --- a/meta/conf/distro/poky.conf +++ b/meta/conf/distro/poky.conf | |||
@@ -116,8 +116,9 @@ SRCDATE_qemu-native ?= "20060723" | |||
116 | SRCDATE_oprofile ?= "20061011" | 116 | SRCDATE_oprofile ?= "20061011" |
117 | SRCDATE_zaurusd ?= "20060729" | 117 | SRCDATE_zaurusd ?= "20060729" |
118 | SRCDATE_owl-video-widget ?= "20060925" | 118 | SRCDATE_owl-video-widget ?= "20060925" |
119 | SRCDATE_psplash ?= "20061122" | 119 | SRCDATE_psplash ?= "20061220" |
120 | SRCDATE_maemo-mapper-nohildon ?= "20061114" | 120 | SRCDATE_maemo-mapper-nohildon ?= "20061114" |
121 | SRCDATE_exmap-console = "20061220" | ||
121 | 122 | ||
122 | # | 123 | # |
123 | # Preferred Versions: | 124 | # Preferred Versions: |
@@ -171,6 +172,7 @@ PREFERRED_VERSION_xmonobut ?= "0.4" | |||
171 | PREFERRED_VERSION_xprop ?= "0.0+cvs${SRCDATE}" | 172 | PREFERRED_VERSION_xprop ?= "0.0+cvs${SRCDATE}" |
172 | PREFERRED_VERSION_xst ?= "0.15" | 173 | PREFERRED_VERSION_xst ?= "0.15" |
173 | PREFERRED_VERSION_oprofile ?= "0.9.2+cvs${SRCDATE}" | 174 | PREFERRED_VERSION_oprofile ?= "0.9.2+cvs${SRCDATE}" |
175 | PREFERRED_VERSION_elfutils ?= "0.89" | ||
174 | 176 | ||
175 | require conf/distro/include/preferred-xorg-versions.inc | 177 | require conf/distro/include/preferred-xorg-versions.inc |
176 | 178 | ||
@@ -183,4 +185,4 @@ IMAGE_LINGUAS = "en-gb" | |||
183 | DISTRO_FEATURES = "alsa bluetooth ext2 irda pcmcia usbgadget usbhost wifi" | 185 | DISTRO_FEATURES = "alsa bluetooth ext2 irda pcmcia usbgadget usbhost wifi" |
184 | DISTRO_FEATURES_cmx270 = "alsa bluetooth ext2 irda pcmcia usbgadget usbhost" | 186 | DISTRO_FEATURES_cmx270 = "alsa bluetooth ext2 irda pcmcia usbgadget usbhost" |
185 | DISTRO_EXTRA_RDEPENDS_qemuarm += "qemu-distcc" | 187 | DISTRO_EXTRA_RDEPENDS_qemuarm += "qemu-distcc" |
186 | DISTRO_EXTRA_RDEPENDS_qemux86 += "qemu-distcc" \ No newline at end of file | 188 | DISTRO_EXTRA_RDEPENDS_qemux86 += "qemu-distcc" |