]> code.ossystems Code Review - openembedded-core.git/commitdiff
image_types.bbclass: Fix tar IMAGE_CMD to not change directories
authorKhem Raj <raj.khem@gmail.com>
Tue, 18 Feb 2014 00:33:29 +0000 (16:33 -0800)
committerRichard Purdie <richard.purdie@linuxfoundation.org>
Tue, 18 Feb 2014 08:37:03 +0000 (08:37 +0000)
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

Signed-off-by: Khem Raj <raj.khem@gmail.com>
meta/classes/image_types.bbclass

index 0467abdec2cc392fbde2405c1afa87f11c7f0845..944e6dbf2d31491da5156710f1bff3c8b95fe3cb 100644 (file)
@@ -64,7 +64,7 @@ IMAGE_CMD_btrfs () {
 
 IMAGE_CMD_squashfs = "mksquashfs ${IMAGE_ROOTFS} ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.squashfs ${EXTRA_IMAGECMD} -noappend"
 IMAGE_CMD_squashfs-xz = "mksquashfs ${IMAGE_ROOTFS} ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.squashfs-xz ${EXTRA_IMAGECMD} -noappend -comp xz"
-IMAGE_CMD_tar = "cd ${IMAGE_ROOTFS} && tar -cvf ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.tar ."
+IMAGE_CMD_tar = "tar -cvf ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.tar -C ${IMAGE_ROOTFS} ."
 
 CPIO_TOUCH_INIT () {
        if [ ! -L ${IMAGE_ROOTFS}/init ]