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

luci-base: fix license #6987

Merged
merged 1 commit into from
Mar 15, 2024
Merged

Conversation

feckert
Copy link
Member

@feckert feckert commented Mar 13, 2024

Mention: @jow- @Ansuel

Description:
During the update of luasrcdiet with commit b5d5e5b the license was incorrectly changed from 'Apache-2.0' to 'MIT'.

As the name implies, this is the basic package that must be installed on the target for the LuCI to work at all. So changing the license from 'Apache-2.0' to 'MIT' should not have happend, because this information belongs to the package 'luci-base' and to the 'luasrcdiet'.

Therefore, with commit b0d8fff the 'luasrcdiet' was moved to its own package. However, it was forgotten to adapt the licence to 'Apache-2.0' again.

While we are at it, also set the 'PKG_LICENSE_FILES' to 'LICENSE' and 'NOTICE'.

@systemcrash
Copy link
Contributor

systemcrash commented Mar 13, 2024

Is the license file in luci repo root also correct?

Mention: @jow- @Ansuel

Description: During the update of luasrcdiet with commit b5d5e5b the license was incorrectly changed from 'Apache-2.0' to 'MIT'.

their license seems correct, which was what was inherited. Is the license in the source repo incorrect?

@jow-
Copy link
Contributor

jow- commented Mar 13, 2024

The PKG_LICENSE in the Makefile refers to the LuCI code license, which is Apache 2.0. The same Makefile also references LuaSrcDiet which is under MIT license. Luckily both licenses are equally permissive so a quick fix might be simply setting PKG_LICENSE to Apache-2.0 MIT.

@feckert
Copy link
Member Author

feckert commented Mar 13, 2024

@jow- I apologise for asking, but the package 'LuaSrcDiet' has been removed with commit b0d8fff from the LuCI feed and added with commit openwrt/packages@46d68b8 to the packages feed.

To be correct the license of luci-base should Apache-2.0 again and not MIT and Apache-2.0?

The PKG_LICENSE_FILES handling is not correct in this pullrequest, because the needed files are two directories above of this Makefile. I have to look at this again.

See https://github.com/openwrt/luci/blob/master/LICENSE
See https://github.com/openwrt/luci/blob/master/NOTICE

During the update of luasrcdiet with commit b5d5e5b
the license was incorrectly changed from 'Apache-2.0' to 'MIT'.

As the name implies, this is the basic package that must be installed on the
target for the LuCI to work at all. So changing the license from 'Apache-2.0'
to 'MIT' should not have happend, because this information belongs to the
package 'luci-base' and to the 'luasrcdiet'.

Therefore, with commit b0d8fff the
'luasrcdiet' was moved to its own package. However, it was forgotten to adapt
the licence to 'Apache-2.0' again.

Signed-off-by: Florian Eckert <[email protected]>
@feckert feckert force-pushed the pr/20240313-luci-base branch from 5358002 to cdede78 Compare March 15, 2024 14:52
@feckert feckert merged commit 72173cc into openwrt:master Mar 15, 2024
3 checks passed
@feckert feckert deleted the pr/20240313-luci-base branch March 15, 2024 14:52
@systemcrash
Copy link
Contributor

@feckert @jow- do any of these license fixes need picking to branches?

@feckert
Copy link
Member Author

feckert commented Mar 27, 2024

@systemcrash If it is simply possible, then I will cherry-pick the next few days

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.

3 participants