[oe-commits] Laurentiu Palcu : image.bbclass, lib/oe/rootfs.py: remove intercept_scripts directory
git at git.openembedded.org
git at git.openembedded.org
Tue Feb 11 11:56:25 UTC 2014
Module: openembedded-core.git
Branch: master
Commit: 37a9dc05272e7e49c8a475ccb3d10880dcee4763
URL: http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=37a9dc05272e7e49c8a475ccb3d10880dcee4763
Author: Laurentiu Palcu <laurentiu.palcu at intel.com>
Date: Mon Jan 13 11:33:00 2014 +0200
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 at intel.com>
---
meta/classes/image.bbclass | 2 +-
meta/lib/oe/rootfs.py | 2 ++
2 files changed, 3 insertions(+), 1 deletion(-)
diff --git a/meta/classes/image.bbclass b/meta/classes/image.bbclass
index ffe05c9..af3f868 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 bada5ca..2627bd7 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)
More information about the Openembedded-commits
mailing list