|
53 | 53 | env = DefaultEnvironment() |
54 | 54 | env.SConscript("_embed_files.py", exports="env") |
55 | 55 |
|
| 56 | +# Allow changes in folders of managed components |
| 57 | +os.environ["IDF_COMPONENT_OVERWRITE_MANAGED_COMPONENTS"] = "1" |
| 58 | + |
56 | 59 | platform = env.PioPlatform() |
57 | 60 | board = env.BoardConfig() |
58 | 61 | mcu = board.get("build.mcu", "esp32") |
59 | 62 | idf_variant = mcu.lower() |
60 | 63 |
|
61 | | -# Required until Arduino switches to v5 |
62 | 64 | IDF5 = ( |
63 | 65 | platform.get_package_version("framework-espidf") |
64 | 66 | .split(".")[1] |
@@ -655,7 +657,8 @@ def generate_project_ld_script(sdk_config, ignore_targets=None): |
655 | 657 | "sections.ld.in", |
656 | 658 | ) |
657 | 659 |
|
658 | | - if IDF5: |
| 660 | + framework_version = [int(v) for v in get_framework_version().split(".")] |
| 661 | + if framework_version[:2] > [5, 2]: |
659 | 662 | initial_ld_script = preprocess_linker_file( |
660 | 663 | initial_ld_script, |
661 | 664 | os.path.join( |
@@ -1257,7 +1260,7 @@ def _get_installed_pip_packages(python_exe_path): |
1257 | 1260 | "future": ">=0.18.3", |
1258 | 1261 | "pyparsing": ">=3.1.0,<4" if IDF5 else ">=2.0.3,<2.4.0", |
1259 | 1262 | "kconfiglib": "~=14.1.0" if IDF5 else "~=13.7.1", |
1260 | | - "idf-component-manager": "~=1.5.2" if IDF5 else "~=1.0", |
| 1263 | + "idf-component-manager": "~=2.0.1" if IDF5 else "~=1.0", |
1261 | 1264 | "esp-idf-kconfig": ">=1.4.2,<2.0.0" |
1262 | 1265 | } |
1263 | 1266 |
|
@@ -1414,7 +1417,8 @@ def get_python_exe(): |
1414 | 1417 | "memory.ld.in", |
1415 | 1418 | )) |
1416 | 1419 |
|
1417 | | - if IDF5: |
| 1420 | + framework_version = [int(v) for v in get_framework_version().split(".")] |
| 1421 | + if framework_version[:2] > [5, 2]: |
1418 | 1422 | initial_ld_script = preprocess_linker_file( |
1419 | 1423 | initial_ld_script, |
1420 | 1424 | os.path.join( |
|
0 commit comments