3 files changed, 28 insertions, 50 deletions

diff --git a/openembedded/packages/meta/oh-image.bb b/openembedded/packages/meta/oh-image.bb
index c4a0f84571..6c0b3c7d64 100644
--- a/openembedded/packages/meta/oh-image.bb
+++ b/openembedded/packages/meta/oh-image.bb
@@ -1,4 +1,4 @@
-PR = "r8"
+PR = "r9"
 
 export IMAGE_BASENAME = "oh-image"
 
@@ -6,13 +6,16 @@ GUI_MACHINE_CLASS ?= "none"
 
 XSERVER ?= "xserver-kdrive-fbdev"
 
-DEPENDS = "task-bootstrap \
-           meta-oh"
-
-export IPKG_INSTALL = "task-bootstrap \
-                       oh-task-base \
-                       ${XSERVER} "
+DEPENDS = "\
+    task-bootstrap \
+    task-oh"
+    
+RDEPENDS = "\
+    task-bootstrap \
+    task-oh-base \
+    ${XSERVER} "
 
+export IPKG_INSTALL = "${RDEPENDS}"
 #ROOTFS_POSTPROCESS_COMMAND += "zap_root_password; "
 
 inherit image_ipk
diff --git a/openembedded/packages/meta/task-bootstrap.bb b/openembedded/packages/meta/task-bootstrap.bb
index 31920135d4..ef76ec4345 100644
--- a/openembedded/packages/meta/task-bootstrap.bb
+++ b/openembedded/packages/meta/task-bootstrap.bb
@@ -11,16 +11,6 @@ PACKAGES = "${PN}"
 
 MODUTILS ?= "24 26"
 
-def bootstrap_modutils_depends(d):
-        import bb
-        m = bb.data.getVar('MODUTILS', d, 1)
-        r = []
-        if '24' in m:
-                r.append('modutils')
-        if '26' in m:
-                r.append('module-init-tools')
-        return ' '.join(r)
-
 def bootstrap_modutils_rdepends(d):
         import bb
         m = bb.data.getVar('MODUTILS', d, 1)
@@ -33,14 +23,6 @@ def bootstrap_modutils_rdepends(d):
 
 HOTPLUG ?= "linux-hotplug"
 
-DEPENDS = 'base-files base-passwd-3.5.9 \
-        busybox dropbear initscripts modutils netbase \
-        sysvinit tinylogin portmap psmisc setserial\
-        modutils-initscripts \
-        ${HOTPLUG} \
-        ${BOOTSTRAP_EXTRA_DEPENDS} \
-        ${@bootstrap_modutils_depends(d)}'
-
 RDEPENDS = 'base-files base-passwd busybox \
         initscripts \
         netbase sysvinit sysvinit-pidof tinylogin \
diff --git a/openembedded/packages/meta/meta-oh.bb b/openembedded/packages/meta/task-oh.bb
index aaa08682b6..4a302c82a1 100644
--- a/openembedded/packages/meta/meta-oh.bb
+++ b/openembedded/packages/meta/task-oh.bb
@@ -1,19 +1,15 @@
-PACKAGES = "oh-base-depends oh-task-base"
-# oh-task-base
-DESCRIPTION = "Meta-package for OpenedHand Palmtop Environment"
+PACKAGES = "task-oh-base-depends task-oh-base"
+DESCRIPTION = "Tasks for OpenedHand Poky"
 MAINTAINER = "Richard Purdie <richard@openedhand.com>"
-PR = "r19"
+PR = "r20"
 
 ALLOW_EMPTY = "1"
 
-oh-base-depends = "\
+RDEPENDS_task-oh-base-depends := "\
     diet-x11 \
     virtual/xserver"
 
-RDEPENDS_oh-base-depends := "${oh-base-depends}"
-DEPENDS += " ${oh-base-depends}"
-
-oh-task-base = "\
+RDEPENDS_task-oh-base := "\
     matchbox \
     matchbox-poky \
     matchbox-keyboard \
@@ -35,19 +31,30 @@ oh-task-base = "\
     gtk-clearlooks-engine \
     eds-dbus \
     contacts \
-#    oprofile \
     dates \
     leafpad \
     puzzles \
     kf \
     rxvt-unicode \
     xhost \
+#    oprofile \
 #    gdb \    
     strace \
     ttf-bitstream-vera \
     udev \
     sysfsutils \
-    xauth"
+    xauth \
+    avahi-daemon \
+    gdk-pixbuf-loader-png \
+    gdk-pixbuf-loader-xpm \
+    gdk-pixbuf-loader-jpeg \
+    gtk-theme-clearlooks \
+    kernel-module-oprofile \
+    tslib-calibrate \
+    tslib-tests \
+    pango-module-basic-x \
+    pango-module-basic-fc"
+
 
 #    minimo \
 #    teleport \
@@ -56,18 +63,4 @@ oh-task-base = "\
 #    detect-stylus \
 #    xrdb \
 
-RDEPENDS_oh-task-base := "${oh-task-base} \
-                          avahi-daemon \
-                          gdk-pixbuf-loader-png \
-                          gdk-pixbuf-loader-xpm \
-                          gdk-pixbuf-loader-jpeg \
-                          gtk-theme-clearlooks \
-                          kernel-module-oprofile \
-                          tslib-calibrate \
-                          tslib-tests \
-                          pango-module-basic-x \
-                          pango-module-basic-fc"
-
-DEPENDS += " ${oh-task-base} avahi tslib"
-
 LICENSE = "MIT"