[oe-commits] Paul Eggleton : classes/image: avoid cp race condition when building multiple images

git at git.openembedded.org git at git.openembedded.org
Mon Mar 19 13:41:46 UTC 2012


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

Author: Paul Eggleton <paul.eggleton at linux.intel.com>
Date:   Fri Mar 16 11:43:44 2012 +0000

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 at linux.intel.com>

---

 meta/classes/image.bbclass |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

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





More information about the Openembedded-commits mailing list