summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorPaul Eggleton <paul.eggleton@linux.intel.com>2011-08-16 18:13:04 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-08-19 09:29:18 -0700
commit333d571b360e112d7ade0b4ae3bacbda9c8b228d (patch)
tree226f714be68d81d3f4e1239134e87ba898682898 /meta
parent915f1e0773d8783f1e38fab345e582096e6f609d (diff)
downloadpoky-333d571b360e112d7ade0b4ae3bacbda9c8b228d.tar.gz
image.bbclass, kernel.bbclass: create warning file about deleting deploydir files
New users sometimes delete files in tmp/deploy/images assuming they will be re-created just by re-running the build, and then are confused when this doesn't work. To discourage people from doing this, create a file called README_-_DO_NOT_DELETE_FILES_IN_THIS_DIRECTORY.txt in tmp/deploy/images containing an explanation of what needs to be done to re-create files there. Fixes [YOCTO #1315] and [YOCTO #1346]. (From OE-Core rev: 4316c5e9eec67d71f4699102a63a5f968bd8d1d9) Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/classes/image.bbclass2
-rw-r--r--meta/classes/kernel.bbclass2
-rw-r--r--meta/files/deploydir_readme.txt8
3 files changed, 12 insertions, 0 deletions
diff --git a/meta/classes/image.bbclass b/meta/classes/image.bbclass
index 54eb78b7c9..286ae013f9 100644
--- a/meta/classes/image.bbclass
+++ b/meta/classes/image.bbclass
@@ -138,6 +138,8 @@ fakeroot do_rootfs () {
138 mkdir -p ${IMAGE_ROOTFS} 138 mkdir -p ${IMAGE_ROOTFS}
139 mkdir -p ${DEPLOY_DIR_IMAGE} 139 mkdir -p ${DEPLOY_DIR_IMAGE}
140 140
141 cp -n ${COREBASE}/meta/files/deploydir_readme.txt ${DEPLOY_DIR_IMAGE}/README_-_DO_NOT_DELETE_FILES_IN_THIS_DIRECTORY.txt
142
141 if [ "${USE_DEVFS}" != "1" ]; then 143 if [ "${USE_DEVFS}" != "1" ]; then
142 for devtable in ${@get_devtable_list(d)}; do 144 for devtable in ${@get_devtable_list(d)}; do
143 makedevs -r ${IMAGE_ROOTFS} -D $devtable 145 makedevs -r ${IMAGE_ROOTFS} -D $devtable
diff --git a/meta/classes/kernel.bbclass b/meta/classes/kernel.bbclass
index 386b05e57a..a2b10f2c7a 100644
--- a/meta/classes/kernel.bbclass
+++ b/meta/classes/kernel.bbclass
@@ -500,6 +500,8 @@ kernel_do_deploy() {
500 cd ${DEPLOYDIR} 500 cd ${DEPLOYDIR}
501 rm -f ${KERNEL_IMAGE_SYMLINK_NAME}.bin 501 rm -f ${KERNEL_IMAGE_SYMLINK_NAME}.bin
502 ln -sf ${KERNEL_IMAGE_BASE_NAME}.bin ${KERNEL_IMAGE_SYMLINK_NAME}.bin 502 ln -sf ${KERNEL_IMAGE_BASE_NAME}.bin ${KERNEL_IMAGE_SYMLINK_NAME}.bin
503
504 cp -n ${COREBASE}/meta/files/deploydir_readme.txt ${DEPLOYDIR}/README_-_DO_NOT_DELETE_FILES_IN_THIS_DIRECTORY.txt
503} 505}
504do_deploy[dirs] = "${DEPLOYDIR} ${B}" 506do_deploy[dirs] = "${DEPLOYDIR} ${B}"
505 507
diff --git a/meta/files/deploydir_readme.txt b/meta/files/deploydir_readme.txt
new file mode 100644
index 0000000000..97ec1855f5
--- /dev/null
+++ b/meta/files/deploydir_readme.txt
@@ -0,0 +1,8 @@
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.