nut: bump version and add migration#29592
Conversation
Due to recent CI changes, it is not longer possible to have NUT drivers in /lib/nut, instead they must be in /usr/libexec/nut (as they are executable binaries not libraries). PR openwrt/packages#29592 will make that change for the `nut` package on openwrt/packages. We update luci-app-nut so that it can work with either location. As a side benefit, this means this commit does not need to wait for the above PR to land in packages before adding this commit. While we are here, fix a typo on section title. Signed-off-by: Daniel F. Dickinson <dfdpublic@wildtechgarden.ca>
|
@GeorgeSapkin To test the version of the drivers (which is correctly reported), the test-override.sh needs to access the package's /usr/libexec/nut/<driver> binary. Where is /usr/libexec/nut located in the CI? EDIT: Nevermind. I figured out that I missed a commit when I redid the PR. |
|
CI all green! 🎉 |
There was a problem hiding this comment.
Pull request overview
This PR updates the OpenWrt nut package to upstream 2.8.5 and adds migration/version-test support for the package’s updated layout and monitor configuration.
Changes:
- Bumps
nutversion/hash and updates driver install/runtime path to/usr/libexec/nut. - Adds a
test-version.shoverride for NUT subpackages. - Adds a
nut-monitorUCI migration script and installs it viauci-defaults.
Reviewed changes
Copilot reviewed 6 out of 6 changed files in this pull request and generated 2 comments.
Show a summary per file
| File | Description |
|---|---|
net/nut/Makefile |
Updates package version metadata, driver path/configure args, driver list, and installs the migration script. |
net/nut/test-version.sh |
Adds package-specific version checks for NUT binaries/drivers. |
net/nut/files/nutshutdown |
Updates driver execution path. |
net/nut/files/nut-server.init |
Updates runtime driver paths and copyright. |
net/nut/files/nut-monitor-migrate.default |
Adds UCI migration logic for old monitor/notification configuration. |
net/nut/files/nut-cgi.init |
Updates copyright year range. |
💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.
ef6abb4 to
5b1ad8c
Compare
The problem with last minutes changes that one doesn't get reviewed... Should be fixed now. |
ea6d8d4 to
d4aa58c
Compare
Due to recent CI changes, it is not longer possible to have NUT drivers in /lib/nut, instead they must be in /usr/libexec/nut (as they are executable binaries not libraries). PR openwrt/packages#29592 will make that change for the `nut` package on openwrt/packages. We update luci-app-nut so that it can work with either location. As a side benefit, this means this commit does not need to wait for the above PR to land in packages before adding this commit. While we are here, fix a typo on section title. Signed-off-by: Daniel F. Dickinson <dfdpublic@wildtechgarden.ca>
|
Given #29390 (comment) could CI be re-run to make sure all is good, and this merged? |
Bump version to latest stable release. Adjust configure and drivers as needed. Signed-off-by: Daniel F. Dickinson <dfdpublic@wildtechgarden.ca>
They are executables not libraries, so move the UPS drivers to /usr/libexec/nut. Signed-off-by: Daniel F. Dickinson <dfdpublic@wildtechgarden.ca>
For files with an existing OpenWrt copyright notation, update to include 2026 for scripts which have been updated this year. Per openwrt#29390 (comment) Signed-off-by: Daniel F. Dickinson <dfdpublic@wildtechgarden.ca>
Allow CI to pass by skipping the generic version check where it not appropriate. Signed-off-by: Daniel F. Dickinson <dfdpublic@wildtechgarden.ca>
Add previously missed migration script (uci-defaults) for changes to nut-monitor initscript. Created with the help of iterative code reviews by Qwen3.6-27B (LLM model) running on llama.cpp (local LLM server), controlled by LATE. Signed-off-by: Daniel F. Dickinson <dfdpublic@wildtechgarden.ca>
Extra quotes were being interpreted literally, preventing proper ups driver stop and/or reload. Signed-off-by: Daniel F. Dickinson <dfdpublic@wildtechgarden.ca>
d4aa58c to
e8b15c8
Compare
Apparently the CI wants to 'see' the version not just get a return code, so emit the version when we have one. Signed-off-by: Daniel F. Dickinson <dfdpublic@wildtechgarden.ca>
📦 Package Details
Maintainer: @danielfdickinson
Also notify: @BKPepe @systemcrash
Description:
Created with the help of iterative code reviews by Qwen3.6-27B (LLM model) running on llama.cpp (local LLM server), controlled by LATE.
🧪 Run Testing Details
✅ Formalities