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>
This commit is contained in:
parent
7186e265c6
commit
0b8d85a094
|
@ -613,8 +613,6 @@ kernel_do_deploy() {
|
||||||
ln -sf ${base_name}.bin ${DEPLOYDIR}/${type}
|
ln -sf ${base_name}.bin ${DEPLOYDIR}/${type}
|
||||||
done
|
done
|
||||||
|
|
||||||
cp ${COREBASE}/meta/files/deploydir_readme.txt ${DEPLOYDIR}/README_-_DO_NOT_DELETE_FILES_IN_THIS_DIRECTORY.txt
|
|
||||||
|
|
||||||
cd ${B}
|
cd ${B}
|
||||||
# Update deploy directory
|
# Update deploy directory
|
||||||
for type in ${KERNEL_IMAGETYPES} ; do
|
for type in ${KERNEL_IMAGETYPES} ; do
|
||||||
|
|
|
@ -279,7 +279,7 @@ def get_deployed_files(man_file):
|
||||||
"""
|
"""
|
||||||
|
|
||||||
dep_files = []
|
dep_files = []
|
||||||
excluded_files = ["README_-_DO_NOT_DELETE_FILES_IN_THIS_DIRECTORY.txt"]
|
excluded_files = []
|
||||||
with open(man_file, "r") as manifest:
|
with open(man_file, "r") as manifest:
|
||||||
all_files = manifest.read()
|
all_files = manifest.read()
|
||||||
for f in all_files.splitlines():
|
for f in all_files.splitlines():
|
||||||
|
|
|
@ -30,8 +30,6 @@ SSTATE_DUPWHITELIST = "${DEPLOY_DIR_IMAGE}/ ${DEPLOY_DIR}/licenses/ ${DEPLOY_DIR
|
||||||
SSTATE_DUPWHITELIST += "${STAGING_ETCDIR_NATIVE}/sgml ${STAGING_DATADIR_NATIVE}/sgml"
|
SSTATE_DUPWHITELIST += "${STAGING_ETCDIR_NATIVE}/sgml ${STAGING_DATADIR_NATIVE}/sgml"
|
||||||
# Archive the sources for many architectures in one deploy folder
|
# Archive the sources for many architectures in one deploy folder
|
||||||
SSTATE_DUPWHITELIST += "${DEPLOY_DIR_SRC}"
|
SSTATE_DUPWHITELIST += "${DEPLOY_DIR_SRC}"
|
||||||
# Ignore overlapping README
|
|
||||||
SSTATE_DUPWHITELIST += "${DEPLOY_DIR}/sdk/README_-_DO_NOT_DELETE_FILES_IN_THIS_DIRECTORY.txt"
|
|
||||||
|
|
||||||
SSTATE_SCAN_FILES ?= "*.la *-config *_config"
|
SSTATE_SCAN_FILES ?= "*.la *-config *_config"
|
||||||
SSTATE_SCAN_CMD ??= 'find ${SSTATE_BUILDDIR} \( -name "${@"\" -o -name \"".join(d.getVar("SSTATE_SCAN_FILES").split())}" \) -type f'
|
SSTATE_SCAN_CMD ??= 'find ${SSTATE_BUILDDIR} \( -name "${@"\" -o -name \"".join(d.getVar("SSTATE_SCAN_FILES").split())}" \) -type f'
|
||||||
|
|
|
@ -1,8 +0,0 @@
|
||||||
Files in the deploy directory will not be re-created automatically if you
|
|
||||||
delete them. If you do delete a file, you will need to run:
|
|
||||||
|
|
||||||
bitbake -c clean TARGET
|
|
||||||
bitbake TARGET
|
|
||||||
|
|
||||||
where TARGET is the name of the appropriate package or target e.g.
|
|
||||||
"virtual/kernel" for the kernel, an image, etc.
|
|
|
@ -189,10 +189,6 @@ class Rootfs(object, metaclass=ABCMeta):
|
||||||
|
|
||||||
shutil.copytree(postinst_intercepts_dir, intercepts_dir)
|
shutil.copytree(postinst_intercepts_dir, intercepts_dir)
|
||||||
|
|
||||||
shutil.copy(self.d.expand("${COREBASE}/meta/files/deploydir_readme.txt"),
|
|
||||||
self.deploydir +
|
|
||||||
"/README_-_DO_NOT_DELETE_FILES_IN_THIS_DIRECTORY.txt")
|
|
||||||
|
|
||||||
execute_pre_post_process(self.d, pre_process_cmds)
|
execute_pre_post_process(self.d, pre_process_cmds)
|
||||||
|
|
||||||
if self.progress_reporter:
|
if self.progress_reporter:
|
||||||
|
|
Loading…
Reference in New Issue