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/kernel.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/kernel.bbclass')
-rw-r--r-- | meta/classes/kernel.bbclass | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/meta/classes/kernel.bbclass b/meta/classes/kernel.bbclass index ae8eaed119..3cd59fd749 100644 --- a/meta/classes/kernel.bbclass +++ b/meta/classes/kernel.bbclass | |||
@@ -613,8 +613,6 @@ kernel_do_deploy() { | |||
613 | ln -sf ${base_name}.bin ${DEPLOYDIR}/${type} | 613 | ln -sf ${base_name}.bin ${DEPLOYDIR}/${type} |
614 | done | 614 | done |
615 | 615 | ||
616 | cp ${COREBASE}/meta/files/deploydir_readme.txt ${DEPLOYDIR}/README_-_DO_NOT_DELETE_FILES_IN_THIS_DIRECTORY.txt | ||
617 | |||
618 | cd ${B} | 616 | cd ${B} |
619 | # Update deploy directory | 617 | # Update deploy directory |
620 | for type in ${KERNEL_IMAGETYPES} ; do | 618 | for type in ${KERNEL_IMAGETYPES} ; do |