image.bbclass, lib/oe/rootfs.py: remove intercept_scripts directory

Remove the directory, manually, in the Rootfs.create() function.

(From OE-Core rev: 37a9dc05272e7e49c8a475ccb3d10880dcee4763)

Signed-off-by: Laurentiu Palcu <laurentiu.palcu@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Laurentiu Palcu
2014-01-13 11:33:00 +02:00
committed by Richard Purdie
parent f52391a919
commit aaa92a67d8
2 changed files with 3 additions and 1 deletions

View File

@@ -178,7 +178,7 @@ PSEUDO_PASSWD = "${IMAGE_ROOTFS}"
do_rootfs[dirs] = "${TOPDIR}"
do_rootfs[lockfiles] += "${IMAGE_ROOTFS}.lock"
do_rootfs[cleandirs] += "${S} ${WORKDIR}/intercept_scripts"
do_rootfs[cleandirs] += "${S}"
# Must call real_do_rootfs() from inside here, rather than as a separate
# task, so that we have a single fakeroot context for the whole process.

View File

@@ -76,6 +76,8 @@ class Rootfs(object):
intercepts_dir = os.path.join(self.d.getVar('WORKDIR', True),
"intercept_scripts")
bb.utils.remove(intercepts_dir, True)
bb.utils.mkdirhier(self.image_rootfs)
bb.utils.mkdirhier(self.deploy_dir_image)