summaryrefslogtreecommitdiff
path: root/conf/distro
diff options
context:
space:
mode:
Diffstat (limited to 'conf/distro')
-rw-r--r--conf/distro/angstrom-2007.1-oabi.conf2
-rw-r--r--conf/distro/angstrom-2007.1.conf5
-rw-r--r--conf/distro/include/opie-users-are-too-stupid-to-put-this-in-local.conf.inc6
-rw-r--r--conf/distro/include/sane-srcdates.inc2
4 files changed, 6 insertions, 9 deletions
diff --git a/conf/distro/angstrom-2007.1-oabi.conf b/conf/distro/angstrom-2007.1-oabi.conf
index 4007f203ad..c88aa06697 100644
--- a/conf/distro/angstrom-2007.1-oabi.conf
+++ b/conf/distro/angstrom-2007.1-oabi.conf
@@ -3,6 +3,8 @@ require conf/distro/angstrom-2007.1.conf
#this is a special version of angstrom for armv4 based machines that can't do EABI
#see http://wiki.debian.org/ArmEabiPort for details on that
+PREFERRED_PROVIDER_virtual/arm-angstrom-linux-libc-for-gcc = "glibc-intermediate"
+
#only glibc based builds are supported ATM
TARGET_OS = "linux"
diff --git a/conf/distro/angstrom-2007.1.conf b/conf/distro/angstrom-2007.1.conf
index b1d67e0405..ab59d392b8 100644
--- a/conf/distro/angstrom-2007.1.conf
+++ b/conf/distro/angstrom-2007.1.conf
@@ -93,12 +93,13 @@ require conf/distro/include/preferred-gpe-versions-2.8.inc
PREFERRED_PROVIDER_dbus-glib = "dbus-glib"
PREFERRED_PROVIDER_virtual/libsdl ?= "libsdl-x11"
PREFERRED_PROVIDER_virtual/libxine ?= "libxine-x11"
+PREFERRED_PROVIDER_esound ?= "pulseaudio"
PREFERRED_VERSION_fontconfig = "2.4.1"
PREFERRED_VERSION_freetype = "2.2.1"
#fix screen corruption issues
-PREFERRED_VERSION_cairo = "1.3.10"
+PREFERRED_VERSION_cairo = "1.3.12"
#work around a segfault in gcc for armv4t
PREFERRED_VERSION_glib-2.0_ep93xx = "2.12.3"
@@ -225,7 +226,7 @@ EXTRA_STUFF ?= ""
# Angstrom want to ship some extra stuff. This should be moved into task-base eventually
-DISTRO_EXTRA_RDEPENDS = "\
+DISTRO_EXTRA_RDEPENDS += "\
update-modules module-init-tools modutils-initscripts \
sysvinit initscripts sysvinit-pidof \
${@base_contains("MACHINE_FEATURES", "screen", "psplash", "",d)} \
diff --git a/conf/distro/include/opie-users-are-too-stupid-to-put-this-in-local.conf.inc b/conf/distro/include/opie-users-are-too-stupid-to-put-this-in-local.conf.inc
deleted file mode 100644
index 7898f7b349..0000000000
--- a/conf/distro/include/opie-users-are-too-stupid-to-put-this-in-local.conf.inc
+++ /dev/null
@@ -1,6 +0,0 @@
-# Opie
-#use 1337 mt version of opie to have a webbrowser
-PALMTOP_USE_MULTITHREADED_QT = "yes"
-QTE_VERSION = "2.3.10"
-OPIE_VERSION = "1.2.2"
-require conf/distro/include/preferred-opie-versions.inc
diff --git a/conf/distro/include/sane-srcdates.inc b/conf/distro/include/sane-srcdates.inc
index 866741479f..27e34856fd 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 ?= "20061215"
+SRCDATE_eds-dbus ?= "20070115"
SRCDATE_libmatchbox ?= "20060612"
SRCDATE_libfakekey ?= "20051101"
SRCDATE_matchbox-common ?= "20060612"