starlingx/tools
Code Issues Proposed changes

latc: Doesn't set work directory based on kernel type

Browse Source 
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 <haiqing.bai@windriver.com>
Change-Id: If690ce9a426337c3f5657d52bfbd119cb8f6d384
This commit is contained in:
Haiqing Bai 2022-07-05 18:04:26 +08:00
parent 778704c1dc
commit 095e59c907
2 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
stx/toCOPY/lat-tool/lat/latc
View File

@ -43,8 +43,6 @@ def main():
parser.add_argument("-q", "--quiet", parser.add_argument("-q", "--quiet",
help = "Hide all output except error messages", help = "Hide all output except error messages",
action="store_const", const=logging.ERROR, dest="loglevel") 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, parser.add_argument('action', metavar='action', type=str, nargs=1,
help = 'Action to take. e.g. getyaml/build/status/stop/clean/logs') help = 'Action to take. e.g. getyaml/build/status/stop/clean/logs')
parser.add_argument('--file', required=False, parser.add_argument('--file', required=False,
@ -55,12 +53,12 @@ def main():
client_action = args.action[0] client_action = args.action[0]
msg = {'workdir': os.path.join(channel.workspace_dir, args.kernel)} msg = {'workdir': channel.workspace_dir}
if client_action == 'getyaml': if client_action == 'getyaml':
msg['action'] = 'getyaml' msg['action'] = 'getyaml'
elif client_action == 'build': elif client_action == 'build':
if not args.file: 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) sys.exit(1)
msg['action'] = 'build' msg['action'] = 'build'
if not os.path.exists(args.file): if not os.path.exists(args.file):

2
stx/toCOPY/lat-tool/lat/volume.py
View File

@ -25,7 +25,7 @@ import yaml
logger = logging.getLogger('latd.volume') 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'] else os.environ['WORKSPACE_DIR']
channel_dir = "/localdisk/channel" channel_dir = "/localdisk/channel"