github/acrn-hypervisor
1
0
Fork 0
mirror of https://github.com/projectacrn/acrn-hypervisor.git synced 2025-06-19 04:02:05 +00:00
Code Issues Projects Releases Wiki Activity

acrn-config: refine '--out' for config tool

Browse Source 
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 <weix.w.liu@intel.com>
Acked-by: Terry Zou <terry.zou@intel.com>
Acked-by: Victor Sun <victor.sun@intel.com>
This commit is contained in:
Wei Liu 2020-04-21 14:13:48 +08:00 committed by wenlingz
parent 113f2f1e35
commit a0e18eec34
3 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
misc/acrn-config/board_config/board_cfg_gen.py
View File

@ -56,14 +56,14 @@ def main(args):
if params['--out']: if params['--out']:
if os.path.isabs(params['--out']): if os.path.isabs(params['--out']):
board_dir = params['--out'] + board + '/' board_dir = os.path.join(params['--out'], board + '/')
config_board_kconfig = board_dir + GEN_FILE[4] config_board_kconfig = os.path.join(board_dir, GEN_FILE[4])
else: else:
board_dir = ACRN_PATH + params['--out'] + board + '/' board_dir = os.path.join(ACRN_PATH + params['--out'], board + '/')
config_board_kconfig = board_dir + GEN_FILE[4] config_board_kconfig = os.path.join(board_dir, GEN_FILE[4])
else: else:
board_dir = ACRN_CONFIG_DEF + board + '/' board_dir = os.path.join(ACRN_CONFIG_DEF, board + '/')
config_board_kconfig = board_dir + GEN_FILE[4] config_board_kconfig = os.path.join(board_dir, GEN_FILE[4])
common.mkdir(board_dir) common.mkdir(board_dir)
config_pci = board_dir + GEN_FILE[0] config_pci = board_dir + GEN_FILE[0]

6
misc/acrn-config/launch_config/launch_cfg_gen.py
View File

@ -200,11 +200,11 @@ def main(args):
board_name = names['board_name'] board_name = names['board_name']
if output_folder: if output_folder:
if os.path.isabs(output_folder): if os.path.isabs(output_folder):
output = output_folder + '/' + board_name + '/output/' output = os.path.join(output_folder + '/' + board_name, 'output/')
else: else:
output = ACRN_PATH + board_name + '/output/' output = os.path.join(ACRN_PATH + output_folder + '/' + board_name, 'output/')
else: else:
output = ACRN_CONFIG_DEF + '/' + board_name + '/output/' output = os.path.join(ACRN_CONFIG_DEF + board_name, 'output/')
common.mkdir(output) common.mkdir(output)
# generate launch script # generate launch script

12
misc/acrn-config/scenario_config/scenario_cfg_gen.py
View File

@ -144,14 +144,14 @@ def main(args):
if params['--out']: if params['--out']:
if os.path.isabs(params['--out']): if os.path.isabs(params['--out']):
scenario_dir = params['--out'] + scenario + '/' scenario_dir = os.path.join(params['--out'], scenario + '/')
config_hv = params['--out'] + board_name + GEN_FILE[3] config_hv = os.path.join(params['--out'], board_name + GEN_FILE[3])
else: else:
scenario_dir = ACRN_PATH + scenario + '/' scenario_dir = os.path.join(ACRN_PATH + params['--out'], scenario + '/')
config_hv = ACRN_PATH + board_name + GEN_FILE[3] config_hv = os.path.join(ACRN_PATH + params['--out'], board_name + GEN_FILE[3])
else: else:
scenario_dir = ACRN_CONFIG_DEF + scenario + '/' scenario_dir = os.path.join(ACRN_CONFIG_DEF, scenario + '/')
config_hv = ACRN_CONFIGS + board_name + GEN_FILE[3] config_hv = os.path.join(ACRN_CONFIGS, board_name + GEN_FILE[3])
common.print_yel("{}".format("Override board defconfig...", warn=True)) common.print_yel("{}".format("Override board defconfig...", warn=True))
common.mkdir(scenario_dir) common.mkdir(scenario_dir)