From 23e50d487da3e92df18a325a92d787f834a44570 Mon Sep 17 00:00:00 2001
From: Richard Purdie <richard@openedhand.com>
Date: Wed, 29 Nov 2006 09:47:05 +0000
Subject: [PATCH] poky-extras: Update extras task and image with recent poky
 changes

git-svn-id: https://svn.o-hand.com/repos/poky/trunk@968 311d38ba-8fff-0310-9ca6-ca027cbcb966
---
 meta-extras/packages/{meta => images}/oh-image-extras.bb | 3 ++-
 meta-extras/packages/{meta => tasks}/task-oh-extras.bb   | 1 +
 2 files changed, 3 insertions(+), 1 deletion(-)
 rename meta-extras/packages/{meta => images}/oh-image-extras.bb (88%)
 rename meta-extras/packages/{meta => tasks}/task-oh-extras.bb (88%)

diff --git a/meta-extras/packages/meta/oh-image-extras.bb b/meta-extras/packages/images/oh-image-extras.bb
similarity index 88%
rename from meta-extras/packages/meta/oh-image-extras.bb
rename to meta-extras/packages/images/oh-image-extras.bb
index 4afba22688..b62774205e 100644
--- a/meta-extras/packages/meta/oh-image-extras.bb
+++ b/meta-extras/packages/images/oh-image-extras.bb
@@ -11,6 +11,7 @@ DEPENDS = "\
     task-oh-extras"
     
 RDEPENDS = "\
+    task-base \
     task-oh-boot \
     task-oh-boot-extras \
     task-oh-base \
@@ -20,7 +21,7 @@ RDEPENDS = "\
     task-oh-extraapps \
     ${XSERVER} "
 
-export IPKG_INSTALL = "${RDEPENDS}"
+export PACKAGE_INSTALL = "${RDEPENDS}"
 #ROOTFS_POSTPROCESS_COMMAND += "zap_root_password; "
 
 inherit image
diff --git a/meta-extras/packages/meta/task-oh-extras.bb b/meta-extras/packages/tasks/task-oh-extras.bb
similarity index 88%
rename from meta-extras/packages/meta/task-oh-extras.bb
rename to meta-extras/packages/tasks/task-oh-extras.bb
index 6c5b9a974c..fc2a3e0906 100644
--- a/meta-extras/packages/meta/task-oh-extras.bb
+++ b/meta-extras/packages/tasks/task-oh-extras.bb
@@ -7,4 +7,5 @@ ALLOW_EMPTY = "1"
 
 RDEPENDS_task-oh-extraapps = "\
     madplay \
+    maemo-mapper-nohildon \
     mc"
-- 
2.40.1