[oe-commits] Jonathan Liu : image_types.bbclass: fix cpio IMAGE_CMD to preserve working directory

git at git.openembedded.org git at git.openembedded.org
Mon Feb 24 16:14:37 UTC 2014


Module: openembedded-core.git
Branch: master-next
Commit: 5ff6cb920f8be9068a23f7bf0cb1b9a9ff1eda5b
URL:    http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=5ff6cb920f8be9068a23f7bf0cb1b9a9ff1eda5b

Author: Jonathan Liu <net147 at gmail.com>
Date:   Fri Feb 21 15:43:38 2014 +1100

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.

Signed-off-by: Jonathan Liu <net147 at gmail.com>
Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>

---

 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 9577b1f..602c1f0 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}"



More information about the Openembedded-commits mailing list