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>

diff --git a/meta/classes/image.bbclass b/meta/classes/image.bbclass
index ffe05c90402a00160b6ff89ff7a1823da668a978..af3f868be2a8d214bb15d953bb40205d29ec19ec 100644 (file)
--- 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 bada5ca4676a7b3d19b13708e574fa027920c611..2627bd71f048baf6364559f785bfd20576218b67 100644 (file)
--- 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)