diff options
author | Mike Crowe <mac@mcrowe.com> | 2017-02-14 14:20:02 +0000 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2017-08-29 23:43:50 +0100 |
commit | 2a70e84643381eca0e7bf7928d4a3d56f9651128 (patch) | |
tree | 85639c4215d521004210552661237c9b2eb70373 /meta/classes/kernel.bbclass | |
parent | 5224bf7c7271eaed5a278c0282929baaf2e7ddaa (diff) | |
download | poky-2a70e84643381eca0e7bf7928d4a3d56f9651128.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)
(From OE-Core rev: 20c39fdbb25c1b1867709c5bfb3ae2baef249be9)
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 d07f69c5ce..eefe574a60 100644 --- a/meta/classes/kernel.bbclass +++ b/meta/classes/kernel.bbclass | |||
@@ -607,8 +607,6 @@ kernel_do_deploy() { | |||
607 | ln -sf ${base_name}.bin ${DEPLOYDIR}/${type} | 607 | ln -sf ${base_name}.bin ${DEPLOYDIR}/${type} |
608 | done | 608 | done |
609 | 609 | ||
610 | cp ${COREBASE}/meta/files/deploydir_readme.txt ${DEPLOYDIR}/README_-_DO_NOT_DELETE_FILES_IN_THIS_DIRECTORY.txt | ||
611 | |||
612 | cd ${B} | 610 | cd ${B} |
613 | # Update deploy directory | 611 | # Update deploy directory |
614 | for type in ${KERNEL_IMAGETYPES} ; do | 612 | for type in ${KERNEL_IMAGETYPES} ; do |