summaryrefslogtreecommitdiff
path: root/meta
diff options
context:
space:
mode:
authorPaul Eggleton <paul.eggleton@linux.intel.com>2012-03-16 11:43:44 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-03-19 13:31:32 +0000
commit5a321f5840d4ed813e2a768871b33eff433d748c (patch)
treecbbcaf594b6837de174a4fbf554c879c2c7e540a /meta
parentb2dcb79c8c713ffb25d49a355fdb1bfa97d3c10d (diff)
downloadopenembedded-core-5a321f5840d4ed813e2a768871b33eff433d748c.tar.gz
openembedded-core-5a321f5840d4ed813e2a768871b33eff433d748c.tar.bz2
openembedded-core-5a321f5840d4ed813e2a768871b33eff433d748c.tar.xz
openembedded-core-5a321f5840d4ed813e2a768871b33eff433d748c.zip
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>
Diffstat (limited to 'meta')
-rw-r--r--meta/classes/image.bbclass2
1 files changed, 1 insertions, 1 deletions
diff --git a/meta/classes/image.bbclass b/meta/classes/image.bbclass
index 533f53cca..ccfcaba40 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