summaryrefslogtreecommitdiffstats
path: root/scripts
diff options
context:
space:
mode:
authorLee Chee Yang <Chee.Yang.Lee@intel.com>2021-02-08 09:22:55 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2021-02-09 08:56:11 +0000
commit34ea1433fcf5e2f256083f91f120e0b78c613ed5 (patch)
tree2192ef97f2a37c43bdb36375edf68c4007e91fbe /scripts
parent7747c98bf22b91f75d92bdfe67e7e0377738cbe4 (diff)
downloadpoky-34ea1433fcf5e2f256083f91f120e0b78c613ed5.tar.gz
wic: debug mode to keep tmp directory
files in wic tmp directory can be usefull for debugging, so do not remove tmp directory when wic create run with debugging mode (-D or --debug). also update wic.Wic.test_debug_short and wic.Wic.test_debug_long to check for tmp directory. [YOCTO#14216] (From OE-Core rev: a122e2418b67d38f691edcf8dd846c167d6b4fa9) Signed-off-by: Lee Chee Yang <Chee.Yang.Lee@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'scripts')
-rw-r--r--scripts/lib/wic/plugins/imager/direct.py6
1 files changed, 4 insertions, 2 deletions
diff --git a/scripts/lib/wic/plugins/imager/direct.py b/scripts/lib/wic/plugins/imager/direct.py
index 7e1c1c03ab..ea709e8c54 100644
--- a/scripts/lib/wic/plugins/imager/direct.py
+++ b/scripts/lib/wic/plugins/imager/direct.py
@@ -54,6 +54,7 @@ class DirectPlugin(ImagerPlugin):
54 self.native_sysroot = native_sysroot 54 self.native_sysroot = native_sysroot
55 self.oe_builddir = oe_builddir 55 self.oe_builddir = oe_builddir
56 56
57 self.debug = options.debug
57 self.outdir = options.outdir 58 self.outdir = options.outdir
58 self.compressor = options.compressor 59 self.compressor = options.compressor
59 self.bmap = options.bmap 60 self.bmap = options.bmap
@@ -274,8 +275,9 @@ class DirectPlugin(ImagerPlugin):
274 if os.path.isfile(path): 275 if os.path.isfile(path):
275 shutil.move(path, os.path.join(self.outdir, fname)) 276 shutil.move(path, os.path.join(self.outdir, fname))
276 277
277 # remove work directory 278 # remove work directory when it is not in debugging mode
278 shutil.rmtree(self.workdir, ignore_errors=True) 279 if not self.debug:
280 shutil.rmtree(self.workdir, ignore_errors=True)
279 281
280# Overhead of the MBR partitioning scheme (just one sector) 282# Overhead of the MBR partitioning scheme (just one sector)
281MBR_OVERHEAD = 1 283MBR_OVERHEAD = 1