summaryrefslogtreecommitdiffstats
path: root/meta/lib
diff options
context:
space:
mode:
authorMike Crowe <mac@mcrowe.com>2017-02-14 14:20:02 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2017-08-29 23:43:50 +0100
commit2a70e84643381eca0e7bf7928d4a3d56f9651128 (patch)
tree85639c4215d521004210552661237c9b2eb70373 /meta/lib
parent5224bf7c7271eaed5a278c0282929baaf2e7ddaa (diff)
downloadpoky-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/lib')
-rw-r--r--meta/lib/oe/rootfs.py4
1 files changed, 0 insertions, 4 deletions
diff --git a/meta/lib/oe/rootfs.py b/meta/lib/oe/rootfs.py
index c4a5086bec..f96788399f 100644
--- a/meta/lib/oe/rootfs.py
+++ b/meta/lib/oe/rootfs.py
@@ -186,10 +186,6 @@ class Rootfs(object, metaclass=ABCMeta):
186 186
187 shutil.copytree(postinst_intercepts_dir, intercepts_dir) 187 shutil.copytree(postinst_intercepts_dir, intercepts_dir)
188 188
189 shutil.copy(self.d.expand("${COREBASE}/meta/files/deploydir_readme.txt"),
190 self.deploydir +
191 "/README_-_DO_NOT_DELETE_FILES_IN_THIS_DIRECTORY.txt")
192
193 execute_pre_post_process(self.d, pre_process_cmds) 189 execute_pre_post_process(self.d, pre_process_cmds)
194 190
195 if self.progress_reporter: 191 if self.progress_reporter: