diff options
author | Paul Eggleton <paul.eggleton@linux.intel.com> | 2012-03-16 11:43:44 +0000 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-03-19 14:37:41 +0000 |
commit | c569fcee0891251ae840c2a25f12a7faedf0fc1a (patch) | |
tree | 9d0788cc4907e06288b37284fea7f609cedb00fa /meta/classes | |
parent | 49f05afa7f9eb300ab9a2e152f6e0dbe3e443890 (diff) | |
download | poky-c569fcee0891251ae840c2a25f12a7faedf0fc1a.tar.gz |
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.
(From OE-Core rev: 5a321f5840d4ed813e2a768871b33eff433d748c)
Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/classes')
-rw-r--r-- | 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 533f53ccaf..ccfcaba40e 100644 --- a/meta/classes/image.bbclass +++ b/meta/classes/image.bbclass | |||
@@ -145,7 +145,7 @@ fakeroot do_rootfs () { | |||
145 | mkdir -p ${IMAGE_ROOTFS} | 145 | mkdir -p ${IMAGE_ROOTFS} |
146 | mkdir -p ${DEPLOY_DIR_IMAGE} | 146 | mkdir -p ${DEPLOY_DIR_IMAGE} |
147 | 147 | ||
148 | cp ${COREBASE}/meta/files/deploydir_readme.txt ${DEPLOY_DIR_IMAGE}/README_-_DO_NOT_DELETE_FILES_IN_THIS_DIRECTORY.txt | 148 | cp ${COREBASE}/meta/files/deploydir_readme.txt ${DEPLOY_DIR_IMAGE}/README_-_DO_NOT_DELETE_FILES_IN_THIS_DIRECTORY.txt || true |
149 | 149 | ||
150 | # If "${IMAGE_ROOTFS}/dev" exists, then the device had been made by | 150 | # If "${IMAGE_ROOTFS}/dev" exists, then the device had been made by |
151 | # the previous build | 151 | # the previous build |