From 9f2c844d745789f7804a9ed51cc1824a01465c8a Mon Sep 17 00:00:00 2001 From: "wanchao.xu" Date: Fri, 15 Nov 2024 14:16:37 +0800 Subject: [PATCH] Support to remove cache directory after image created. Change-Id: Icd7c0ff460568538373088fa473f2035b8c9ae59 Signed-off-by: wanchao.xu --- mic/rt_util.py | 9 ++++++--- tools/mic | 2 ++ 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/mic/rt_util.py b/mic/rt_util.py index 734065d..53317c0 100644 --- 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 df8fe53..47f4e01 100755 --- 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") -- 2.34.1