[oe-commits] org.oe.dev task-angstrom-x11: exploit *_FEATURES a bit more

[koen commit]

task-angstrom-x11: exploit *_FEATURES a bit more

Author: koen at openembedded.org
Branch: org.openembedded.dev
Revision: 1b0bce82739ca8ced95d2176c9fcffa61ffb1eed
ViewMTN: http://monotone.openembedded.org/revision.psp?id=1b0bce82739ca8ced95d2176c9fcffa61ffb1eed
Files:
1
packages/angstrom/task-angstrom-x11.bb
Diffs:

#
# mt diff -r0c0a39213297816fe747a929eb567dc73566b81e -r1b0bce82739ca8ced95d2176c9fcffa61ffb1eed
#
# 
# 
# patch "packages/angstrom/task-angstrom-x11.bb"
#  from [d7c6cffaf4c92ae2873dd6f1a91dce23c2dc7445]
#    to [dce8e430bd839833e543ff85e2b0055f1073478f]
# 
============================================================
--- packages/angstrom/task-angstrom-x11.bb	d7c6cffaf4c92ae2873dd6f1a91dce23c2dc7445
+++ packages/angstrom/task-angstrom-x11.bb	dce8e430bd839833e543ff85e2b0055f1073478f
@@ -1,5 +1,5 @@ DESCRIPTION = "Task packages for the Ang
 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"