]> code.ossystems Code Review - openembedded-core.git/commitdiff
image_types.bbclass: fix cpio IMAGE_CMD to preserve working directory
authorJonathan Liu <net147@gmail.com>
Fri, 21 Feb 2014 04:43:38 +0000 (15:43 +1100)
committerRichard Purdie <richard.purdie@linuxfoundation.org>
Fri, 21 Feb 2014 16:14:39 +0000 (16:14 +0000)
The working directory is changed in a subshell when executing cpio to
preserve the working directory for any subsequent commands. This is to
keep the working directory consistent when generating multiple image
types.

Signed-off-by: Jonathan Liu <net147@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
meta/classes/image_types.bbclass

index 9577b1f2ecea45753939ca8549ad67a0a1b69ced..602c1f046ff6477cefa2872510fb5c0063c3ca29 100644 (file)
@@ -70,7 +70,7 @@ IMAGE_CMD_cpio () {
        if [ ! -L ${IMAGE_ROOTFS}/init ]; then
                touch ${IMAGE_ROOTFS}/init
        fi
-       cd ${IMAGE_ROOTFS} && (find . | cpio -o -H newc >${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.cpio)
+       (cd ${IMAGE_ROOTFS} && find . | cpio -o -H newc >${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.cpio)
 }
 
 ELF_KERNEL ?= "${STAGING_DIR_HOST}/usr/src/kernel/${KERNEL_IMAGETYPE}"