Skip to content
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

Merged
merged 1 commit into from
Nov 15, 2019

Conversation

pmelange
Copy link
Contributor

@pmelange pmelange commented Nov 26, 2018

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

@pmelange pmelange changed the title luci: add new dependency to luci-lib-ipkg luci-master: add new dependency to luci-lib-ipkg Nov 26, 2018
@SvenRoederer
Copy link
Contributor

as the code is not changing, just the dependencies, only the revision should be bumped.

SvenRoederer pushed a commit that referenced this pull request Mar 17, 2019
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
SvenRoederer added a commit that referenced this pull request Mar 17, 2019
The package "luci-lib-ipkg" was split from "luci-base" in openwrt/luci@4bbe325.

This is part of #158
@pmelange pmelange force-pushed the dependency-luci-lib-ipkg branch 2 times, most recently from 17c3a83 to d872b4c Compare March 18, 2019 12:30
@pmelange
Copy link
Contributor Author

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.

pmelange added a commit to freifunk-berlin/firmware that referenced this pull request Jun 3, 2019
**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
@pmelange pmelange changed the title luci-master: add new dependency to luci-lib-ipkg Openwrt 19x: luci-master: add new dependency to luci-lib-ipkg Jun 6, 2019
@pmelange
Copy link
Contributor Author

@SvenRoederer Can you please cherry-pick these changes into the daily/upstream-1907 branch?

@SvenRoederer
Copy link
Contributor

I don't see a daily/upstream-1907 branch here.

@pmelange
Copy link
Contributor Author

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

@SvenRoederer
Copy link
Contributor

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 ...

SvenRoederer added a commit that referenced this pull request Jul 6, 2019
The package "luci-lib-ipkg" was split from "luci-base" in openwrt/luci@4bbe325.

This is part of #158
SvenRoederer pushed a commit that referenced this pull request Jul 9, 2019
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
SvenRoederer added a commit to SvenRoederer/freifunk-berlin-firmware that referenced this pull request Aug 8, 2019
SvenRoederer added a commit to freifunk-berlin/firmware that referenced this pull request Aug 8, 2019
SvenRoederer added a commit to freifunk-berlin/firmware that referenced this pull request Oct 14, 2019
This became an issue because the luci-lib-ipkg code has been
removed from luci-base.  The upstream commit is
openwrt/luci@4bbe325
@SvenRoederer SvenRoederer force-pushed the dependency-luci-lib-ipkg branch from d872b4c to 1cd2cd6 Compare November 14, 2019 21:51
@SvenRoederer SvenRoederer merged commit 582fec0 into master Nov 15, 2019
@SvenRoederer SvenRoederer deleted the dependency-luci-lib-ipkg branch November 15, 2019 23:40
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants