Revert "lib/oe/image.py: fix working directory"

This reverts commit 3f49597225a58965124503ca5f3cc4011b04b3c0.

This change appears to cause more problems than it fixes since the
compression commands usually work in the deploy dir but the archive ones
have always worked in the rootfs dir (which is clear from the tar command
we use).

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

diff --git a/meta/lib/oe/image.py b/meta/lib/oe/image.py
index 31193f2..c15296f 100644 (file)
--- a/meta/lib/oe/image.py
+++ b/meta/lib/oe/image.py
@@ -176,8 +176,8 @@ class Image(object):
             bb.data.update_data(localdata)
             localdata.setVar('type', type)
 
-            cmds.append(localdata.expand("\tcd ${DEPLOY_DIR_IMAGE}"))
             cmds.append("\t" + localdata.getVar("IMAGE_CMD", True))
+            cmds.append(localdata.expand("\tcd ${DEPLOY_DIR_IMAGE}"))
 
             if type in cimages:
                 for ctype in cimages[type]: