From a0e18eec34cd768bafb002a396477bf41412a9da Mon Sep 17 00:00:00 2001 From: Wei Liu Date: Tue, 21 Apr 2020 14:13:48 +0800 Subject: [PATCH] acrn-config: refine '--out' for config tool Currently, '--out' is relative scripts run dir if it gets relative path, Refine '--out' to source root tree if it gets relative path. Tracked-On: #4641 Signed-off-by: Wei Liu Acked-by: Terry Zou Acked-by: Victor Sun --- misc/acrn-config/board_config/board_cfg_gen.py | 12 ++++++------ misc/acrn-config/launch_config/launch_cfg_gen.py | 6 +++--- misc/acrn-config/scenario_config/scenario_cfg_gen.py | 12 ++++++------ 3 files changed, 15 insertions(+), 15 deletions(-) diff --git a/misc/acrn-config/board_config/board_cfg_gen.py b/misc/acrn-config/board_config/board_cfg_gen.py index 939820ff2..6ce09fc37 100755 --- a/misc/acrn-config/board_config/board_cfg_gen.py +++ b/misc/acrn-config/board_config/board_cfg_gen.py @@ -56,14 +56,14 @@ def main(args): if params['--out']: if os.path.isabs(params['--out']): - board_dir = params['--out'] + board + '/' - config_board_kconfig = board_dir + GEN_FILE[4] + board_dir = os.path.join(params['--out'], board + '/') + config_board_kconfig = os.path.join(board_dir, GEN_FILE[4]) else: - board_dir = ACRN_PATH + params['--out'] + board + '/' - config_board_kconfig = board_dir + GEN_FILE[4] + board_dir = os.path.join(ACRN_PATH + params['--out'], board + '/') + config_board_kconfig = os.path.join(board_dir, GEN_FILE[4]) else: - board_dir = ACRN_CONFIG_DEF + board + '/' - config_board_kconfig = board_dir + GEN_FILE[4] + board_dir = os.path.join(ACRN_CONFIG_DEF, board + '/') + config_board_kconfig = os.path.join(board_dir, GEN_FILE[4]) common.mkdir(board_dir) config_pci = board_dir + GEN_FILE[0] diff --git a/misc/acrn-config/launch_config/launch_cfg_gen.py b/misc/acrn-config/launch_config/launch_cfg_gen.py index 937ad1e5b..a51e55bcf 100644 --- a/misc/acrn-config/launch_config/launch_cfg_gen.py +++ b/misc/acrn-config/launch_config/launch_cfg_gen.py @@ -200,11 +200,11 @@ def main(args): board_name = names['board_name'] if output_folder: if os.path.isabs(output_folder): - output = output_folder + '/' + board_name + '/output/' + output = os.path.join(output_folder + '/' + board_name, 'output/') else: - output = ACRN_PATH + board_name + '/output/' + output = os.path.join(ACRN_PATH + output_folder + '/' + board_name, 'output/') else: - output = ACRN_CONFIG_DEF + '/' + board_name + '/output/' + output = os.path.join(ACRN_CONFIG_DEF + board_name, 'output/') common.mkdir(output) # generate launch script diff --git a/misc/acrn-config/scenario_config/scenario_cfg_gen.py b/misc/acrn-config/scenario_config/scenario_cfg_gen.py index dd4ca15d2..ab75b53b1 100755 --- a/misc/acrn-config/scenario_config/scenario_cfg_gen.py +++ b/misc/acrn-config/scenario_config/scenario_cfg_gen.py @@ -144,14 +144,14 @@ def main(args): if params['--out']: if os.path.isabs(params['--out']): - scenario_dir = params['--out'] + scenario + '/' - config_hv = params['--out'] + board_name + GEN_FILE[3] + scenario_dir = os.path.join(params['--out'], scenario + '/') + config_hv = os.path.join(params['--out'], board_name + GEN_FILE[3]) else: - scenario_dir = ACRN_PATH + scenario + '/' - config_hv = ACRN_PATH + board_name + GEN_FILE[3] + scenario_dir = os.path.join(ACRN_PATH + params['--out'], scenario + '/') + config_hv = os.path.join(ACRN_PATH + params['--out'], board_name + GEN_FILE[3]) else: - scenario_dir = ACRN_CONFIG_DEF + scenario + '/' - config_hv = ACRN_CONFIGS + board_name + GEN_FILE[3] + scenario_dir = os.path.join(ACRN_CONFIG_DEF, scenario + '/') + config_hv = os.path.join(ACRN_CONFIGS, board_name + GEN_FILE[3]) common.print_yel("{}".format("Override board defconfig...", warn=True)) common.mkdir(scenario_dir)