aboutsummaryrefslogtreecommitdiffstats
path: root/packages/angstrom
diff options
context:
space:
mode:
authorKoen Kooi <koen@openembedded.org>2006-11-30 09:34:11 +0000
committerKoen Kooi <koen@openembedded.org>2006-11-30 09:34:11 +0000
commitd44e4c85f982f09bc2dec77288d8c052f164162d (patch)
tree1a2cafa495bea44559cce4917fc577e479a289e3 /packages/angstrom
parentc62b8a9662072236751861c4889e302550d5fb99 (diff)
downloadopenembedded-d44e4c85f982f09bc2dec77288d8c052f164162d.tar.gz
task-angstrom-x11: exploit *_FEATURES a bit more
Diffstat (limited to 'packages/angstrom')
-rw-r--r--packages/angstrom/task-angstrom-x11.bb13
1 files changed, 8 insertions, 5 deletions
diff --git a/packages/angstrom/task-angstrom-x11.bb b/packages/angstrom/task-angstrom-x11.bb
index e72691f345..ad2b0f79f8 100644
--- a/packages/angstrom/task-angstrom-x11.bb
+++ b/packages/angstrom/task-angstrom-x11.bb
@@ -1,5 +1,5 @@
DESCRIPTION = "Task packages for the Angstrom distribution"
-PR = "r24"
+PR = "r25"
ALLOW_EMPTY = "1"
PACKAGE_ARCH = "${MACHINE_ARCH}"
@@ -40,7 +40,8 @@ RDEPENDS_angstrom-gpe-task-base := "\
gpe-icons \
gpe-confd \
gpe-autostarter \
- libgtkstylus \
+ ${@base_contains("MACHINE_FEATURES", "touchscreen", "libgtkstylus", "",d)} \
+ ${@base_contains("MACHINE_FEATURES", "keyboard", "", "libgtkinput",d)} \
suspend-desktop \
teleport \
xauth \
@@ -48,7 +49,9 @@ RDEPENDS_angstrom-gpe-task-base := "\
gdk-pixbuf-loader-xpm \
gdk-pixbuf-loader-jpeg \
pango-module-basic-x \
- pango-module-basic-fc"
+ pango-module-basic-fc \
+ ${@base_contains("COMBINED_FEATURES", "bluetooth", "gpe-bluetooth", "",d)} \
+ "
RDEPENDS_angstrom-gpe-task-pim := "\
gpe-timesheet \
@@ -78,9 +81,9 @@ RDEPENDS_angstrom-gpe-task-apps := "\
gpe-watch \
gpe-what \
matchbox-panel-hacks \
- gpe-aerial \
+ ${@base_contains("COMBINED_FEATURES", "wifi", "gpe-aerial", "",d)} \
gpe-soundbite \
- rosetta \
+ ${@base_contains("MACHINE_FEATURES", "touchscreen", "rosetta", "",d)} \
gpe-scap \
gpe-windowlist"