fix: rename imx8m bare hook so binman pkg_resources patch can run#9752
fix: rename imx8m bare hook so binman pkg_resources patch can run#9752igorpecovnik merged 1 commit intomainfrom
Conversation
📝 WalkthroughWalkthroughThe i.MX8M bootloader hook in ChangesHook Naming Convention Update
Estimated code review effort🎯 2 (Simple) | ⏱️ ~10 minutes Poem
🚥 Pre-merge checks | ✅ 5✅ Passed checks (5 passed)
✏️ Tip: You can configure your own custom pre-merge checks in the settings. ✨ Finishing Touches📝 Generate docstrings
🧪 Generate unit tests (beta)
Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out. Comment |
bae3951 to
cdaa28c
Compare
`imx8m.conf` defined a bare `pre_config_uboot_target()`. The framework treats a bare hook as the full implementation and drops any `pre_config_uboot_target__<purpose>` companions, so #9407's auto-enabled `uboot-binman-fix-pkg-resources` extension was never firing on i.MX 8M boards — `tools/binman/control.py`'s `import pkg_resources` stayed unpatched, and `make flash.bin` died with `ModuleNotFoundError` on Python 3.12 / setuptools >= 82. Rename to `pre_config_uboot_target__imx8m_firmware()`. Body unchanged. Both hooks now register and run; order between them doesn't matter (NXP firmware fetch vs. Python source rewrite are independent). Repro: armbian/os run 25262303737, job uboot-mba8mpxl-ras314-current.
cdaa28c to
96ab5bf
Compare
Symptom
uboot-mba8mpxl-ras314-currentnightly fails atBINMAN flash.binwithModuleNotFoundError: No module named 'pkg_resources'. Run 25262303737.Cause
config/sources/families/imx8m.conf:32definespre_config_uboot_target()(bare). The framework treats a bare hook as the full implementation and silently drops any<hook>__<purpose>companions:So #9407's binman-fix extension never patches
tools/binman/control.pyon i.MX 8M boards. Combined with setuptools >= 82 droppingpkg_resources, the u-boot v2024.04 binman blows up the momentmake flash.binruns.Fix
Rename to
pre_config_uboot_target__imx8m_firmware(). Body unchanged — same NXP firmware fetch + per-board copy. Both hooks now coexist and run; order doesn't matter (firmware blob copy vs. Python source rewrite are independent).Test plan
Patching binmaninfo line should appear andmake flash.bincomplete.mba8mpxl,imx8mp-tqma8mpql-mba8mpxl) builds clean.Summary by CodeRabbit
Refactor
Documentation