aboutsummaryrefslogtreecommitdiffstats
path: root/scripts/lib/wic/imager/direct.py
diff options
context:
space:
mode:
authorEd Bartosh <ed.bartosh@linux.intel.com>2016-01-19 18:51:05 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-01-20 17:07:13 +0000
commit3fc6aaa1862a735322264049dcb50c69acf30d36 (patch)
treef2237b68c2c1fcb7c7f5b67a1e8530151b80d7c8 /scripts/lib/wic/imager/direct.py
parent8d34eea303f1a8bbfeb01252330b0f6dfd92bbf7 (diff)
downloadopenembedded-core-contrib-3fc6aaa1862a735322264049dcb50c69acf30d36.tar.gz
wic: do not remove build dir in source plugins
Interesting bug was found during implementation of 'include' parser command. Build directory was removed in do_configure_partition method of bootimg- source plugins. This can cause removal of previously prepared partition images if /boot partition is mentioned after other partitions in .ks file. Moved work directory removal to direct.py before processing partitions. (From OE-Core rev: ba98262573cf1600e0d477317f51d488b5f8c4bd) Signed-off-by: Ed Bartosh <ed.bartosh@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'scripts/lib/wic/imager/direct.py')
-rw-r--r--scripts/lib/wic/imager/direct.py3
1 files changed, 3 insertions, 0 deletions
diff --git a/scripts/lib/wic/imager/direct.py b/scripts/lib/wic/imager/direct.py
index 8d4daece0d..a1b4249651 100644
--- a/scripts/lib/wic/imager/direct.py
+++ b/scripts/lib/wic/imager/direct.py
@@ -229,6 +229,9 @@ class DirectImageCreator(BaseImageCreator):
fstab_path = self._write_fstab(self.rootfs_dir.get("ROOTFS_DIR"))
+ shutil.rmtree(self.workdir)
+ os.mkdir(self.workdir)
+
for part in parts:
# get rootfs size from bitbake variable if it's not set in .ks file
if not part.size: