From 095e59c90700f8c0edb596b45428ee9c092e3465 Mon Sep 17 00:00:00 2001 From: Haiqing Bai Date: Tue, 5 Jul 2022 18:04:26 +0800 Subject: [PATCH] latc: Doesn't set work directory based on kernel type After supporting dual kernels(std, rt) in one image, there is no need to set separated work directories for std and rt types. Test Plan: Pass: 'build-image --std' works and the '/localdisk/' is the build directory Pass: 'build-image --rt' works and the '/localdisk/' is the build directory Story: 2008846 Task: 45725 Signed-off-by: Haiqing Bai Change-Id: If690ce9a426337c3f5657d52bfbd119cb8f6d384 --- stx/toCOPY/lat-tool/lat/latc | 6 ++---- stx/toCOPY/lat-tool/lat/volume.py | 2 +- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/stx/toCOPY/lat-tool/lat/latc b/stx/toCOPY/lat-tool/lat/latc index e395ec2c..00aa44f5 100755 --- a/stx/toCOPY/lat-tool/lat/latc +++ b/stx/toCOPY/lat-tool/lat/latc @@ -43,8 +43,6 @@ def main(): parser.add_argument("-q", "--quiet", help = "Hide all output except error messages", action="store_const", const=logging.ERROR, dest="loglevel") - parser.add_argument("-t", "--kernel", type=str, choices=['std', 'rt'], default='std', - help = "Image type for standard kernel or rt kernel") parser.add_argument('action', metavar='action', type=str, nargs=1, help = 'Action to take. e.g. getyaml/build/status/stop/clean/logs') parser.add_argument('--file', required=False, @@ -55,12 +53,12 @@ def main(): client_action = args.action[0] - msg = {'workdir': os.path.join(channel.workspace_dir, args.kernel)} + msg = {'workdir': channel.workspace_dir} if client_action == 'getyaml': msg['action'] = 'getyaml' elif client_action == 'build': if not args.file: - logger.error('latc build --file /path/to/some.yaml -t std|rt') + logger.error('latc build --file /path/to/some.yaml') sys.exit(1) msg['action'] = 'build' if not os.path.exists(args.file): diff --git a/stx/toCOPY/lat-tool/lat/volume.py b/stx/toCOPY/lat-tool/lat/volume.py index 7b38e1f3..2a11906b 100644 --- a/stx/toCOPY/lat-tool/lat/volume.py +++ b/stx/toCOPY/lat-tool/lat/volume.py @@ -25,7 +25,7 @@ import yaml logger = logging.getLogger('latd.volume') -workspace_dir = "/localdisk/lat" if 'WORKSPACE_DIR' not in os.environ \ +workspace_dir = "/localdisk" if 'WORKSPACE_DIR' not in os.environ \ else os.environ['WORKSPACE_DIR'] channel_dir = "/localdisk/channel"