diff options
| -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) |