image.bbclass: Separate out image generation into a new task, do_image

index d2f8105..bee7d63 100644
@@ -334,7 +334,6 @@ do_rootfs[prefuncs] += "rootfs_runtime_mapping"
 
 fakeroot python do_rootfs () {
     from oe.rootfs import create_rootfs
-    from oe.image import create_image
     from oe.manifest import create_manifest
 
     # generate the initial manifest

@@ -342,11 +341,20 @@ fakeroot python do_rootfs () {
 
     # generate rootfs
     create_rootfs(d)
+}
+
+fakeroot python do_image () {
+    from oe.image import create_image
 
     # generate final images
     create_image(d)
 }
 
+do_images[dirs] = "${TOPDIR}"
+do_image[lockfiles] += "${IMAGE_ROOTFS}.lock"
+do_image[umask] = "022"
+addtask do_image after do_rootfs before do_build
+
 insert_feed_uris () {
 	
 	echo "Building feeds for [${DISTRO}].."