From: Paul Eggleton <paul.eggleton@linux.intel.com>
Date: Fri, 16 Mar 2012 11:43:44 +0000 (+0000)
Subject: classes/image: avoid cp race condition when building multiple images
X-Git-Tag: 2015-4~11346
X-Git-Url: https://code.ossystems.io/gitweb?a=commitdiff_plain;h=5a321f5840d4ed813e2a768871b33eff433d748c;p=openembedded-core.git

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.

Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
---

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