summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJonathan Liu <net147@gmail.com>2014-02-21 15:43:38 +1100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-02-21 16:14:42 +0000
commit8d7dd9ae471ad6154cd4e59152560ff5f24b3c2a (patch)
treef64bfae3ce8751947b8a2d01ec3440522a1b6469
parent6ffc15655068f3da6032d8c782a8005a3f73aed9 (diff)
downloadpoky-8d7dd9ae471ad6154cd4e59152560ff5f24b3c2a.tar.gz
poky-8d7dd9ae471ad6154cd4e59152560ff5f24b3c2a.tar.bz2
poky-8d7dd9ae471ad6154cd4e59152560ff5f24b3c2a.zip
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 <net147@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 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}"