aboutsummaryrefslogtreecommitdiffstats
path: root/conf
diff options
context:
space:
mode:
authorKoen Kooi <koen@openembedded.org>2006-11-29 10:56:44 +0000
committerKoen Kooi <koen@openembedded.org>2006-11-29 10:56:44 +0000
commitf8edb5ad15e84bb5168d2e081a776e85d7c89fe4 (patch)
tree93241011a7732a00643a2b025e8bc8932f796793 /conf
parent161de35501fc0166133a322973336628eb7d1485 (diff)
downloadopenembedded-f8edb5ad15e84bb5168d2e081a776e85d7c89fe4.tar.gz
openembedded-f8edb5ad15e84bb5168d2e081a776e85d7c89fe4.tar.bz2
openembedded-f8edb5ad15e84bb5168d2e081a776e85d7c89fe4.zip
angstrom 2007.1: only install psplash formachines with a 'screen'
Diffstat (limited to 'conf')
-rw-r--r--conf/distro/angstrom-2007.1.conf10
1 files changed, 6 insertions, 4 deletions
diff --git a/conf/distro/angstrom-2007.1.conf b/conf/distro/angstrom-2007.1.conf
index 6a872e28ba..3182fa7d77 100644
--- a/conf/distro/angstrom-2007.1.conf
+++ b/conf/distro/angstrom-2007.1.conf
@@ -8,7 +8,7 @@
#DISTRO_VERSION = "2007.1"
DISTRO_VERSION = "test-${DATE}"
-DISTRO_REVISION = "13"
+DISTRO_REVISION = "15"
require conf/distro/include/angstrom.inc
require conf/distro/include/sane-srcdates.inc
@@ -66,7 +66,7 @@ FEED_URIS += " \
#SRCDATE = "20061029"
PREFERRED_VERSION_linux-handhelds-2.6 = "2.6.16-hh7"
-PREFERRED_VERSION_linux-handhelds-2.6_htcuniversal = "2.6.17-hh2"
+PREFERRED_VERSION_linux-handhelds-2.6_htcuniversal = "2.6.18-hh1"
SRCDATE_gconf-dbus = "20060719"
@@ -85,7 +85,7 @@ PREFERRED_PROVIDER_virtual/libsdl ?= "libsdl-x11"
PREFERRED_PROVIDER_virtual/libxine ?= "libxine-x11"
-PREFERRED_VERSION_fontconfig = "2.3.95"
+PREFERRED_VERSION_fontconfig = "2.4.1"
PREFERRED_VERSION_freetype = "2.2.1"
#fix screen corruption issues
PREFERRED_VERSION_cairo = "1.3.4"
@@ -172,6 +172,8 @@ PREFERRED_VERSION_glibc-intermediate ?= "2.5"
# Busybox <1.1.0 doesn't have EABI support
PREFERRED_VERSION_busybox = "1.2.1"
+PCMCIA_MANAGER = "pcmciautils"
+
PREFERRED_VERSION_dbus ?= "1.0.1"
PREFERRED_VERSION_dbus-glib ?= "0.71"
@@ -211,7 +213,7 @@ EXTRA_STUFF ?= ""
DISTRO_EXTRA_RDEPENDS = "\
update-modules module-init-tools modutils-initscripts \
sysvinit initscripts sysvinit-pidof \
- psplash \
+ ${@base_contains("MACHINE_FEATURES", "screen", "psplash", "",d)} \
netbase dropbear \
angstrom-version \
ipkg ipkg-collateral \