Skip to contentSkip to conversation

image_types.bbclass: fix cpio IMAGE_CMD to preserve working directory

PATCH Superseded Jonathan Liu 3 participants 3 messages Feb 18, 2014

v1 of 3 Superseded Latest is v3 →

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 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.

---
 meta/classes/image_types.bbclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
meta/classes/image_types.bbclass +1 -1
index 944e6db..747a59b 100644
@@ -74,7 +74,7 @@ CPIO_TOUCH_INIT () {
 }
 IMAGE_CMD_cpio () {
 	${CPIO_TOUCH_INIT}
-	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}"
Signature · 1 line
1.8.5.4
#1 lore raw

meta/classes/image_types.bbclass CPIO_TOUCH_INIT () { · line 78

Quoted 7 lines · Jonathan Liu

}

 IMAGE_CMD_cpio () {
        ${CPIO_TOUCH_INIT}
meta/classes/image_types.bbclass +1 -1
-       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))
 }

this would fork a new shell. you could also do something like
cd ${IMAGE_ROOTFS} && (find . | cpio -o -H newc

Quoted 1 line

${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.cpio) && cd -

#2 lore raw
Quoted 11 lines · On 18 February 2014 15:56:41 Khem Raj <[email protected]> wrote:
Quoted 9 lines · Jonathan Liu

}

 IMAGE_CMD_cpio () {
        ${CPIO_TOUCH_INIT}

- 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))
}

Quoted 3 lines

this would fork a new shell. you could also do something like
cd ${IMAGE_ROOTFS} && (find . | cpio -o -H newc

Quoted 1 line

${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.cpio) && cd -

Or just pull the cd into the find subshell... ;)

Quoted 4 lines

_______________________________________________
Openembedded-core mailing list
[email protected]
http://lists.openembedded.org/mailman/listinfo/openembedded-core

Sent with AquaMail for Android
http://www.aqua-mail.com