diff options
author | Mike Crowe <mac@mcrowe.com> | 2017-02-14 14:20:02 +0000 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2017-03-01 11:17:45 +0000 |
commit | 0b8d85a09406d97637900d8dbe1ef1034c56ce3f (patch) | |
tree | d529aa13da2d3a9ca849e2ce36bf03366c7303e3 /meta/classes/license.bbclass | |
parent | 7186e265c6a456ed33e071abc33fbf26a7b7ffe8 (diff) | |
download | poky-0b8d85a09406d97637900d8dbe1ef1034c56ce3f.tar.gz |
kernel, license, sstate, rootfs.py: Remove deploy directory README
It isn't clear that the README_-_DO_NOT_DELETE_FILES_IN_THIS_DIRECTORY.txt
file in the deploy directory warrants the complexity it brings elsewhere.
Let's just remove it entirely.
In particular, if two do_image_complete tasks run in parallel they risk
both trying to put their image into ${DEPLOY_DIR_IMAGE} at the same time.
Both will contain a README_-_DO_NOT_DELETE_FILES_IN_THIS_DIRECTORY.txt
file. In theory this should be safe because "cp -alf" will just cause one
to overwrite the other. Unfortunately, coreutils cp also has a race[1]
which means that if one copy creates the file at just the wrong point the
other will fail with:
cp: cannot create hard link ‘..../tmp-glibc/deploy/images/pantera/README_-_DO_NOT_DELETE_FILES_IN_THIS_D.txt’ to
+‘..../tmp-glibc/work/rage_against-oe-linux-gnueabi/my-own-image/1.0-r0/deploy-my-own-image-complete/README_-_DO_NOT_DELETE_FILES_IN_THIS_DIRECTORY.txt’: File exists
[1] https://debbugs.gnu.org/cgi/bugreport.cgi?bug=25680
(From OE-Core rev: 71e9e88847d7000781642ea6187ebd8f40dfdcfe)
Signed-off-by: Mike Crowe <mac@mcrowe.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/classes/license.bbclass')
-rw-r--r-- | meta/classes/license.bbclass | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/meta/classes/license.bbclass b/meta/classes/license.bbclass index 9923aac4ec..11d45f3867 100644 --- a/meta/classes/license.bbclass +++ b/meta/classes/license.bbclass | |||
@@ -279,7 +279,7 @@ def get_deployed_files(man_file): | |||
279 | """ | 279 | """ |
280 | 280 | ||
281 | dep_files = [] | 281 | dep_files = [] |
282 | excluded_files = ["README_-_DO_NOT_DELETE_FILES_IN_THIS_DIRECTORY.txt"] | 282 | excluded_files = [] |
283 | with open(man_file, "r") as manifest: | 283 | with open(man_file, "r") as manifest: |
284 | all_files = manifest.read() | 284 | all_files = manifest.read() |
285 | for f in all_files.splitlines(): | 285 | for f in all_files.splitlines(): |