From: Paul Eggleton Date: Tue, 1 Jan 2008 22:59:25 +0000 (+0000) Subject: task-opie*: "apm" is MACHINE_FEATURE, not COMBINED. X-Git-Tag: Release-2010-05/1~8051 X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e3c141ea4201fdd6109eddfff23a0f825cd18469;p=openembedded.git task-opie*: "apm" is MACHINE_FEATURE, not COMBINED. * Fixes #3154. --- diff --git a/packages/tasks/task-opie-16mb.bb b/packages/tasks/task-opie-16mb.bb index 9d8295d0ca..b92a137822 100644 --- a/packages/tasks/task-opie-16mb.bb +++ b/packages/tasks/task-opie-16mb.bb @@ -28,7 +28,7 @@ RDEPENDS_task-opie-16mb-applets = "opie-aboutapplet opie-clockapplet opie-suspen 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)}" diff --git a/packages/tasks/task-opie.bb b/packages/tasks/task-opie.bb index 0f7285236e..05b507706b 100644 --- a/packages/tasks/task-opie.bb +++ b/packages/tasks/task-opie.bb @@ -43,7 +43,7 @@ RDEPENDS_task-opie-base-applets = "opie-aboutapplet opie-clockapplet opie-suspen 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)}"