From 8d7dd9ae471ad6154cd4e59152560ff5f24b3c2a Mon Sep 17 00:00:00 2001 From: Jonathan Liu Date: Fri, 21 Feb 2014 15:43:38 +1100 Subject: image_types.bbclass: fix cpio IMAGE_CMD to preserve working directory 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. (From OE-Core rev: 5ff6cb920f8be9068a23f7bf0cb1b9a9ff1eda5b) Signed-off-by: Jonathan Liu Signed-off-by: Richard Purdie --- meta/classes/image_types.bbclass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/classes/image_types.bbclass b/meta/classes/image_types.bbclass index 9577b1f2ec..602c1f046f 100644 --- a/meta/classes/image_types.bbclass +++ b/meta/classes/image_types.bbclass @@ -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}" -- cgit v1.2.3-54-g00ecf