diff options
| author | Paul Sokolovsky <pmiscml@gmail.com> | 2007-04-07 11:48:06 +0000 |
|---|---|---|
| committer | Paul Sokolovsky <pmiscml@gmail.com> | 2007-04-07 11:48:06 +0000 |
| commit | f083247cadbfec447628e30114f920c443af69b0 (patch) | |
| tree | 767f24b98fd6534073927995dd24613c3f06120e /conf | |
| parent | 3b4539cfddea3fcbe9f36d9089afd8962da76762 (diff) | |
| parent | 8679a9849d2d635859f9207326cd1e94d982f454 (diff) | |
merge of 'd6472bcf61be355b72e9d96a067952d4f9b12831'
and 'e626ab4b1d3176dbf790f7d530dd936881f3e60a'
Diffstat (limited to 'conf')
| -rw-r--r-- | conf/distro/angstrom-2007.1.conf | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/conf/distro/angstrom-2007.1.conf b/conf/distro/angstrom-2007.1.conf index ce8d446388..86e87f31d6 100644 --- a/conf/distro/angstrom-2007.1.conf +++ b/conf/distro/angstrom-2007.1.conf @@ -8,7 +8,7 @@ #DISTRO_VERSION = "2007.4" DISTRO_VERSION = "test-${DATE}" -DISTRO_REVISION = "40" +DISTRO_REVISION = "41" require conf/distro/include/angstrom.inc require conf/distro/include/sane-srcdates.inc @@ -133,7 +133,7 @@ PREFERRED_VERSION_fontconfig = "2.4.1" PREFERRED_VERSION_freetype = "2.3.1" PREFERRED_VERSION_freetype-native = "2.2.1" PREFERRED_VERSION_cairo = "1.4.2" -PREFERRED_VERSION_glib-2.0 = "2.12.10" +PREFERRED_VERSION_glib-2.0 = "2.12.11" #Small machines prefer kdrive, but we might ship full Xorg in other images PREFERRED_PROVIDER_virtual/xserver ?= "xserver-kdrive" @@ -198,7 +198,7 @@ PREFERRED_PROVIDER_virtual/armeb-angstrom-linux-uclibcgnueabi-libc-for-gcc = "uc #use EABI toolchain PREFERRED_VERSION_gcc ?= "4.1.2" -PREFERRED_VERSION_gcc-cross ?= "4.1.1" +PREFERRED_VERSION_gcc-cross ?= "4.1.2" PREFERRED_VERSION_gcc-cross-sdk ?= "4.1.2" PREFERRED_VERSION_gcc-cross-initial ?= "4.1.1" |