diff options
| author | Koen Kooi <koen@openembedded.org> | 2006-08-22 11:08:53 +0000 |
|---|---|---|
| committer | Koen Kooi <koen@openembedded.org> | 2006-08-22 11:08:53 +0000 |
| commit | 117b467cb9535d0276ba74a36b3fbd71207a666b (patch) | |
| tree | b74c3df17ebbe262fd476ab0b17c2c2d0b93c5ba /conf | |
| parent | ac916651b26667327d7f78e33801cbd4e6bff8ed (diff) | |
| parent | 6f873a200f5003c2c8ff072b0bc6eddca74ce7a3 (diff) | |
merge of '1cbd1bde7832b3e86e5c8ad0fabfa6a90408baf5'
and 'ca20876bde8f155d49159fb19e6254cf4eaf0b43'
Diffstat (limited to 'conf')
| -rw-r--r-- | conf/distro/angstrom-2006.9.conf | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/conf/distro/angstrom-2006.9.conf b/conf/distro/angstrom-2006.9.conf index 4f732ecc2a..4abeea6e9a 100644 --- a/conf/distro/angstrom-2006.9.conf +++ b/conf/distro/angstrom-2006.9.conf @@ -46,6 +46,8 @@ 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" @@ -55,10 +57,12 @@ 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 @@ -120,7 +124,7 @@ PREFERRED_VERSION_busybox = "1.2.1" PREFERRED_VERSION_orinoco-modules_h3600 = "0.13e" PREFERRED_VERSION_orinoco-modules_h3900 = "0.13e" -PREFERRED_VERSION_dbus ?= "0.91" +PREFERRED_VERSION_dbus ?= "0.92" PREFERRED_VERSION_gstreamer ?= "0.10.6" PREFERRED_PROVIDER_hostap-conf ?= "hostap-conf" @@ -144,11 +148,11 @@ 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" +#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 ### |