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/openzaurus.inc2
-rw-r--r--conf/distro/openzaurus-unstable.conf6
3 files changed, 10 insertions, 6 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/openzaurus.inc b/conf/distro/include/openzaurus.inc
index ea408ff221..8274148823 100644
--- a/conf/distro/include/openzaurus.inc
+++ b/conf/distro/include/openzaurus.inc
@@ -22,4 +22,4 @@ BB_MIN_VERSION = "1.4.4"
INHERIT += "sanity"
# We want images supporting the following features (for task-base)
-DISTRO_FEATURES = "nfs smbfs ipsec wifi ppp alsa bluetooth ext2 irda pcmcia usbgadget usbhost"
+DISTRO_FEATURES = "nfs smbfs wifi ppp alsa bluetooth ext2 irda pcmcia usbgadget usbhost"
diff --git a/conf/distro/openzaurus-unstable.conf b/conf/distro/openzaurus-unstable.conf
index 10f00b7604..476249478d 100644
--- a/conf/distro/openzaurus-unstable.conf
+++ b/conf/distro/openzaurus-unstable.conf
@@ -51,14 +51,18 @@ PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}gcc-initial:gcc-cross-initial"
PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}gcc:gcc-cross"
PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}g++:gcc-cross"
+PREFERRED_VERSION_binutils-cross-sdk = "2.16"
PREFERRED_VERSION_binutils-cross = "2.16"
PREFERRED_VERSION_binutils = "2.16"
PREFERRED_VERSION_glibc = "2.3.5+cvs20050627"
PREFERRED_VERSION_gcc = "3.4.4"
PREFERRED_VERSION_gcc-cross = "3.4.4"
+PREFERRED_VERSION_gcc-cross-sdk = "3.4.4"
PREFERRED_VERSION_gcc-cross-initial = "3.4.4"
+PREFERRED_VERSION_wpa-supplicant = "0.5.5"
+
#
# Opie
#
@@ -71,7 +75,7 @@ require conf/distro/include/preferred-opie-versions.inc
# GPE
#
PREFERRED_PROVIDERS += "virtual/xserver:xserver-kdrive"
-PREFERRED_PROVIDER_virtual/libx11 = "diet-x11"
+PREFERRED_PROVIDER_virtual/libx11 ?= "diet-x11"
require conf/distro/include/preferred-gpe-versions-2.8.inc
#