Support to remove cache directory after image created.

Change-Id: Icd7c0ff460568538373088fa473f2035b8c9ae59
Signed-off-by: wanchao.xu <wanchao.xu@samsung.com>

diff --git a/mic/rt_util.py b/mic/rt_util.py
index 734065d97d5a10ec7b20fbce52111bf15ee3ab52..53317c040fb2ccc7ed5b45c5c966302907fb9151 100644 (file)
--- a/mic/rt_util.py
+++ b/mic/rt_util.py
@@ -133,7 +133,10 @@ def bootstrap_mic(ksconf, argv=None):
     if not os.path.exists(cachedir):
         os.makedirs(cachedir)
 
-    cache_changed = False
+    clean_cache = False
+    if '--clean-cache' in argv:
+        clean_cache = True
+
     cache_lock = open(os.path.join(cachedir, "__using.lock"), 'w')
     try:
         fcntl.flock(cache_lock, fcntl.LOCK_EX | fcntl.LOCK_NB)
@@ -147,7 +150,7 @@ def bootstrap_mic(ksconf, argv=None):
         configmgr.create['cachedir'] = cachedir
         argv.append('-k')
         argv.append(cachedir)
-        cache_changed = True
+        clean_cache = True
         cache_lock = open(os.path.join(cachedir, "__using.lock"), 'w')
         fcntl.flock(cache_lock, fcntl.LOCK_EX)
 
@@ -217,7 +220,7 @@ def bootstrap_mic(ksconf, argv=None):
         fcntl.flock(cache_lock, fcntl.LOCK_UN)
         cache_lock.close()
         bsenv.cleanup()
-        if cache_changed:
+        if clean_cache:
             shutil.rmtree(cachedir, ignore_errors=True)
 
 def get_bindmounts(cropts):

diff --git a/tools/mic b/tools/mic
index df8fe53c98e90562a3f5d3a69d716c0ae56b4c13..47f4e016accebb7345838d0224544e1c0f6cf8ab 100755 (executable)
--- a/tools/mic
+++ b/tools/mic
@@ -144,6 +144,8 @@ def create_parser(parser):
     parent_parser.add_argument('--skip-set-hosts', action='store_true', dest='skip_set_hosts', default=False, help='choose to skip set hosts by mic')
     parent_parser.add_argument('--postscripts-maxruntime', dest='postscripts_maxruntime', default=120, help='max run time for post scripts')
     parent_parser.add_argument('--block-recommends', action='store_true', dest='block_recommends', default=False, help='Do not install recommended packages')
+    parent_parser.add_argument('--clean-cache', action='store_true', dest='clean_cache',
+                               default=False, help='Remove the cache directory after image created')
 
     parser.set_defaults(alias="cr")