Skip to content

arch/s390x: redistribute under apache2 license#59809

Merged
batrick merged 2 commits intoceph:mainfrom
batrick:i68084
Sep 19, 2024
Merged

arch/s390x: redistribute under apache2 license#59809
batrick merged 2 commits intoceph:mainfrom
batrick:i68084

Conversation

@batrick
Copy link
Member

@batrick batrick commented Sep 16, 2024 •
edited
Loading

Contribution Guidelines

  • To sign and title your commits, please refer to Submitting Patches to Ceph.

  • If you are submitting a fix for a stable branch (e.g. "quincy"), please refer to Submitting Patches to Ceph - Backports for the proper workflow.

  • When filling out the below checklist, you may click boxes directly in the GitHub web UI. When entering or editing the entire PR message in the GitHub web UI editor, you may also select a checklist item by adding an x between the brackets: [x]. Spaces and capitalization matter when checking off items this way.

Checklist

  • Tracker (select at least one)
    • References tracker ticket
    • Very recent bug; references commit where it was introduced
    • New feature (ticket optional)
    • Doc update (no ticket needed)
    • Code cleanup (no ticket needed)
  • Component impact
    • Affects Dashboard, opened tracker ticket
    • Affects Orchestrator, opened tracker ticket
    • No impact that needs to be tracked
  • Documentation (select at least one)
    • Updates relevant documentation
    • No doc update is appropriate
  • Tests (select at least one)
Show available Jenkins commands
  • jenkins retest this please
  • jenkins test classic perf
  • jenkins test crimson perf
  • jenkins test signed
  • jenkins test make check
  • jenkins test make check arm64
  • jenkins test submodules
  • jenkins test dashboard
  • jenkins test dashboard cephadm
  • jenkins test api
  • jenkins test docs
  • jenkins render docs
  • jenkins test ceph-volume all
  • jenkins test ceph-volume tox
  • jenkins test windows
  • jenkins test rook e2e

@batrick batrick requested a review from idryomov September 16, 2024 18:33
@batrick batrick requested a review from a team as a code owner September 16, 2024 18:33
@batrick batrick changed the title I68084 arch/s390x: redistributed under apache2 license Sep 16, 2024
@batrick
Copy link
Member Author

batrick commented Sep 16, 2024

@aliakseimakarau PTAL

@batrick batrick mentioned this pull request Sep 16, 2024
Merged
14 tasks
@batrick
Copy link
Member Author

batrick commented Sep 17, 2024

jenkins test api

idryomov
idryomov reviewed Sep 17, 2024
View reviewed changes
Copy link
Contributor

@idryomov idryomov left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This adds Apache 2.0 splats to src/arch/s390x.h and src/arch/s390x.c, but these files contain just Aliaksei's original enablement/wiring up work, which likely wasn't intended to be excepted from Ceph's default "LGPL-2.1 or LGPL-3" license at all. With Aliaksei's ack, we could probably just get rid of src/arch/*s390x* mask in COPYING.

Where making it clear that we are redistributing only under Apache 2.0 and not GPL 2 or later is important is files matching src/common/*s390x* mask as some of the code there comes from https://github.com/linux-on-ibm-z/crc32-s390x -- this is where that entry in COPYING is rooted.

@aliakseimakarau
Copy link
Contributor

aliakseimakarau commented Sep 17, 2024

@aliakseimakarau PTAL

LGTM

@anthonyeleven
Copy link
Contributor

anthonyeleven commented Sep 17, 2024

@aliakseimakarau PTAL

LGTM

Z0MG!

@batrick
Copy link
Member Author

batrick commented Sep 17, 2024

This adds Apache 2.0 splats to src/arch/s390x.h and src/arch/s390x.c, but these files contain just Aliaksei's original enablement/wiring up work, which likely wasn't intended to be excepted from Ceph's default "LGPL-2.1 or LGPL-3" license at all. With Aliaksei's ack, we could probably just get rid of src/arch/*s390x* mask in COPYING.

Thanks!

Where making it clear that we are redistributing only under Apache 2.0 and not GPL 2 or later is important is files matching src/common/*s390x* mask as some of the code there comes from https://github.com/linux-on-ibm-z/crc32-s390x -- this is where that entry in COPYING is rooted.

I missed the common/390x files. Thanks for noticing!

idryomov
idryomov reviewed Sep 17, 2024
View reviewed changes
@batrick
arch/s390x: add license notices, use LGPL
33e3f8d 
These are original code files introduced by Aliaksei Makarau for s390x
enablement. With his permission, we've licensed these under LGPL.

Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
@batrick
COPYING,common/*s390x*: distribute under Apache 2 license for s390x
95cdae7 
The Ceph project cannot distributed GPL code as it is incompatible with the
LGPL that all Ceph code is licensed under. Since s390x is dual-licensed, we
choose to use the Apache 2 license.

Fixes: https://tracker.ceph.com/issues/68084
Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
@batrick batrick changed the title arch/s390x: redistributed under apache2 license arch/s390x: redistribute under apache2 license Sep 18, 2024
@cbodley
Copy link
Contributor

cbodley commented Sep 18, 2024

https://jenkins.ceph.com/job/ceph-pull-requests/143552/

FATAL: java.nio.channels.ClosedChannelException

@cbodley
Copy link
Contributor

cbodley commented Sep 18, 2024

jenkins test make check

@batrick batrick merged commit 827eafb into ceph:main Sep 19, 2024
@batrick batrick deleted the i68084 branch September 19, 2024 01:08
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@idryomov idryomov idryomov approved these changes

@anthonyeleven anthonyeleven anthonyeleven approved these changes

Assignees

No one assigned

Labels

common documentation

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

5 participants

@batrick @aliakseimakarau @anthonyeleven @cbodley @idryomov