From c569fcee0891251ae840c2a25f12a7faedf0fc1a Mon Sep 17 00:00:00 2001 From: Paul Eggleton Date: Fri, 16 Mar 2012 11:43:44 +0000 Subject: classes/image: avoid cp race condition when building multiple images Avoid a race condition when building multiple images by ignoring a failure to copy the README_-_DO_NOT_DELETE_FILES_IN_THIS_DIRECTORY.txt to DEPLOY_DIR_IMAGE. (From OE-Core rev: 5a321f5840d4ed813e2a768871b33eff433d748c) Signed-off-by: Paul Eggleton Signed-off-by: Richard Purdie --- meta/classes/image.bbclass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'meta/classes/image.bbclass') diff --git a/meta/classes/image.bbclass b/meta/classes/image.bbclass index 533f53ccaf..ccfcaba40e 100644 --- a/meta/classes/image.bbclass +++ b/meta/classes/image.bbclass @@ -145,7 +145,7 @@ fakeroot do_rootfs () { mkdir -p ${IMAGE_ROOTFS} mkdir -p ${DEPLOY_DIR_IMAGE} - cp ${COREBASE}/meta/files/deploydir_readme.txt ${DEPLOY_DIR_IMAGE}/README_-_DO_NOT_DELETE_FILES_IN_THIS_DIRECTORY.txt + cp ${COREBASE}/meta/files/deploydir_readme.txt ${DEPLOY_DIR_IMAGE}/README_-_DO_NOT_DELETE_FILES_IN_THIS_DIRECTORY.txt || true # If "${IMAGE_ROOTFS}/dev" exists, then the device had been made by # the previous build -- cgit v1.2.3-54-g00ecf