Patchwork [1/6] classes/image: avoid cp race condition when building multiple images

login
register
mail settings
Submitter Paul Eggleton
Date March 16, 2012, 7 p.m.
Message ID <9e65fb68c870f09a8f6ce86e0399e819d13653c7.1331924409.git.paul.eggleton@linux.intel.com>
Download mbox | patch
Permalink /patch/23743/
State Accepted
Commit 5a321f5840d4ed813e2a768871b33eff433d748c
Headers show

Comments

Paul Eggleton - March 16, 2012, 7 p.m.
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.

Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
---
 meta/classes/image.bbclass |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

Patch

diff --git a/meta/classes/image.bbclass b/meta/classes/image.bbclass
index 533f53c..ccfcaba 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