cmake: Fix SYS_BL_UPDATE param (Sponsored by CubePilot) #23158
Conversation
| @@ -121,7 +121,6 @@ add_custom_command( | |||
| ${romfs_gen_root_dir}/init.d/rc.autostart | |||
| ${romfs_gen_root_dir}/init.d/rc.autostart.post | |||
| ${romfs_copy_stamp} | |||
| COMMAND ${CMAKE_COMMAND} -E remove_directory ${romfs_gen_root_dir}/* | |||
There was a problem hiding this comment.
I'm not sure, did you verify this is still working cleanly with ROMFS changes and incremental rebuilds?
There was a problem hiding this comment.
I believe the proper solution to all of this would be to have 1-1 dependencies for every file, then everything would actually work as intended, including clean, and other subtle dependencies.
The blocker is that airframes can be tagged excluded (processed through python scripts) and the actual build system is oblivious to this.
There was a problem hiding this comment.
I assume it won't work cleanly with ROMFS changes. That's what I wrote in my message.
There was a problem hiding this comment.
I honestly don't know exactly the way you want to fix this all properly. It's all a bit of a mystery to me.
So, if you come with an alternative fix in the next few days, fine, otherwise I suggest we merge this, or remove the param and the functionality. It's currently broken and we need to either fix or remove it.
There was a problem hiding this comment.
Let's try to avoid leaving something in a broken state in exchange for a quick fix. I won't be able to take a closer look until Thursday, but if you need a short term fix you could try including the init logic by default, just be careful it fails gracefully if the param or file doesn't exist.
There was a problem hiding this comment.
Would we be able to make the ability to add files in a board init folder automatic? If it exits copy it in to the romfs. Then a script in the boards init files could reference the files and allow for a more structured init, and shared init files.
There was a problem hiding this comment.
Alright, I'll leave this to you to fix then.
There was a problem hiding this comment.
@dagar reminder that you wanted to fix this properly...
|
Should we reconsider this fix? |
|
@dagar I'm reopening this because you have not suggested an alternative yet as you said you would. Sorry to be snarky like that but I find it frustrating to have a fix blocked for something that's just completely broken. |
It turns out that the rc.board_bootloader_upgrade file was removed each time. By no longer doing the remove_directory call, we will probably accumulate files that are removed over time without a clean build but I'd think we can live with that.
julianoes
force-pushed
the
pr-fix-sys-bl-update
branch
from
31dd51a
to
59da941
Compare
It turns out that the rc.board_bootloader_upgrade file was removed each time.
By no longer doing the remove_directory call, we will probably accumulate files that are removed over time without a clean build but I'd think we can live with that.
Fixes #20592