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

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 4afba226881ab8841cd2e4c866dc0580bea57597..b62774205e3b9fd3f7247094fb4f77397bbc1ce5 100644 (file)
--- 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 6c5b9a974c6f72c7802203e713e1811e881cb6ea..fc2a3e0906609eb4bfd43e1c7d807508606ef117 100644 (file)
--- 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"