summaryrefslogtreecommitdiff
path: root/conf/distro/angstrom-2006.9.conf
diff options
context:
space:
mode:
Diffstat (limited to 'conf/distro/angstrom-2006.9.conf')
-rw-r--r--conf/distro/angstrom-2006.9.conf40
1 files changed, 33 insertions, 7 deletions
diff --git a/conf/distro/angstrom-2006.9.conf b/conf/distro/angstrom-2006.9.conf
index fbb2814453..ca7ddc873d 100644
--- a/conf/distro/angstrom-2006.9.conf
+++ b/conf/distro/angstrom-2006.9.conf
@@ -22,13 +22,15 @@ FEED_URIS += " \
perl##${ANGSTROM_URI}/unstable/feed/perl \
python##${ANGSTROM_URI}/unstable/feed/python \
debug##${ANGSTROM_URI}/unstable/feed/debug \
- ${MACHINE}##${ANGSTROM_URI}/usntable/feed/machine/${MACHINE}"
+ ${MACHINE}##${ANGSTROM_URI}/unstable/feed/machine/${MACHINE}"
# base##${ANGSTROM_URI}/releases/${DISTRO_VERSION}/feed/base \
# ${MACHINE}##${ANGSTROM_URI}/releases/${DISTRO_VERSION}/feed/${MACHINE} \
# updates##${ANGSTROM_URI}/releases/${DISTRO_VERSION}/feed/updates"
#SRCDATE = "20060630"
#SRCDATE_handhelds-pxa-2.6 = "20060622"
+SRCDATE_gconf-dbus = "20060719"
+SRCDATE_gnome-vfs-dbus = "20060803"
CVS_TARBALL_STASH = "\
http://ewi546.ewi.utwente.nl/mirror/www.openzaurus.org/official/unstable/3.5.4/sources/ \
@@ -44,12 +46,23 @@ require conf/distro/include/preferred-opie-versions.inc
# GPE
require conf/distro/include/preferred-gpe-versions-2.8.inc
+PREFERRED_PROVIDER_dbus-glib = "dbus-glib"
+
PREFERRED_VERSION_fontconfig = "2.3.95"
PREFERRED_VERSION_freetype = "2.2.1"
+#Small machines prefer kdrive, but we might ship full Xorg in other images
+PREFERRED_PROVIDER_virtual/xserver ?= "xserver-kdrive"
+PREFERRED_PROVIDER_xserver ?= "xserver-kdrive"
+
+require conf/distro/include/preferred-xorg-versions-X11R7.1.inc
+
+PREFERRED_VERSION_xserver-kdrive = "1.1.0+git${SRCDATE}"
+
#zap extra stuff taking place in $MACHINE.conf
GPE_EXTRA_INSTALL = ""
+
# E
require conf/distro/include/preferred-e-versions.inc
@@ -74,10 +87,14 @@ PREFERRED_PROVIDER_virtual/db-native ?= "db-native"
PREFERRED_PROVIDER_virtual/xserver ?= xserver-kdrive
# Others:
-PREFERRED_PROVIDER_x11 ?= "diet-x11"
+PREFERRED_PROVIDER_virtual/libx11 ?= "diet-x11"
PREFERRED_PROVIDER_gconf ?= gconf-dbus
-PREFERRED_PROVIDER_gnome-vfs ?= gnome-vfs-dbus
+PREFERRED_PROVIDER_gnome-vfs ?= gnome-vfs
PREFERRED_PROVIDER_tslib ?= tslib
+PREFERRED_PROVIDER_libgpewidget ?= "libgpewidget"
+PREFERRED_PROVIDER_ntp = "ntp"
+PREFERRED_PROVIDER_hotplug = "udev"
+PREFERRED_PROVIDER_libxss = "libxss"
#EABI stuff
PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}-libc-for-gcc = "glibc-intermediate"
@@ -103,11 +120,11 @@ PREFERRED_VERSION_glibc-intermediate ?= "2.4"
# Busybox <1.1.0 doesn't have EABI support
-PREFERRED_VERSION_busybox = "1.2.0"
+PREFERRED_VERSION_busybox = "1.2.1"
PREFERRED_VERSION_orinoco-modules_h3600 = "0.13e"
PREFERRED_VERSION_orinoco-modules_h3900 = "0.13e"
-PREFERRED_VERSION_dbus ?= "0.61"
+PREFERRED_VERSION_dbus ?= "0.92"
PREFERRED_VERSION_gstreamer ?= "0.10.6"
PREFERRED_PROVIDER_hostap-conf ?= "hostap-conf"
@@ -123,18 +140,27 @@ PREFERRED_VERSION_hostap-modules ?= "0.4.7"
PCMCIA_MANAGER_c7x0 = "pcmciautils"
PCMCIA_MANAGER_akita = "pcmciautils"
PCMCIA_MANAGER_spitz = "pcmciautils"
+PCMCIA_MANAGER_tosa = "pcmciautils"
+PCMCIA_MANAGER_poodle = "pcmciautils"
PCMCIA_MANAGER_nokia770 = "pcmciautils"
PCMCIA_MANAGER_h2200 = "pcmciautils"
+PCMCIA_MANAGER_h4000 = "pcmciautils"
PCMCIA_MANAGER_h6300 = "pcmciautils"
PCMCIA_MANAGER_ipaq-pxa270 = "pcmciautils"
+# add altboot to compatible models, will be replaced with angstrom-bootmanager
+#EXTRA_STUFF_append_c7x0 = "altboot"
+#EXTRA_STUFF_append_akita = "altboot"
+#EXTRA_STUFF_append_spitz = "altboot"
+#EXTRA_STUFF_append_poodle = "altboot"
+#EXTRA_STUFF_append_tosa = "altboot"
-
-#### GPE section ###
+### GPE section ###
#Install libgtkinput in devices without a keyboard
GPE_EXTRA_INSTALL_append_ipaq-pxa270 = " libgtkinput"
GPE_EXTRA_INSTALL_append_h2200 = " libgtkinput"
+GPE_EXTRA_INSTALL_append_h4000 = " libgtkinput"
GPE_EXTRA_INSTALL_append_h6300 = " libgtkinput"
GPE_EXTRA_INSTALL_append_simpad = " libgtkinput"
GPE_EXTRA_INSTALL_append_nokia770 = " libgtkinput"