alex/esp-idf
1
0
Fork 0
mirror of https://github.com/espressif/esp-idf.git synced 2026-01-19 02:17:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'fix/output_rewrite_v6.0' into 'release/v6.0'

Browse Source 
Fix dependencies for flash targets (v6.0)

See merge request espressif/esp-idf!43992
This commit is contained in:
Roland Dobai
2025-12-11 14:29:41 +01:00
parent 7c4eac9e22 1fbf10c3cf
commit cc39cf4e2b
3 changed files with 16 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
components/partition_table/CMakeLists.txt
View File

@@ -175,6 +175,8 @@ if(CONFIG_APP_BUILD_GENERATE_BINARIES AND CONFIG_APP_BUILD_TYPE_APP_2NDBOOT)
esptool_py_flash_target_image(flash partition-table "${PARTITION_TABLE_OFFSET}"
"${build_dir}/partition_table/${final_partition_bin}")
# Add partition table as a dependency to the partition-table-flash target
add_dependencies(partition-table-flash partition-table)
# Add partition table as a dependency to the flash target
add_dependencies(flash partition_table_bin)

18
tools/idf_py_actions/serial_ext.py
View File

@@ -641,7 +641,8 @@ def action_extensions(base_actions: dict, project_path: str) -> dict:
'callback': flash,
'help': 'Flash the project.',
'options': global_options + flash_options,
'order_dependencies': ['all', 'erase-flash'],
'order_dependencies': ['erase-flash'],
'dependencies': ['all'],
},
'erase-flash': {
'callback': erase_flash,
@@ -1178,31 +1179,36 @@ def action_extensions(base_actions: dict, project_path: str) -> dict:
'callback': flash,
'help': 'Flash partition table only.',
'options': flash_options,
'order_dependencies': ['partition-table', 'erase-flash'],
'order_dependencies': ['erase-flash'],
'dependencies': ['partition-table'],
},
'bootloader-flash': {
'callback': flash,
'help': 'Flash bootloader only.',
'options': flash_options,
'order_dependencies': ['bootloader', 'erase-flash'],
'order_dependencies': ['erase-flash'],
'dependencies': ['bootloader'],
},
'app-flash': {
'callback': flash,
'help': 'Flash the app only.',
'options': flash_options,
'order_dependencies': ['app', 'erase-flash'],
'order_dependencies': ['erase-flash'],
'dependencies': ['app'],
},
'encrypted-app-flash': {
'callback': flash,
'help': 'Flash the encrypted app only.',
'options': flash_options,
'order_dependencies': ['app', 'erase-flash'],
'order_dependencies': ['erase-flash'],
'dependencies': ['app'],
},
'encrypted-flash': {
'callback': flash,
'help': 'Flash the encrypted project.',
'options': flash_options,
'order_dependencies': ['all', 'erase-flash'],
'order_dependencies': ['erase-flash'],
'dependencies': ['all'],
},
'erase-otadata': {
'callback': ota_targets,

4
tools/test_idf_py/test_idf_py.py
View File

@@ -99,7 +99,7 @@ class TestDependencyManagement(TestWithoutExtensions):
args=['--dry-run', 'flash'],
standalone_mode=False,
)
self.assertEqual(['flash'], list(result.keys()))
self.assertEqual(['all', 'flash'], list(result.keys()))
def test_order_only_dependencies(self):
result = idf.init_cli()(
@@ -120,7 +120,7 @@ class TestDependencyManagement(TestWithoutExtensions):
args=['--dry-run', 'clean', 'monitor', 'clean', 'fullclean', 'flash'],
standalone_mode=False,
)
self.assertEqual(['fullclean', 'clean', 'flash', 'monitor'], list(result.keys()))
self.assertEqual(['fullclean', 'clean', 'all', 'flash', 'monitor'], list(result.keys()))
def test_dupplicated_commands_warning(self):
capturedOutput = StringIO()