-
Notifications
You must be signed in to change notification settings - Fork 2.5k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
luci-base: move some generic classes into a separate luci-base-libs package #2817
Conversation
a later version of this code should not have a separate Makefile, the luci-base packge should be modified to generate both packages. Edit: not sure about this idea |
@feckert just seen that you marked it with WIP-flag and not gave it a NACK yet. So I'll continue to work on this. |
da1cb64
to
9890b30
Compare
I pushed the missing changes to finish the integration of the rearranged libraries. I ran a test based on "luci-mod-admin-full". @feckert can you review? |
this is a squashed version of openwrt/luci#2817
this is a squashed version of openwrt/luci#2817
This is a backport of openwrt/luci#2817 for OpenWrt-19.07
This is a backport of openwrt/luci#2817 for OpenWrt-19.07
This is a backport of openwrt/luci#2817 for OpenWrt-19.07
9890b30
to
83408a1
Compare
Just rebased to recent master. Any other issues preventing from merging? |
@SvenRoederer from my side ok, but that's up to @jow- if he wants to merge this. A little question then. If you don't need the LuCI you have still include the whole LuCI feed repo during compilation and build. Doesn't it make then not more sense to move it into the package feed? |
our package |
@jow- What do you think on this? |
83408a1
to
ce8fb70
Compare
@jow- ping ... I would be happy to get your feedback on this idea. |
ce8fb70
to
4dd1f89
Compare
@jow- @NeoRaider @hnyman as @feckert mentioned above (#2817 (comment)) this PR looks fine. |
Did you actually runtime test all LuCI views with this change? I do see that dispatcher.lua still references |
4dd1f89
to
4e3774f
Compare
@SvenRoederer I'm really not the right person to ping about LuCI packaging - I personally don't use LuCI, and Gluon doesn't even include the feed anymore. |
* changes to luci-app-travelmate
* changes to luci-app-travelmate
@SvenRoederer Sorry I can't help you there either! |
I don't think we should move |
As mentioned this change was driven by keeping some commandline tools working on 4MB devices which don't provide a web-ui (no uhhtp, no luci web-framework).
@jow- Every change has this potential, but I think the change of having luci authenticate trough the rpcd had much more consequences. Here the worst case is adding a new "require" line and replacing "util" by "xml". |
Please add wrappers to luci.util restoring this functionality. You can lazy-load luci.xml if needed. |
a451d67
to
9c178e6
Compare
@jow- added a wrapper to luci.util which calls the luci.xml functions. Also added a message that the code should be updated to use luci.xml directly. |
To complete the previous commit these functions are defined in the resulting luci-base package but are also used in the new luci-base-libs package. So move them into the new xml-module of the new package. Signed-off-by: Sven Roederer <freifunk@it-solutions.geroedel.de>
In teh previous commit the luci.xml module was created, Let'S change all references to the old functions to the new xml-module. Signed-off-by: Sven Roederer <freifunk@it-solutions.geroedel.de>
To satisfy the dependencies. Signed-off-by: Sven Roederer <freifunk@it-solutions.geroedel.de>
9c178e6
to
59f8d09
Compare
@jow- can you check again for a merge? Added the compatibility-wrapper |
@jow- Did you had a chance to review this PR again after adding the compatibility-wrapper as requested? |
Thanks |
- see openwrt/luci#2817 - OpenWrt-LuCI: 7edd635026594da577b73f059c0d8b95d653f8fc, 354e4cb4a70d576a4f02e024f3c8fb1e72f09350, 68521fca04e9b2ae801cc2daa4f920a2c43bc03f
The new package luci-base-libs provides the modules that not strictly relate to the web-interface of luci. By separating these libs they can be used by other packages without having to install the web-components.
This change was inspired by providing a shell-only interface for 4MB-flash devices, by keeping as much code common with a full install. Dropping the luci-web stuff reduces the package by 100kb.