From: Thomas Zimmermann <ml@vdm-design.de>
Date: Fri, 20 Nov 2009 12:35:16 +0000 (+0000)
Subject: om-gta0{1, 2}.conf task-shr-minimal: remove apm from machine features and add fso... 
X-Git-Tag: Release-2010-05/1~1648^2~75
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1bfa409a3a28cee60c4800d3caf33ce3f100d4ca;p=openembedded.git

om-gta0{1, 2}.conf task-shr-minimal: remove apm from machine features and add fso-apm to task-shr-minimal-base
---

diff --git a/conf/machine/om-gta01.conf b/conf/machine/om-gta01.conf
index 5bdeba01f3..501d97968b 100644
--- a/conf/machine/om-gta01.conf
+++ b/conf/machine/om-gta01.conf
@@ -19,7 +19,7 @@ UBOOT_ENTRYPOINT = "30008000"
 
 OLDEST_KERNEL_linux-gnueabi = "2.6.24"
 
-MACHINE_FEATURES = "kernel26 apm alsa bluetooth gps usbgadget usbhost phone vfat ext2"
+MACHINE_FEATURES = "kernel26 alsa bluetooth gps usbgadget usbhost phone vfat ext2"
 MACHINE_DISPLAY_WIDTH_PIXELS = "480"
 MACHINE_DISPLAY_HEIGHT_PIXELS = "640"
 MACHINE_DISPLAY_ORIENTATION = "0"
diff --git a/conf/machine/om-gta02.conf b/conf/machine/om-gta02.conf
index d47320e59d..48e8119000 100644
--- a/conf/machine/om-gta02.conf
+++ b/conf/machine/om-gta02.conf
@@ -24,7 +24,7 @@ UBOOT_ENTRYPOINT = "30008000"
 
 OLDEST_KERNEL_linux-gnueabi = "2.6.24"
 
-MACHINE_FEATURES = "kernel26 apm alsa bluetooth gps usbgadget usbhost phone wifi vfat ext2"
+MACHINE_FEATURES = "kernel26 alsa bluetooth gps usbgadget usbhost phone wifi vfat ext2"
 MACHINE_DISPLAY_WIDTH_PIXELS = "480"
 MACHINE_DISPLAY_HEIGHT_PIXELS = "640"
 MACHINE_DISPLAY_ORIENTATION = "0"
diff --git a/recipes/tasks/task-shr-minimal.bb b/recipes/tasks/task-shr-minimal.bb
index e5f95b3801..1ddd23dbbf 100644
--- a/recipes/tasks/task-shr-minimal.bb
+++ b/recipes/tasks/task-shr-minimal.bb
@@ -1,5 +1,5 @@
 DESCRIPTION = "SHR Lite Image Feed"
-PR = "r16"
+PR = "r17"
 PV = "2.0"
 LICENSE = "GPL"
 
@@ -76,6 +76,7 @@ RDEPENDS_${PN}-base = "\
   logrotate\
   util-linux-ng-fdisk \
   shr-splash \
+  fso-apm \
 "
 
 RDEPENDS_${PN}-cli = "\