summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKhem Raj <raj.khem@gmail.com>2014-02-18 00:33:29 (GMT)
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-02-18 08:38:52 (GMT)
commit54562006c1327c5b99daa4cc05a3ba7e38412da1 (patch)
treeaf95dfc649e1badb49c519ea786a5abec16cb9bd
parent3f9334b89fe2e8b55e9a5a9de99f33dd28d93c4a (diff)
downloadpoky-54562006c1327c5b99daa4cc05a3ba7e38412da1.tar.gz
image_types.bbclass: Fix tar IMAGE_CMD to not change directories1.6_M3.final1.6_M3
below commit commit 9d9bca8785911e8ae06d507bbfb99d6a811f072e Author: Jonathan Liu <net147@gmail.com> Date: Mon Feb 17 21:46:28 2014 +1100 lib/oe/image.py: fix working directory The working directory needs to be changed before the image creation commands instead of afterwards. exposed an issue when generating tar images, where it would cd into rootfs and then create the rootfs tarball and remain there since the cmd to cd into deploy dir moved up the immediate following cmd like tar.bz2 or tar.gz were still looking for tarball in current directory which esentially was not deploy dir but IMAGE_ROOTFS instead (From OE-Core rev: 9a98b8bfe13b94d89a9e39cca821f26fdeaeffc3) Signed-off-by: Khem Raj <raj.khem@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/classes/image_types.bbclass2
1 files changed, 1 insertions, 1 deletions
diff --git a/meta/classes/image_types.bbclass b/meta/classes/image_types.bbclass
index 0467abd..944e6db 100644
--- a/meta/classes/image_types.bbclass
+++ b/meta/classes/image_types.bbclass
@@ -64,7 +64,7 @@ IMAGE_CMD_btrfs () {
64 64
65IMAGE_CMD_squashfs = "mksquashfs ${IMAGE_ROOTFS} ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.squashfs ${EXTRA_IMAGECMD} -noappend" 65IMAGE_CMD_squashfs = "mksquashfs ${IMAGE_ROOTFS} ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.squashfs ${EXTRA_IMAGECMD} -noappend"
66IMAGE_CMD_squashfs-xz = "mksquashfs ${IMAGE_ROOTFS} ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.squashfs-xz ${EXTRA_IMAGECMD} -noappend -comp xz" 66IMAGE_CMD_squashfs-xz = "mksquashfs ${IMAGE_ROOTFS} ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.squashfs-xz ${EXTRA_IMAGECMD} -noappend -comp xz"
67IMAGE_CMD_tar = "cd ${IMAGE_ROOTFS} && tar -cvf ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.tar ." 67IMAGE_CMD_tar = "tar -cvf ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.tar -C ${IMAGE_ROOTFS} ."
68 68
69CPIO_TOUCH_INIT () { 69CPIO_TOUCH_INIT () {
70 if [ ! -L ${IMAGE_ROOTFS}/init ] 70 if [ ! -L ${IMAGE_ROOTFS}/init ]