4 files changed, 68 insertions, 16 deletions

diff --git a/openembedded/packages/meta/oh-image-devel.bb b/openembedded/packages/meta/oh-image-devel.bb
index 3adfae7282..e728677fcd 100644
--- a/openembedded/packages/meta/oh-image-devel.bb
+++ b/openembedded/packages/meta/oh-image-devel.bb
@@ -11,8 +11,10 @@ DEPENDS = "\
     task-oh"
     
 RDEPENDS = "\
-    task-bootstrap \
+    task-oh-boot \
+    task-oh-boot-extras \
     task-oh-base \
+    task-oh-standard \
     task-oh-devel \
     ${XSERVER} "
 
diff --git a/openembedded/packages/meta/oh-image-minimal.bb b/openembedded/packages/meta/oh-image-minimal.bb
new file mode 100644
index 0000000000..b1e2050a1c
--- /dev/null
+++ b/openembedded/packages/meta/oh-image-minimal.bb
@@ -0,0 +1,21 @@
+PR = "r0"
+
+export IMAGE_BASENAME = "oh-image-minimal"
+
+GUI_MACHINE_CLASS ?= "none"
+
+XSERVER ?= "xserver-kdrive-fbdev"
+
+DEPENDS = "task-oh"
+    
+RDEPENDS = "\
+    task-oh-boot \
+    task-oh-boot-min-extras \
+    task-oh-base \
+    ${XSERVER} "
+
+export IPKG_INSTALL = "${RDEPENDS}"
+#ROOTFS_POSTPROCESS_COMMAND += "zap_root_password; "
+
+inherit image_ipk
+LICENSE = MIT
diff --git a/openembedded/packages/meta/oh-image.bb b/openembedded/packages/meta/oh-image.bb
index 6c0b3c7d64..7750eeb6f8 100644
--- a/openembedded/packages/meta/oh-image.bb
+++ b/openembedded/packages/meta/oh-image.bb
@@ -1,4 +1,4 @@
-PR = "r9"
+PR = "r10"
 
 export IMAGE_BASENAME = "oh-image"
 
@@ -6,13 +6,13 @@ GUI_MACHINE_CLASS ?= "none"
 
 XSERVER ?= "xserver-kdrive-fbdev"
 
-DEPENDS = "\
-    task-bootstrap \
-    task-oh"
+DEPENDS = "task-oh"
     
 RDEPENDS = "\
-    task-bootstrap \
+    task-oh-boot \
+    task-oh-boot-extras \
     task-oh-base \
+    task-oh-standard \
     ${XSERVER} "
 
 export IPKG_INSTALL = "${RDEPENDS}"
diff --git a/openembedded/packages/meta/task-oh.bb b/openembedded/packages/meta/task-oh.bb
index 9840e8d361..7d3dd42481 100644
--- a/openembedded/packages/meta/task-oh.bb
+++ b/openembedded/packages/meta/task-oh.bb
@@ -1,12 +1,48 @@
-PACKAGES = "task-oh-base task-oh-devel"
+PACKAGES = "task-oh-base task-oh-devel task-oh-boot task-oh-standard task-oh-boot-extras task-oh-boot-min-extras"
 DESCRIPTION = "Tasks for OpenedHand Poky"
 MAINTAINER = "Richard Purdie <richard@openedhand.com>"
-PR = "r24"
+PR = "r27"
 
 ALLOW_EMPTY = "1"
 
+RDEPENDS_task-oh-boot := "\
+    base-files \
+    base-passwd \
+    busybox \
+    initscripts \
+    netbase \
+    sysvinit \
+    sysvinit-pidof \
+    tinylogin \
+    modutils-initscripts \
+    fuser \
+    setserial \
+    linux-hotplug \
+    module-init-tools-depmod"
+
+RDEPENDS_task-oh-boot-extras := "\
+    ${BOOTSTRAP_EXTRA_RDEPENDS}"
+
+RDEPENDS_task-oh-boot-min-extras := "\
+    kernel \
+    udev \
+    sysfsutils \
+    ${PCMCIA_MANAGER} \
+    apm \
+    udev-utils"
+
 RDEPENDS_task-oh-base := "\
     matchbox \
+    xserver-kdrive-common \
+    xserver-nodm-init \
+    udev \
+    sysfsutils \
+    leafpad \
+    gtk+ "
+
+RDEPENDS_task-oh-standard := "\
+    dropbear \
+    portmap \
     matchbox-poky \
     matchbox-keyboard \
     matchbox-stroke \
@@ -18,26 +54,20 @@ RDEPENDS_task-oh-base := "\
     matchbox-applet-inputmanager \
     matchbox-applet-startup-monitor \
     xcursor-transparent-theme \
-    xserver-kdrive-common \
-    xserver-nodm-init \
-    chkhinge26 \
+    zaurusd \
     usbinit \
     settings-daemon \
-    gtk+ \
     gtk-clearlooks-engine \
     eds-dbus \
     contacts \
     dates \
     web \
     pcmanfm \
-    leafpad \
     puzzles \
     kf \
     rxvt-unicode \
     xhost \
     ttf-bitstream-vera \
-    udev \
-    sysfsutils \
     xauth \
     avahi-daemon \
     gdk-pixbuf-loader-png \
@@ -72,4 +102,3 @@ RRECOMMENDS_task-oh-devel := "\
 #    lttng-modules
 
 
-LICENSE = "MIT"