summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorMike Crowe <mac@mcrowe.com>2017-02-14 14:20:02 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2017-03-01 11:17:45 +0000
commit0b8d85a09406d97637900d8dbe1ef1034c56ce3f (patch)
treed529aa13da2d3a9ca849e2ce36bf03366c7303e3 /meta
parent7186e265c6a456ed33e071abc33fbf26a7b7ffe8 (diff)
downloadpoky-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')
-rw-r--r--meta/classes/kernel.bbclass2
-rw-r--r--meta/classes/license.bbclass2
-rw-r--r--meta/classes/sstate.bbclass2
-rw-r--r--meta/files/deploydir_readme.txt8
-rw-r--r--meta/lib/oe/rootfs.py4
5 files changed, 1 insertions, 17 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
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():
diff --git a/meta/classes/sstate.bbclass b/meta/classes/sstate.bbclass
index 465fdcf57d..23dda082ca 100644
--- a/meta/classes/sstate.bbclass
+++ b/meta/classes/sstate.bbclass
@@ -30,8 +30,6 @@ SSTATE_DUPWHITELIST = "${DEPLOY_DIR_IMAGE}/ ${DEPLOY_DIR}/licenses/ ${DEPLOY_DIR
30SSTATE_DUPWHITELIST += "${STAGING_ETCDIR_NATIVE}/sgml ${STAGING_DATADIR_NATIVE}/sgml" 30SSTATE_DUPWHITELIST += "${STAGING_ETCDIR_NATIVE}/sgml ${STAGING_DATADIR_NATIVE}/sgml"
31# Archive the sources for many architectures in one deploy folder 31# Archive the sources for many architectures in one deploy folder
32SSTATE_DUPWHITELIST += "${DEPLOY_DIR_SRC}" 32SSTATE_DUPWHITELIST += "${DEPLOY_DIR_SRC}"
33# Ignore overlapping README
34SSTATE_DUPWHITELIST += "${DEPLOY_DIR}/sdk/README_-_DO_NOT_DELETE_FILES_IN_THIS_DIRECTORY.txt"
35 33
36SSTATE_SCAN_FILES ?= "*.la *-config *_config" 34SSTATE_SCAN_FILES ?= "*.la *-config *_config"
37SSTATE_SCAN_CMD ??= 'find ${SSTATE_BUILDDIR} \( -name "${@"\" -o -name \"".join(d.getVar("SSTATE_SCAN_FILES").split())}" \) -type f' 35SSTATE_SCAN_CMD ??= 'find ${SSTATE_BUILDDIR} \( -name "${@"\" -o -name \"".join(d.getVar("SSTATE_SCAN_FILES").split())}" \) -type f'
diff --git a/meta/files/deploydir_readme.txt b/meta/files/deploydir_readme.txt
deleted file mode 100644
index 97ec1855f5..0000000000
--- a/meta/files/deploydir_readme.txt
+++ /dev/null
@@ -1,8 +0,0 @@
1Files in the deploy directory will not be re-created automatically if you
2delete them. If you do delete a file, you will need to run:
3
4 bitbake -c clean TARGET
5 bitbake TARGET
6
7where TARGET is the name of the appropriate package or target e.g.
8"virtual/kernel" for the kernel, an image, etc.
diff --git a/meta/lib/oe/rootfs.py b/meta/lib/oe/rootfs.py
index 9c8a0ebb7e..cc111ff3c8 100644
--- a/meta/lib/oe/rootfs.py
+++ b/meta/lib/oe/rootfs.py
@@ -189,10 +189,6 @@ class Rootfs(object, metaclass=ABCMeta):
189 189
190 shutil.copytree(postinst_intercepts_dir, intercepts_dir) 190 shutil.copytree(postinst_intercepts_dir, intercepts_dir)
191 191
192 shutil.copy(self.d.expand("${COREBASE}/meta/files/deploydir_readme.txt"),
193 self.deploydir +
194 "/README_-_DO_NOT_DELETE_FILES_IN_THIS_DIRECTORY.txt")
195
196 execute_pre_post_process(self.d, pre_process_cmds) 192 execute_pre_post_process(self.d, pre_process_cmds)
197 193
198 if self.progress_reporter: 194 if self.progress_reporter: