]> code.ossystems Code Review - openembedded-core.git/commitdiff
classes/image: avoid cp race condition when building multiple images
authorPaul Eggleton <paul.eggleton@linux.intel.com>
Fri, 16 Mar 2012 11:43:44 +0000 (11:43 +0000)
committerRichard Purdie <richard.purdie@linuxfoundation.org>
Mon, 19 Mar 2012 13:31:32 +0000 (13:31 +0000)
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

index 533f53ccaf4958e12e0bb117e201b85b5b4f20e3..ccfcaba40ef41dd6b292deb792fbae5d2b857116 100644 (file)
@@ -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