[oe-commits] org.oe.dev task-opie: switched to task-base style

[hrw commit]

task-opie: switched to task-base style

Author: hrw at openembedded.org
Branch: org.openembedded.dev
Revision: 95d8882549c61d28fd1ccd1223c761df50dfcebb
ViewMTN: http://monotone.openembedded.org/revision.psp?id=95d8882549c61d28fd1ccd1223c761df50dfcebb
Files:
1
packages/tasks/task-opie.bb
Diffs:

#
# mt diff -r64360d71d8ed0333123a75d4180afac28494d77f -r95d8882549c61d28fd1ccd1223c761df50dfcebb
#
# 
# 
# patch "packages/tasks/task-opie.bb"
#  from [22488131c6456d5e88fb77c1454006f500766f19]
#    to [654dc19e4ad4e0a15409125ff7059e5cec74fd26]
# 
============================================================
--- packages/tasks/task-opie.bb	22488131c6456d5e88fb77c1454006f500766f19
+++ packages/tasks/task-opie.bb	654dc19e4ad4e0a15409125ff7059e5cec74fd26
@@ -1,11 +1,11 @@ SECTION = "opie/base"
 DESCRIPTION = "Tasks for OPIE stuff"
 SECTION = "opie/base"
+PACKAGE_ARCH = "${MACHINE_ARCH}"
 ALLOW_EMPTY = "1"
-PACKAGE_ARCH = "all"
 LICENSE = "MIT"
 PROVIDES = "task-opie-everything"
 
-PR = "r3"
+PR = "r4"
 
 PACKAGES = "task-opie-applets task-opie-apps task-opie-base \
             task-opie-base-applets task-opie-base-apps \
@@ -35,18 +35,15 @@ RDEPENDS_task-opie-base-applets = "opie-
 # things for reasonable bootstrap image
 #
 RDEPENDS_task-opie-base-applets = "opie-aboutapplet opie-clockapplet opie-suspendapplet \
-                          opie-homeapplet opie-rotateapplet \
-                          opie-irdaapplet opie-brightnessapplet opie-batteryapplet \
-                          opie-pcmciaapplet opie-volumeapplet \
-                          opie-screenshotapplet"
+                                   opie-homeapplet opie-rotateapplet \
+		   opie-brightnessapplet opie-volumeapplet \
+                                   opie-screenshotapplet \
+    ${@base_contains("COMBINED_FEATURES", "irda", "opie-irdaapplet", "",d)} \
+    ${@base_contains("COMBINED_FEATURES", "apm", "opie-batteryapplet", "",d)} \
+    ${@base_contains("COMBINED_FEATURES", "pcmcia", "opie-pcmciaapplet", "",d)} \
+    ${@base_contains("MACHINE_FEATURES", "keyboard", "opie-vtapplet opie-logoutapplet", "",d)}"
 
 #
-# keyboard models can benefit from the vt and logout applets
-#
-RDEPENDS_task-opie-base-applets_append_openzaurus = " opie-vtapplet opie-logoutapplet"
-RDEPENDS_task-opie-base-applets_append_mnci       = " opie-vtapplet opie-logoutapplet"
-
-#
 # clamshell models can benefit from the autorotate applet
 #
 RDEPENDS_task-opie-base-applets_append_c7x0   = " opie-autorotateapplet"
@@ -67,7 +64,9 @@ RDEPENDS_task-opie-extra-settings = "opi
 # That settings can be removed and device will be still usable
 #
 RDEPENDS_task-opie-extra-settings = "opie-language opie-doctab opie-mediummount \
-                            opie-networksettings-wlanplugin opie-networksettings-pppplugin"
+    ${@base_contains("DISTRO_FEATURES", "wifi", "opie-networksettings-wlanplugin", "",d)} \
+    ${@base_contains("DISTRO_FEATURES", "ppp", "opie-networksettings-pppplugin", "",d)} \
+			    "
 
 RDEPENDS_task-opie-base-decorations = "opie-deco-flat opie-deco-liquid opie-deco-polished"