Merge branch 'org.openembedded.dev' of git.openembedded.org:openembedded into org.openembedded.dev

6 files changed, 17 insertions, 10 deletions

diff --git a/recipes/tasks/task-base.bb b/recipes/tasks/task-base.bb
index ed561b802e..d59acba026 100644
--- a/recipes/tasks/task-base.bb
+++ b/recipes/tasks/task-base.bb
@@ -1,5 +1,5 @@
 DESCRIPTION = "Merge machine and distro options to create a basic machine task/package"
-PR = "r86"
+PR = "r87"
 
 inherit task
 
@@ -60,6 +60,9 @@ HOTPLUG ?= "${@base_contains("MACHINE_FEATURES", "kernel24",  "linux-hotplug",""
 #
 DISTRO_SSH_DAEMON ?= "dropbear"
 
+# Distro can override apm provider
+DISTRO_APM ?= "apm"
+
 #
 # bluetooth manager
 #
@@ -190,7 +193,7 @@ RDEPENDS_task-base-acpi = "\
     acpid"
 
 RDEPENDS_task-base-apm = "\
-    apm \
+    ${DISTRO_APM} \
     apmd \
     ${@base_contains('MACHINE_FEATURES', 'kernel24', 'network-suspend-scripts', '',d)}"
 
diff --git a/recipes/tasks/task-beagleboard-demo.bb b/recipes/tasks/task-beagleboard-demo.bb
index ca26baaaff..f9867afeea 100644
--- a/recipes/tasks/task-beagleboard-demo.bb
+++ b/recipes/tasks/task-beagleboard-demo.bb
@@ -5,6 +5,7 @@ PR = "r15"
 inherit task 
 
 ECONFIG ?= "places e-wm-config-angstrom e-wm-config-angstrom-touchscreen e-wm-config-angstrom-widescreen e-wm-config-default"
+EMENU ?= "e-wm-menu"
 
 RDEPENDS_${PN} = "\
     task-proper-tools \
@@ -15,7 +16,7 @@ RDEPENDS_${PN} = "\
     angstrom-zeroconf-audio \
     angstrom-led-config \ 
     gpe-scap \
-    mime-support e-wm ${ECONFIG} \
+    mime-support e-wm ${ECONFIG} ${EMENU} \
     xterm xmms \
     firefox midori \
     gecko-mediaplayer-firefox-hack \
diff --git a/recipes/tasks/task-boot.bb b/recipes/tasks/task-boot.bb
index 0ce9ee4415..04c55357a8 100644
--- a/recipes/tasks/task-boot.bb
+++ b/recipes/tasks/task-boot.bb
@@ -1,5 +1,5 @@
 DESCRIPTION = "Basic task to get a device booting"
-PR = "r50"
+PR = "r51"
 
 inherit task
 
diff --git a/recipes/tasks/task-shr-feed.bb b/recipes/tasks/task-shr-feed.bb
index 17787d926f..328a422064 100644
--- a/recipes/tasks/task-shr-feed.bb
+++ b/recipes/tasks/task-shr-feed.bb
@@ -1,5 +1,5 @@
 DESCRIPTION = "SHR Feed"
-PR = "r26"
+PR = "r28"
 PV = "1.0"
 LICENSE = "GPL"
 
@@ -211,7 +211,6 @@ RDEPENDS_${PN} += "\
 		elmdentica \
 		shr-installer \
 		eject \
-		illume-keyboard-german \
 		illume-keyboard-arabic \
 		illume-keyboard-browse \
 		illume-keyboard-danish \
@@ -219,10 +218,11 @@ RDEPENDS_${PN} += "\
 		illume-keyboard-dutch \
 		illume-keyboard-dvorak \
 		illume-keyboard-french \
+		illume-keyboard-german \
 		illume-keyboard-hebrew \
 		illume-keyboard-numeric-alt \
-		illume-keyboard-russian-terminal \
 		illume-keyboard-russian \
+		illume-keyboard-russian-terminal \
 		python-xlib \
 		xcompmgr \
 		man \
@@ -253,6 +253,8 @@ RDEPENDS_${PN} += "\
 		transmission \
 		xf86-input-tslib \
 		fltkcocktailbar \
+		fltkcurrency \
+		mokoeightball \
 		babiloo-efl \
 		make \
 "
diff --git a/recipes/tasks/task-shr-minimal.bb b/recipes/tasks/task-shr-minimal.bb
index 1507ded9da..caf2597ae0 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 = "r17"
+PR = "r18"
 PV = "2.0"
 LICENSE = "GPL"
 
@@ -115,6 +115,7 @@ RDEPENDS_${PN}-x = "\
   glibc-utils \
   glibc-charmap-utf-8 \
   e-wm-menu-shr \
+  shr-wizard \
   shr-theme-gry \
   etk-theme-shr \
   ${@get_rdepends(bb, d)} \
diff --git a/recipes/tasks/task-slugos.bb b/recipes/tasks/task-slugos.bb
index 35b0f8382e..8ed43b1983 100644
--- a/recipes/tasks/task-slugos.bb
+++ b/recipes/tasks/task-slugos.bb
@@ -6,7 +6,7 @@
 DESCRIPTION = "Task packages for the SlugOS distribution"
 HOMEPAGE = "http://www.nslu2-linux.org"
 LICENSE = "MIT"
-PR = "r23"
+PR = "r24"
 PACKAGE_ARCH = "${MACHINE_ARCH}"
 COMPATIBLE_MACHINE = "(nslu2|ixp4xx|sheevaplug)"
 ALLOW_EMPTY = "1"
@@ -129,7 +129,7 @@ RDEPENDS += "\
         busybox initscripts-slugos slugos-init \
         update-modules sysvinit udev \
 	module-init-tools modutils-initscripts \
-        opkg-collateral opkg-nogpg-nocurl \
+        opkg-collateral ${IPKG_VARIANT} \
 	libgcc \
 	beep \
 	util-linux-mount \