summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta/classes/image.bbclass2
-rw-r--r--meta/lib/oe/rootfs.py2
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}"
178 178
179do_rootfs[dirs] = "${TOPDIR}" 179do_rootfs[dirs] = "${TOPDIR}"
180do_rootfs[lockfiles] += "${IMAGE_ROOTFS}.lock" 180do_rootfs[lockfiles] += "${IMAGE_ROOTFS}.lock"
181do_rootfs[cleandirs] += "${S} ${WORKDIR}/intercept_scripts" 181do_rootfs[cleandirs] += "${S}"
182 182
183# Must call real_do_rootfs() from inside here, rather than as a separate 183# Must call real_do_rootfs() from inside here, rather than as a separate
184# task, so that we have a single fakeroot context for the whole process. 184# 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):
76 intercepts_dir = os.path.join(self.d.getVar('WORKDIR', True), 76 intercepts_dir = os.path.join(self.d.getVar('WORKDIR', True),
77 "intercept_scripts") 77 "intercept_scripts")
78 78
79 bb.utils.remove(intercepts_dir, True)
80
79 bb.utils.mkdirhier(self.image_rootfs) 81 bb.utils.mkdirhier(self.image_rootfs)
80 82
81 bb.utils.mkdirhier(self.deploy_dir_image) 83 bb.utils.mkdirhier(self.deploy_dir_image)