zenoh: bump to 1.10.1 - #83
Merged
Merged
Conversation
1.10.1 is a bugfix release. Two fixes matter here: #1304 adds the src/runtime/*.c glob to zephyr/CMakeLists.txt upstream, which is exactly the workaround patch-zenoh injected for zenoh-pico#1232, and #1122 replaces the monotonic thread_index++ in the Zephyr pthread stack pool with slot release on join. The latter is latent for us today - rasprover opens one session and never reconnects - but the third reconnect would have indexed past thread_stack_area[]. PR #1307 also added Z_MAX_NUM_SCOUT_INTERFACES to config.h.in, and scout.c uses it to size two static vectors. The Zephyr glob compiles src/session/*.c unconditionally, so the generated config.h has to define it or the build breaks; mirror upstream's Z_FEATURE_SCOUTING conditional rather than hard-coding 10. Drop the now-redundant CMake patch, and fold the restore/repatch cycle into west-update: patch-zenoh edits tracked files in place, so every revision bump aborted with "local changes would be overwritten by checkout". Only the three files that task rewrites are restored, so unrelated PR work in the checkout still stops the update. setup no longer needs its trailing patch-zenoh. Verified: west-update succeeds against a dirty zenoh checkout and re-applies the patches, and rasprover --sysbuild builds green. Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>
west-update advanced deps/zephyr to 558fdf2ce48b. check-skills reports no symbol drift - all 758 cited CONFIG_* symbols still resolve - so this is a stamp refresh only. Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>
CI restores a cached deps/, and that cache was written by the older patch-zenoh which injected the src/runtime glob into zephyr/CMakeLists.txt. The restore list only covered files the current task writes, so that stale edit survived and still aborted the checkout with "local changes would be overwritten" - every build job failed, not just the zenoh ones. Restore that file too. Reproduced locally by rewinding zenoh to 1.10.0 with a stale CMakeLists edit: bare west update aborts, west-update now advances to 1.10.1 and re-patches. Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Summary
zenoh-pico 1.10.1 is a bugfix release with nothing new in the API. Two of the four fixes matter for this workspace:
"../src/runtime/*.c"tozephyr/CMakeLists.txtupstream — byte-identical to the workaroundpatch-zenohinjected for zenoh-pico#1232. Ours is deleted.thread_index++in the Zephyr pthread stack pool with slot release on join, and addsCONFIG_ZENOH_PICO_THREADS_NUM. Latent for us —rasproveropens one session and never reconnects — but the third reconnect would have indexed pastthread_stack_area[].Not applicable: #1307 (scout on all interfaces — we use an explicit TCP locator, no scouting; the interface enumeration is posix/LwIP only) and #1306 (inverted fragment reliability flag — payloads are tens of bytes against a 2048 batch size).
The one thing that would have broken the build
#1307 added
Z_MAX_NUM_SCOUT_INTERFACEStoconfig.h.in, andscout.c:33,38uses it to size two static vectors. The Zephyr glob compilessrc/session/*.cunconditionally, soscout.cbuilds even with scouting off — and our hand-synthesisedconfig.hdoesn't inherit fromconfig.h.in. Added it in upstream's#if Z_FEATURE_SCOUTINGform rather than hard-coding, so it stays correct if scouting is ever enabled.west-update fix
patch-zenohedits tracked files in place, so every zenoh revision bump aborted withlocal changes would be overwritten by checkout.west-updatenow restores → updates → re-patches. It restores only the three files that task rewrites, so unrelated PR work in the checkout still stops the update, and it's guarded on the checkout existing so a fresh-clonesetupdoesn't die underset -e.setupno longer needs its trailingpatch-zenoh.Verification
west-updaterun against a deliberately dirty (patched) zenoh checkout: updates clean, patches re-applied.mise run app rasprover --sysbuildbuilds green.mise run check-skills: all 758 citedCONFIG_*symbols resolve, no stale stamps.Skill restamp is a separate commit — stamps only, no symbol drift.
🤖 Generated with Claude Code