Merge branch 'contrib/github_pr_12052_v5.1' into 'release/v5.1'

Two small patches for build system and fatfs (GitHub PR) (v5.1)

See merge request espressif/esp-idf!26431
This commit is contained in:
Ivan Grokhotkov
2023-11-14 17:16:43 +08:00
2 changed files with 10 additions and 4 deletions

View File

@@ -270,7 +270,7 @@ def action_extensions(base_actions: Dict, project_path: str) -> Dict:
r.append('set confirm on')
r.append('end')
r.append('')
return os.linesep.join(r)
return '\n'.join(r)
raise FatalError(f'{ESP_ROM_INFO_FILE} file not found. Please check IDF integrity.')
def generate_gdbinit_files(gdb: str, gdbinit: Optional[str], project_desc: Dict[str, Any]) -> None: