diff options
| author | Laurentiu Palcu <laurentiu.palcu@intel.com> | 2014-01-13 11:33:00 +0200 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2014-02-11 11:50:26 +0000 |
| commit | 37a9dc05272e7e49c8a475ccb3d10880dcee4763 (patch) | |
| tree | 29c9a081d32d602cf8416734546a73996a3fcda2 | |
| parent | d950ef40a3eae4b54cc62828e66d84a62d78c447 (diff) | |
| download | openembedded-core-37a9dc05272e7e49c8a475ccb3d10880dcee4763.tar.gz openembedded-core-37a9dc05272e7e49c8a475ccb3d10880dcee4763.tar.bz2 openembedded-core-37a9dc05272e7e49c8a475ccb3d10880dcee4763.zip | |
image.bbclass, lib/oe/rootfs.py: remove intercept_scripts directory
Remove the directory, manually, in the Rootfs.create() function.
Signed-off-by: Laurentiu Palcu <laurentiu.palcu@intel.com>
| -rw-r--r-- | meta/classes/image.bbclass | 2 | ||||
| -rw-r--r-- | meta/lib/oe/rootfs.py | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/meta/classes/image.bbclass b/meta/classes/image.bbclass index ffe05c9040..af3f868be2 100644 --- a/meta/classes/image.bbclass +++ b/meta/classes/image.bbclass @@ -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. diff --git a/meta/lib/oe/rootfs.py b/meta/lib/oe/rootfs.py index bada5ca467..2627bd71f0 100644 --- a/meta/lib/oe/rootfs.py +++ b/meta/lib/oe/rootfs.py @@ -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) |