diff --git a/tools/hdf_dev_eco_tool/command_line/hdf_get_handler.py b/tools/hdf_dev_eco_tool/command_line/hdf_get_handler.py index 9309be4b..2a5f4906 100755 --- a/tools/hdf_dev_eco_tool/command_line/hdf_get_handler.py +++ b/tools/hdf_dev_eco_tool/command_line/hdf_get_handler.py @@ -223,6 +223,8 @@ class HdfGetHandler(HdfCommandHandlerBase): self.check_arg_raise_if_not_exist("board_name") root, vendor, _, _, board, _ = self.get_args() if board.split("_")[-1] != "linux": - return HdfLiteScan(root=root, vendor=vendor, board=board).get_model_scan() + return HdfLiteScan( + root=root, vendor=vendor, board=board).get_model_scan() else: - return HdfLinuxScan(root=root, vendor=vendor, board=board).get_model_scan() \ No newline at end of file + return HdfLinuxScan( + root=root, vendor=vendor, board=board).get_model_scan() \ No newline at end of file diff --git a/tools/hdf_dev_eco_tool/command_line/hdf_linux_scann.py b/tools/hdf_dev_eco_tool/command_line/hdf_linux_scann.py index 1033a214..91d5a51b 100755 --- a/tools/hdf_dev_eco_tool/command_line/hdf_linux_scann.py +++ b/tools/hdf_dev_eco_tool/command_line/hdf_linux_scann.py @@ -46,23 +46,25 @@ class HdfLinuxScan(object): self.board = board self.kernel = "linux" - self.Makefile_path = hdf_utils.get_vendor_makefile_path( + self.makefile_path = hdf_utils.get_vendor_makefile_path( root, kernel="linux") - if not os.path.exists(self.Makefile_path): - raise HdfToolException('Makefile: %s not exist' % self.Makefile_path, - CommandErrorCode.TARGET_NOT_EXIST) + if not os.path.exists(self.makefile_path): + raise HdfToolException( + 'Makefile: %s not exist' % self.makefile_path, + CommandErrorCode.TARGET_NOT_EXIST) self.framework_dir = hdf_utils.get_module_dir(self.root, vendor) if not os.path.exists(self.framework_dir): - raise HdfToolException('file: %s not exist' % self.framework_dir, - CommandErrorCode.TARGET_NOT_EXIST) + raise HdfToolException( + 'file: %s not exist' % self.framework_dir, + CommandErrorCode.TARGET_NOT_EXIST) self.hcs_path = hdf_utils.get_hcs_file_path( self.root, self.vendor, self.board) if not os.path.exists(self.hcs_path): raise HdfToolException('file: %s not exist' % self.hcs_path, CommandErrorCode.TARGET_NOT_EXIST) - self.contents = hdf_utils.read_file_lines(self.Makefile_path) + self.contents = hdf_utils.read_file_lines(self.makefile_path) self.re_temp2 = r'model/[a-z 0-9]+' def scan_makefile(self): diff --git a/tools/hdf_dev_eco_tool/command_line/hdf_model_enable_operation.py b/tools/hdf_dev_eco_tool/command_line/hdf_model_enable_operation.py index 6e5d37e7..f23ebdbf 100755 --- a/tools/hdf_dev_eco_tool/command_line/hdf_model_enable_operation.py +++ b/tools/hdf_dev_eco_tool/command_line/hdf_model_enable_operation.py @@ -44,13 +44,18 @@ class EnableOperation(object): self.vendor = vendor self.board = board self.model = model - self.liteos_model_name = HdfLiteScan(self.root, self.vendor, self.board).scan_build() - self.linux_model_name = HdfLinuxScan(self.root, self.vendor, self.board).scan_makefile() + self.liteos_model_name = HdfLiteScan( + self.root, self.vendor, self.board).scan_build() + self.linux_model_name = HdfLinuxScan( + self.root, self.vendor, self.board).scan_makefile() def disable_model_liteos(self): - dot_file_list = hdf_utils.get_dot_configs_path(self.root, self.vendor, self.board) - old_template_string = "LOSCFG_DRIVERS_HDF_${module_upper_case}=y" - new_template_string = "LOSCFG_DRIVERS_HDF_${module_upper_case} is not set\n" + dot_file_list = hdf_utils.get_dot_configs_path( + self.root, self.vendor, self.board) + old_template_string = \ + "LOSCFG_DRIVERS_HDF_${module_upper_case}=y" + new_template_string = \ + "LOSCFG_DRIVERS_HDF_${module_upper_case} is not set\n" new_demo_config = Template(new_template_string).substitute( {"module_upper_case": self.model.upper()}) old_demo_config = Template(old_template_string).substitute( @@ -67,9 +72,12 @@ class EnableOperation(object): return True def enable_model_liteos(self): - dot_file_list = hdf_utils.get_dot_configs_path(self.root, self.vendor, self.board) - new_template_string = "LOSCFG_DRIVERS_HDF_${module_upper_case}=y\n" - old_template_string = "LOSCFG_DRIVERS_HDF_${module_upper_case} is not set" + dot_file_list = hdf_utils.get_dot_configs_path( + self.root, self.vendor, self.board) + new_template_string = \ + "LOSCFG_DRIVERS_HDF_${module_upper_case}=y\n" + old_template_string = \ + "LOSCFG_DRIVERS_HDF_${module_upper_case} is not set" new_demo_config = Template(new_template_string).substitute( {"module_upper_case": self.model.upper()}) old_demo_config = Template(old_template_string).substitute( @@ -132,7 +140,8 @@ class EnableOperation(object): file_path = [] for roots, dirs, files in os.walk(patch): if endswitch == "defconfig": - files_list = list(filter(lambda x: x.split(split_sign)[-1] == endswitch, files)) + files_list = list(filter( + lambda x: x.split(split_sign)[-1] == endswitch, files)) else: files_list = list(filter(lambda x: x == endswitch, files)) for file in files_list: @@ -141,10 +150,12 @@ class EnableOperation(object): def _get_config_linux(self): config_path = self.get_config_config(kernel="linux") - config_path_list = self._get_file_patch(patch=config_path, endswitch="defconfig", split_sign="_") + config_path_list = self._get_file_patch( + patch=config_path, endswitch="defconfig", split_sign="_") patch_path = self.get_config_patch(kernel="linux") - patch_path_list = self._get_file_patch(patch=patch_path, endswitch="hi3516dv300.patch", split_sign=".") + patch_path_list = self._get_file_patch( + patch=patch_path, endswitch="hi3516dv300.patch", split_sign=".") config_path_list.extend(patch_path_list) return config_path_list @@ -168,12 +179,17 @@ class EnableOperation(object): file_path_list = self._get_config_linux() for file_path in file_path_list: if file_path.split("_")[-1] == "defconfig": - old_template_string = "CONFIG_DRIVERS_HDF_${module_upper_case}=y" - new_template_string = "CONFIG_DRIVERS_HDF_${module_upper_case} is not set\n" + old_template_string = \ + "CONFIG_DRIVERS_HDF_${module_upper_case}=y" + new_template_string = \ + "CONFIG_DRIVERS_HDF_${module_upper_case} is not set\n" else: - old_template_string = "+CONFIG_DRIVERS_HDF_${module_upper_case}=y" - new_template_string = "+CONFIG_DRIVERS_HDF_${module_upper_case} is not set\n" - self._replace_operation(new_string=new_template_string, old_string=old_template_string, + old_template_string = \ + "+CONFIG_DRIVERS_HDF_${module_upper_case}=y" + new_template_string = \ + "+CONFIG_DRIVERS_HDF_${module_upper_case} is not set\n" + self._replace_operation(new_string=new_template_string, + old_string=old_template_string, file_path=file_path) return True @@ -183,11 +199,16 @@ class EnableOperation(object): file_path_list = self._get_config_linux() for file_path in file_path_list: if file_path.split("_")[-1] == "defconfig": - new_template_string = "CONFIG_DRIVERS_HDF_${module_upper_case}=y\n" - old_template_string = "CONFIG_DRIVERS_HDF_${module_upper_case} is not set" + new_template_string \ + = "CONFIG_DRIVERS_HDF_${module_upper_case}=y\n" + old_template_string \ + = "CONFIG_DRIVERS_HDF_${module_upper_case} is not set" else: - new_template_string = "+CONFIG_DRIVERS_HDF_${module_upper_case}=y\n" - old_template_string = "+CONFIG_DRIVERS_HDF_${module_upper_case} is not set" - self._replace_operation(new_string=new_template_string, old_string=old_template_string, + new_template_string \ + = "+CONFIG_DRIVERS_HDF_${module_upper_case}=y\n" + old_template_string = \ + "+CONFIG_DRIVERS_HDF_${module_upper_case} is not set" + self._replace_operation(new_string=new_template_string, + old_string=old_template_string, file_path=file_path) return True