summaryrefslogtreecommitdiff
path: root/conf/distro
diff options
context:
space:
mode:
Diffstat (limited to 'conf/distro')
-rw-r--r--conf/distro/angstrom-2007.1.conf8
-rw-r--r--conf/distro/include/sane-srcdates.inc2
-rw-r--r--conf/distro/unslung.conf7
3 files changed, 12 insertions, 5 deletions
diff --git a/conf/distro/angstrom-2007.1.conf b/conf/distro/angstrom-2007.1.conf
index 630fbc6bbf..a6f50c1842 100644
--- a/conf/distro/angstrom-2007.1.conf
+++ b/conf/distro/angstrom-2007.1.conf
@@ -8,7 +8,7 @@
#DISTRO_VERSION = "2007.3"
DISTRO_VERSION = "test-${DATE}"
-DISTRO_REVISION = "22"
+DISTRO_REVISION = "24"
require conf/distro/include/angstrom.inc
require conf/distro/include/sane-srcdates.inc
@@ -92,7 +92,7 @@ PREFERRED_PROVIDER_virtual/libxine ?= "libxine-x11"
PREFERRED_VERSION_fontconfig = "2.4.1"
PREFERRED_VERSION_freetype = "2.2.1"
#fix screen corruption issues
-PREFERRED_VERSION_cairo = "1.3.6"
+PREFERRED_VERSION_cairo = "1.3.8"
#Small machines prefer kdrive, but we might ship full Xorg in other images
PREFERRED_PROVIDER_virtual/xserver ?= "xserver-kdrive"
@@ -177,10 +177,10 @@ PREFERRED_VERSION_busybox = "1.2.1"
PCMCIA_MANAGER = "pcmciautils"
-PREFERRED_VERSION_dbus ?= "1.0.1"
+PREFERRED_VERSION_dbus ?= "1.0.2"
PREFERRED_VERSION_dbus-glib ?= "0.71"
-PREFERRED_VERSION_gstreamer ?= "0.10.6"
+PREFERRED_VERSION_gstreamer ?= "0.10.11"
PREFERRED_PROVIDER_hostap-conf ?= "hostap-conf"
PREFERRED_PROVIDER_hostap-modules_h2200 ?= "hostap-modules"
diff --git a/conf/distro/include/sane-srcdates.inc b/conf/distro/include/sane-srcdates.inc
index c75241f8a0..f73fa22e34 100644
--- a/conf/distro/include/sane-srcdates.inc
+++ b/conf/distro/include/sane-srcdates.inc
@@ -22,7 +22,7 @@ SRCDATE_xxf86vmext ?= "20060814"
SRCDATE_contacts ?= "20060707"
SRCDATE_dates ?= "20060707"
SRCDATE_fstests ?= "20061122"
-SRCDATE_eds-dbus ?= "20060707"
+SRCDATE_eds-dbus ?= "20061215"
SRCDATE_libmatchbox ?= "20060612"
SRCDATE_libfakekey ?= "20051101"
SRCDATE_matchbox-common ?= "20060612"
diff --git a/conf/distro/unslung.conf b/conf/distro/unslung.conf
index 892c589389..25ac84d270 100644
--- a/conf/distro/unslung.conf
+++ b/conf/distro/unslung.conf
@@ -75,3 +75,10 @@ INHERIT += "nslu2-mirrors"
PREFERRED_VERSION_ipkg ?= "0.99.154"
PREFERRED_VERSION_ipkg-native ?= "0.99.154"
+#-------------------------------------------------------------------
+# FIXME!
+# This is clearly wrong, the headers should match the 2.4.22 kernel,
+# but locking this to 2.6.11.1 at least gets Unslung building again.
+# - mwester 16 Dec 2006
+#
+PREFERRED_VERSION_linux-libc-headers ?= "2.6.11.1"