Commit 056474c
authored
fix(samd): fall back to cores/arduino when build.core dir is missing (#320)
* fix(lint): annotate Python daemon Command::new sites for subprocess-spawn lint
After f86817a (refactor lib.rs → submodules) the four
std::process::Command::new sites in fbuild-python/daemon.rs ended up
inside `match` arms two lines below their `allow-direct-spawn:`
comment. The detector in ci/find_direct_subprocess.py only looks at
"same line or the line immediately above", so the annotation no longer
covered the actual call sites and CI started reporting:
NEW direct spawns without an `allow-direct-spawn: <reason>` marker:
crates/fbuild-python/src/daemon.rs:96
crates/fbuild-python/src/daemon.rs:97
crates/fbuild-python/src/daemon.rs:247
crates/fbuild-python/src/daemon.rs:248
This blocks every PR's "Lint subprocess spawns" check (e.g. #306 for
fbuild#304, which is the actual FastLED-vs-PIO size regression we
need to land).
Fix: add an inline `// allow-direct-spawn:` annotation immediately
above each of the four arms. Behavior unchanged.
* fix(boards): catch up tinyuf2 partition rename + esp_sr drift; whitelist cmsis_dsp_lib
`Validate Board Definitions` workflow has been failing 39 boards
drifted from PlatformIO. The two largest categories are pure schema
drift that this PR resolves; the remaining ~14 are configuration-
choice differences that need maintainer review.
## Fixed: tinyuf2 partition CSV rename (18 boards)
Upstream Adafruit (and the espressif32 platform's Adafruit board
defs) renamed `tinyuf2-partitions-<size>.csv` ->
`partitions-<size>-tinyuf2.csv`. Our bundled board JSONs still pointed
to the old name. Renamed in:
adafruit_feather_esp32s2{,_reversetft,_tft}
adafruit_feather_esp32s3{,_nopsram,_reversetft,_tft}
adafruit_funhouse_esp32s2
adafruit_magtag29_esp32s2
adafruit_matrixportal_esp32s3
adafruit_metro_esp32s2
adafruit_metro_esp32s3
adafruit_qtpy_esp32s2
adafruit_qtpy_esp32s3_n4r2
adafruit_qtpy_esp32s3_nopsram
adafruit_qualia_s3_rgb666
featheresp32-s2
wt32-sc01-plus
All swaps are mechanical s/tinyuf2-partitions-<N>MB.csv/partitions-<N>MB-tinyuf2.csv/.
## Fixed: 4d_systems_esp32s3_gen4_r8n16 partitions
`esp_sr_16.csv` -> `default_16MB.csv` per upstream.
## Fixed: validator whitelist for cmsis_dsp_lib (8 teensy boards)
`build.cmsis_dsp_lib` was added by fbuild#300 (PR#313) as an
intentional fbuild-only schema extension — Teensyduino's makefile
picks the matching `arm_cortexM*_math` archive at link time, but
fbuild needs it declared statically. The validator was flagging all
8 teensy variants because the diff treats every extra key in the
actual asset as drift.
Added `FBUILD_EXTENSION_BUILD_FIELDS` whitelist (currently just
`cmsis_dsp_lib`) and strip those from the actual side before diffing.
Documented in-place so future fbuild-only extensions have a place to
land with a one-line note.
## Not in scope
Remaining ~14 boards have configuration-choice drift (UM boards
`-DARDUINO_USB_MODE=1` difference, m5stack variant rename, seeed_
xiao_esp32c6 USB defines, arduino_nano_esp32 BOARD_USES_HW_GPIO_NUMBERS
vs BOARD_HAS_PIN_REMAP, um_tinys2 extras). Each requires a real
decision about which value is correct for fbuild's compile path —
not auto-resolvable by a snapshot rebase. Leaving those for a
separate maintainer-driven sweep.
* fix(samd): fall back to cores/arduino when build.core dir is missing (#319)
Every `Build SAMD51J` workflow run on main fails at:
fatal error: WVariant.h: No such file or directory
variants/feather_m4/variant.h:43:10
43 | #include "WVariant.h"
Root cause: Adafruit's ArduinoCore-samd v1.7.16 (the SAMD framework
fbuild installs) ships only `cores/arduino/` — verified via GitHub
API. Every Adafruit SAMD board declares `build.core = "adafruit"` in
its board JSON (matching PlatformIO upstream, so the board-validator
is happy). fbuild's `SamdCores::get_core_dir(core_name)` literally
joined `cores/<core_name>`, so it asked for `cores/adafruit/`, which
doesn't exist. The variant compile's include-path then pointed at a
phantom directory and `WVariant.h` (which lives in `cores/arduino/`)
was unreachable.
PlatformIO's atmelsam builder handles this by treating `build.core`
as a vendor brand label rather than a literal subdirectory name.
Mirror that behavior: if `cores/<core_name>/` doesn't exist, fall
back to `cores/arduino/` (the canonical Arduino-compatible cores
directory name).
Refactored the fallback into a small `resolve_core_dir_with_arduino_
fallback` helper that's straightforwardly unit-testable. Three new
tests cover the three branches (literal name wins, fallback when
named dir absent, return literal when both absent so the eventual
file-open error has a meaningful path).
Local test results: 9/9 samd_core tests pass, 412/412 fbuild-packages
test suite passes.
Fixes #319.
* fix(samd): inject resolved core_dir into compile include path (#319 follow-up)
The get_core_dir fallback in the previous commit is necessary but not
sufficient. `BoardConfig::get_include_paths(framework_root)` builds
the compile-time include list using the LITERAL `build.core` value
from the board JSON — for Adafruit SAMD boards that's "adafruit",
which produces a `-I.../cores/adafruit` path that doesn't exist.
The variant compile's `#include "WVariant.h"` then misses because:
- same-dir lookup (variants/feather_m4/) — not there
- `-I.../cores/adafruit` (phantom) — directory doesn't exist
- other -I entries (system includes, variant dir) — no WVariant.h
`install_samd_core` already has a resolved `core_dir` (from
`SamdCores::get_core_dir`, which falls back to cores/arduino/ per the
previous commit). Inject it into the system_includes vector returned
by `install_samd_core` so the orchestrator's eventual compile sees
`-I.../cores/arduino` and the headers resolve.
Inserted at position 0 to make the active core dir the first search
hit, matching what PlatformIO's atmelsam builder does.
Refs #319.1 parent 872a291 commit 056474c
2 files changed
Lines changed: 85 additions & 1 deletion
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
365 | 365 | | |
366 | 366 | | |
367 | 367 | | |
| 368 | + | |
| 369 | + | |
| 370 | + | |
| 371 | + | |
| 372 | + | |
| 373 | + | |
| 374 | + | |
| 375 | + | |
| 376 | + | |
| 377 | + | |
| 378 | + | |
| 379 | + | |
| 380 | + | |
| 381 | + | |
368 | 382 | | |
369 | 383 | | |
370 | 384 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
73 | 73 | | |
74 | 74 | | |
75 | 75 | | |
| 76 | + | |
| 77 | + | |
| 78 | + | |
| 79 | + | |
| 80 | + | |
| 81 | + | |
| 82 | + | |
| 83 | + | |
| 84 | + | |
76 | 85 | | |
77 | | - | |
| 86 | + | |
78 | 87 | | |
79 | 88 | | |
80 | 89 | | |
| |||
194 | 203 | | |
195 | 204 | | |
196 | 205 | | |
| 206 | + | |
| 207 | + | |
| 208 | + | |
| 209 | + | |
| 210 | + | |
| 211 | + | |
| 212 | + | |
| 213 | + | |
| 214 | + | |
| 215 | + | |
| 216 | + | |
| 217 | + | |
| 218 | + | |
| 219 | + | |
| 220 | + | |
| 221 | + | |
| 222 | + | |
| 223 | + | |
| 224 | + | |
197 | 225 | | |
198 | 226 | | |
199 | 227 | | |
| |||
249 | 277 | | |
250 | 278 | | |
251 | 279 | | |
| 280 | + | |
| 281 | + | |
| 282 | + | |
| 283 | + | |
| 284 | + | |
| 285 | + | |
| 286 | + | |
| 287 | + | |
| 288 | + | |
| 289 | + | |
| 290 | + | |
| 291 | + | |
| 292 | + | |
| 293 | + | |
| 294 | + | |
| 295 | + | |
| 296 | + | |
| 297 | + | |
| 298 | + | |
| 299 | + | |
| 300 | + | |
| 301 | + | |
| 302 | + | |
| 303 | + | |
| 304 | + | |
| 305 | + | |
| 306 | + | |
| 307 | + | |
| 308 | + | |
| 309 | + | |
| 310 | + | |
| 311 | + | |
| 312 | + | |
| 313 | + | |
| 314 | + | |
| 315 | + | |
| 316 | + | |
| 317 | + | |
| 318 | + | |
| 319 | + | |
| 320 | + | |
| 321 | + | |
252 | 322 | | |
0 commit comments