-
Notifications
You must be signed in to change notification settings - Fork 12
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
Openwrt 19x: luci-master: add new dependency to luci-lib-ipkg #158
Conversation
as the code is not changing, just the dependencies, only the revision should be bumped. |
This became an issue because the luci-lib-ipkg code has been removed from luci-base. The upstream commit is openwrt/luci@4bbe325 This implemtents #158 Versionnumbering changed by Sven Roederer
The package "luci-lib-ipkg" was split from "luci-base" in openwrt/luci@4bbe325. This is part of #158
17c3a83
to
d872b4c
Compare
Done, but the branch is so out of date from the master branch that both makefiles cause a conflict. There are currently many PR's which are modifying the makefiles. As soon as one is committed, all the others instantly cause conflicts. Therefore, I would prefer to wait until we move to the 19.x branch, and all other commits are merged, before attempting to resolve this conflict. |
**Do not merge until the firmware is based on OpenWRT 19.x** **freifunk-berlin/firmware-packages#158 needs to be merged first** The comment from the upstream commit is: Add a new luci-app-opkg which is a feature-complete replacement for the builtin opkg functionality of luci-mod-system using mostly client side JavaScript to reduce the amount of server side processing. luci-app-opkg is not added to the 4MB devices. See #626 The upstream commit in openwrt/luci is openwrt/luci@aa2e0e2 The freifunk-berlin issue is #621
@SvenRoederer Can you please cherry-pick these changes into the daily/upstream-1907 branch? |
I don't see a daily/upstream-1907 branch here. |
OK, then whatever branch is being used to build the upstream-1907 images. Perhaps you haven't tested the upstream-1907 images, but luci produces errors that these changes fix |
The firmware-barnch "daily/upstream-1907" uses master-branch of this repo. I Don't like the idea of adding an other branch, that needs additional maintenance ... |
The package "luci-lib-ipkg" was split from "luci-base" in openwrt/luci@4bbe325. This is part of #158
This became an issue because the luci-lib-ipkg code has been removed from luci-base. The upstream commit is openwrt/luci@4bbe325 This implemtents #158 Versionnumbering changed by Sven Roederer
This became an issue because the luci-lib-ipkg code has been removed from luci-base. The upstream commit is openwrt/luci@4bbe325
d872b4c
to
1cd2cd6
Compare
Do not merge before the firmware is based off of OpenWRT 19.x
This is specific for the luci-master branch
This became an issue because the luci-lib-ipkg code has been
removed from luci-base. The upstream commit is
openwrt/luci@4bbe325