[oe-commits] org.oe.dev task-opie*: "apm" is MACHINE_FEATURE, not COMBINED.

[Paul commit]

task-opie*: "apm" is MACHINE_FEATURE, not COMBINED.
* Fixes #3154.

Author: Paul
Branch: org.openembedded.dev
Revision: 560f1294e1ef2699d2b80c98d99386c3030b8c0b
ViewMTN: http://monotone.openembedded.org/revision/info/560f1294e1ef2699d2b80c98d99386c3030b8c0b
Files:
1
packages/tasks/task-opie-16mb.bb
packages/tasks/task-opie.bb
Diffs:

#
# mt diff -r7c47cd537d8cebaa3111aa836db24534a39b5ed9 -r560f1294e1ef2699d2b80c98d99386c3030b8c0b
#
# 
# 
# patch "packages/tasks/task-opie-16mb.bb"
#  from [df6931443e66881e8339197be66f4bff2056aeb5]
#    to [17a97e85093fb7c7aaba5ea5de08086d633dc185]
# 
# patch "packages/tasks/task-opie.bb"
#  from [33f680faf713d2b125f51eb210a4b761bb5784c2]
#    to [78fbe261fe8ace945600c95b91627808e02cef52]
# 
============================================================
--- packages/tasks/task-opie-16mb.bb	df6931443e66881e8339197be66f4bff2056aeb5
+++ packages/tasks/task-opie-16mb.bb	17a97e85093fb7c7aaba5ea5de08086d633dc185
@@ -28,7 +28,7 @@ RDEPENDS_task-opie-16mb-applets = "opie-
 		                   opie-brightnessapplet opie-volumeapplet \
                                    opie-screenshotapplet \
     ${@base_contains("COMBINED_FEATURES", "irda", "opie-irdaapplet", "",d)} \
-    ${@base_contains("COMBINED_FEATURES", "apm", "opie-batteryapplet", "",d)} \
+    ${@base_contains("MACHINE_FEATURES", "apm", "opie-batteryapplet", "",d)} \
     ${@base_contains("COMBINED_FEATURES", "pcmcia", "opie-pcmciaapplet", "",d)} \
     ${@base_contains("MACHINE_FEATURES", "keyboard", "opie-vtapplet opie-logoutapplet", "",d)}"
 
============================================================
--- packages/tasks/task-opie.bb	33f680faf713d2b125f51eb210a4b761bb5784c2
+++ packages/tasks/task-opie.bb	78fbe261fe8ace945600c95b91627808e02cef52
@@ -43,7 +43,7 @@ RDEPENDS_task-opie-base-applets = "opie-
 		                   opie-brightnessapplet opie-volumeapplet \
                                    opie-screenshotapplet \
     ${@base_contains("COMBINED_FEATURES", "irda", "opie-irdaapplet", "",d)} \
-    ${@base_contains("COMBINED_FEATURES", "apm", "opie-batteryapplet", "",d)} \
+    ${@base_contains("MACHINE_FEATURES", "apm", "opie-batteryapplet", "",d)} \
     ${@base_contains("COMBINED_FEATURES", "pcmcia", "opie-pcmciaapplet", "",d)} \
     ${@base_contains("MACHINE_FEATURES", "keyboard", "opie-vtapplet opie-logoutapplet", "",d)}"