[openwrt-25.12] luci-app-olsr: fix blank olsr pages - #8934
Conversation
openwrt-ai
left a comment
There was a problem hiding this comment.
Commit checks
All five commits carry a (cherry picked from commit <sha>) trailer, but every one of them names the SHA from the author's fix_olsr_undefined_functions fork branch (i.e. the head commits of #8715), not the commit that actually landed on master. #8715 was rebase-merged, so those SHAs are not reachable from openwrt/luci master and the trailers can't be resolved by anyone tracking the branch:
68970ff"luci-app-olsr: fix undefined functions" — trailer says6b7202549e...; on master this isde8614713116ee46c"luci-app-olsr: support large jsoninfo responses" — trailer saysf3ba37d7c6...; on master this isfa03475827a677451"luci-app-olsr: update common_js location" — trailer says2dc9688807...; on master this is675832714fe5954f0"luci-app-olsr: handle multi-line jsoninfo response" — trailer saysfc54e37232...; on master this is4cbdef7f22bccfd51"luci-app-olsr: re-add missing interface creation" — trailer says10b08daa2a...; on master this isd98f03e201
Re-doing the series with git cherry-pick -x de86147131 fa03475827 675832714f 4cbdef7f22 d98f03e201 from origin/master would produce the right trailers.
The diffs themselves match their master counterparts exactly (the only textual difference is one unchanged context line in neighbors.js, link.linkCost === 4194304 on this branch vs == on master, which is pre-existing branch divergence and not introduced here). One missing prerequisite is flagged inline.
Generated by Claude Code
bccfd51 to
82ddd25
Compare
openwrt-ai
left a comment
There was a problem hiding this comment.
Reviewed 6 new commits; no new issues found.
Both items from the previous review are addressed:
- The missing prerequisite is now in the series as
2bd9d7b"luci-app-olsr: correctness fixes", soolsr.etx_color/olsr.snr_colorsare exported before the call sites start using them. - Every
(cherry picked from commit <sha>)trailer now names a commit that is reachable fromopenwrt/lucimaster(0b93761a38,de86147131,fa03475827,675832714f,4cbdef7f22,d98f03e201).
Each of the six commits' diffs is byte-identical to its upstream counterpart, and after the series the luci-app-olsr code tree on this branch matches master at d98f03e201 exactly (only po/* translation files differ, as expected for a backport). There are no non-translation luci-app-olsr commits on master after d98f03e201, so nothing further is pending for this backport.
The one red check (FormalityCheck / Git & Commits, empty body on 2bd9d7b) is inherited verbatim from the upstream commit message; the formality bot already reports it, so I'm not duplicating it here.
Generated by Claude Code
82ddd25 to
2891551
Compare
openwrt-ai
left a comment
There was a problem hiding this comment.
Commit checks
-
7dd7306"luci-app-olsr: correctness fixes" — the message body was added after the(cherry picked from commit ...)trailer, which splits the trailer block and drops the original author's sign-off out of it.git interpret-trailers --parseon this message returns onlySigned-off-by: Victoria Grain <victoria+openwrt@gratux.xyz>; Paul Donald'sSigned-off-by:is now parsed as ordinary body text, and the cherry-pick trailer is no longer the last line. Also, the new sign-off is glued directly to the description line with no blank line between them. Conventional form would be:luci-app-olsr: correctness fixes improve comparison to handle equal values Signed-off-by: Paul Donald <newtwen+github@gmail.com> Signed-off-by: Victoria Grain <victoria+openwrt@gratux.xyz> (cherry picked from commit 0b93761a38825f7d8f9bc2bffb7dc828e8ccb819)Minor: the added line describes only the
a.proto < b.proto ? -1 : ...comparator changes; the same commit also exportsetx_color/snr_colorsfromolsr/common_js(the prerequisite for the rest of this series) and relaxeslink.linkCost === 4194304to==. Worth a word on those too while amending.
No code changed since the last review — git diff 82ddd25..2891551 is empty, and each of the six commits is still patch-identical to its upstream counterpart (0b93761a38, de86147131, fa03475827, 675832714f, 4cbdef7f22, d98f03e201), all reachable from openwrt/luci master. master still has no non-translation luci-app-olsr commits after d98f03e201, so the series remains complete. All four checks on 2891551 are green, including the FormalityCheck / Git & Commits run that the previous head failed.
Generated by Claude Code
improve cost comparison; export common *_color functions Signed-off-by: Paul Donald <newtwen+github@gmail.com> (cherry picked from commit 0b93761) Signed-off-by: Victoria Grain <victoria+openwrt@gratux.xyz>
the functions `etx_color` and `snr_colors` were previously moved to common_js, but their callsites were not updated to match. Signed-off-by: Victoria Grain <victoria+openwrt@gratux.xyz> (cherry picked from commit de86147)
due to ash's argument list limit, large jsons blow up the rpc call. as a workaround, the jsoninfo is escaped manually. Signed-off-by: Victoria Grain <victoria+openwrt@gratux.xyz> (cherry picked from commit fa03475)
common_js was previously moved from common/ to olsr/ but not all references had been updated to match. Signed-off-by: Victoria Grain <victoria+openwrt@gratux.xyz> (cherry picked from commit 6758327)
olsrd seems to always respond with a single line json but this is more robust. Signed-off-by: Victoria Grain <victoria+openwrt@gratux.xyz> (cherry picked from commit 4cbdef7)
commit c567bfc removed the uci.add() call to create a new interface, seemingly without considering its side-effects. this lead to trying to configure a non-existant interface, resulting in an empty settings page. Signed-off-by: Victoria Grain <victoria+openwrt@gratux.xyz> (cherry picked from commit d98f03e)
2891551 to
24c72d8
Compare
openwrt-ai
left a comment
There was a problem hiding this comment.
Reviewed 6 new commits; no new issues found.
The only change since the last review is the commit message of 8376c48 "luci-app-olsr: correctness fixes" (git diff 2891551..24c72d8 is empty), and it resolves the previous comment:
- Body is now placed before the trailer block, so
git interpret-trailers --parsereturns bothSigned-off-by: Paul DonaldandSigned-off-by: Victoria Grain, with the(cherry picked from commit 0b93761a38...)line between them — the standardgit cherry-pick -x -slayout. - The body now covers both halves of the diff (the
a.proto < b.proto ? -1 : ...comparators and theetx_color/snr_colorsexport fromolsr/common_js).
Re-verified the backport itself: all six commits are still patch-identical (git patch-id --stable) to their upstream counterparts 0b93761a38, de86147131, fa03475827, 675832714f, 4cbdef7f22, d98f03e201, and all six are reachable from openwrt/luci master. After the series, the non-po/ applications/luci-app-olsr/ tree on this branch is identical to master, and the only luci-app-olsr commits on master after d98f03e201 are Weblate translation syncs — so nothing further is pending for this backport.
All four checks on 24c72d8 are green.
Generated by Claude Code
Backport of #8715. Original Description:
Pull request details
Description
On OpenWrt 25.12.4 some OLSR Status pages (Neighbours, Routes, Topology), as well as the settings page when adding a new interface, are completely blank.
This PR introduces three fixes to restore functionality:
etx_colorandsnr_colorsfromolsr/common_js(these functions were previously moved, but their call sites had not been updated to match)additionally, some code still referenced
common/common_js. this is now updated toolsr/common_js.Screenshot or video of changes (if applicable)
Maintainer (preferred)
unsure who I should ping here.
last person to touch the Makefile was @systemcrash.
Tested on
OpenWrt version: OpenWrt 25.12.4 (r32933-4ccb782af7)
LuCI version: LuCI openwrt-25.12 branch (26.167.08537~9ccd99b)
Web browser(s): LibreWolf 152.0-1
Checklist
Signed-off-by: <my@email.address>row (viagit commit --signoff).<package name>: titlefirst line subject for packages.PKG_VERSIONin the Makefile.