summaryrefslogtreecommitdiff
path: root/conf
diff options
context:
space:
mode:
authorPaul Sokolovsky <pmiscml@gmail.com>2007-04-07 11:26:59 +0000
committerPaul Sokolovsky <pmiscml@gmail.com>2007-04-07 11:26:59 +0000
commit8679a9849d2d635859f9207326cd1e94d982f454 (patch)
tree07eef425e0827118abf746ec1460b151c365c188 /conf
parent633a0fd4b30c857cd2250c9e842039b700b0d23e (diff)
parent4827e64316bd93eff35a1d2271ef9a252f97717e (diff)
merge of 'a2b32d1881604a26db77ff820b0dfc1db34bd902'
and 'bf74e558bb9a1d856998a5f3e5c3faac8c010c98'
Diffstat (limited to 'conf')
-rw-r--r--conf/distro/angstrom-2007.1.conf6
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"