Skip to content

Commit 36ec282

Browse files
Update CONTRIBUTING.md to broaden the intent of the contributor agreement
- Merged DCO Signing and Contributor License Agreement sections for clarity. - Clarified the authority required for code submissions and the potential rights of employers. - Simplified the DCO signing instructions and emphasized the need for legal compliance. - Streamlined language to reduce redundancy and maintain legal soundness. - Added explicit confirmation of rights granted by contributors, including employer permissions. - Emphasized GNU Radio’s principles of remaining free/libre and compliant with evolving laws. - Highlighted the support for public-private partnerships and commercial contributions without disclosing proprietary stacks. - Maintained the spirit of open-source contributions and community collaboration. - Ensured the guidelines are clear, concise, and foster an inclusive environment. See the updated CONTRIBUTING.md for details. Signed-off-by: Josh Morman <[email protected]> Signed-off-by: Ralph J. Steinhagen <[email protected]> Co-authored-by: Josh Morman <[email protected]>
1 parent 912b5f7 commit 36ec282

File tree

1 file changed

+43
-40
lines changed

1 file changed

+43
-40
lines changed

CONTRIBUTING.md

Lines changed: 43 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -15,14 +15,6 @@ examples or if you cannot find anything that fits your use-case use GitHub's dis
1515
## Contributing code and content
1616
We welcome all forms of contributions from the community. Please read the following guidelines to maximise the chances of your PR being merged.
1717

18-
### DCO Signing
19-
20-
Any code contributions going into GNU Radio will become part of a LGPL-licensed, open source repository. It is therefore imperative that code submissions belong to the authors, and that submitters have the authority to merge that code into the public GNU Radio codebase.
21-
22-
For that purpose, we use the [Developer's Certificate of Origin](DCO.txt). It is the same document used by other projects. Signing the DCO states that there are no legal reasons to not merge your code.
23-
24-
To sign the DCO, suffix your git commits with a "Signed-off-by" line. When using the command line, you can use `git commit -s` to automatically add this line. If there were multiple authors of the code, or other types of stakeholders, make sure that all are listed, each with a separate Signed-off-by line.
25-
2618
### Communication
2719
- Before starting work on a feature, check if there isn't already an examples in the 'samples' sub-module.
2820
If not, then please open an issue on GitHub describing the proposed feature. We want to make sure any feature work goes smoothly.
@@ -45,37 +37,48 @@ Please be sure to follow the usual process for submitting PRs:
4537

4638
We reserve the right to close PRs that are not making progress. Closed PRs can be reopened again later and work can resume.
4739

48-
### Contributor License Agreement
49-
By contributing your code to GNU Radio you grant us a non-exclusive,
50-
irrevocable, worldwide, royalty-free, sublicenseable, transferable
51-
license under all of Your relevant intellectual property rights
52-
(including copyright, patent, and any other rights), to use, copy,
53-
prepare derivative works of, distribute and publicly perform and
54-
display the Contributions on any licensing terms, including without limitation:
55-
(a) open source licenses like the Apache license; and (b) binary,
56-
proprietary, or commercial licenses. Except for the licenses granted herein,
57-
You reserve all right, title, and interest in and to the Contribution.
58-
59-
You confirm that you are able to grant us these rights. You represent
60-
that You are legally entitled to grant the above license. If Your employer
61-
has rights to intellectual property that You create, You represent that
62-
You have received permission to make the Contributions on behalf of that
63-
employer, or that Your employer has waived such rights for the Contributions.
64-
65-
You represent that the Contributions are Your original works of
66-
authorship, and to Your knowledge, no other person claims, or
67-
has the right to claim, any right in any invention or patent
68-
related to the Contributions. You also represent that You are
69-
not legally obligated, whether by entering into an agreement
70-
or otherwise, in any way that conflicts with the terms of this license.
71-
72-
We acknowledge that, except as explicitly described in this
73-
Agreement, any Contribution which you provide is on an
74-
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
75-
EITHER EXPRESS OR IMPLIED, INCLUDING, WITHOUT LIMITATION,
76-
ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT,
77-
MERCHANTABILITY, OR FITNESS FOR A PARTICULAR PURPOSE.
40+
### DCO Signing & Contributor License Agreement
41+
42+
Code submitters must have the authority to merge that code into the public GNU Radio codebase.
43+
In some cases, the rights to exploit the code may belong to the contributor's employer, depending on jurisdiction
44+
and employment agreements.
45+
46+
For that purpose, we use the [Developer's Certificate of Origin](DCO.txt). It is the same document used by other
47+
projects.
48+
Signing the DCO states that there are no legal reasons to not merge your code.
49+
50+
To sign the DCO, suffix your git commits with a "Signed-off-by" line. When using the command line,
51+
you can use `git commit -s` to automatically add this line. If there were multiple authors of the code, or other types
52+
of stakeholders, make sure that all are listed, each with a separate Signed-off-by line.
53+
54+
#### Notably, by contributing to GNU Radio:
55+
56+
1. you grant this project a non-exclusive, irrevocable, worldwide, royalty-free, sublicensable, transferable license
57+
under all of your relevant intellectual property rights (including copyright, patent, and any other rights), to use,
58+
copy, prepare derivative works of, distribute, and publicly perform and display the contributions.
59+
2. You confirm that you are able to grant us these rights. You represent that you are legally entitled to grant the
60+
above license. If Your employer has rights to intellectual property that You create, You represent that You have
61+
received permission to make the Contributions on behalf of that employer, or that Your employer has waived such
62+
rights for the Contributions.
63+
3. You represent that the Contributions are Your original works of authorship, and to Your knowledge, no other person
64+
claims, or has the right to claim, any right in any invention or patent related to the Contributions.
65+
You also represent that You are not legally obligated, whether by entering into an agreement or otherwise, in any way
66+
that conflicts with the terms of this license.
67+
4. We acknowledge that, except as explicitly described in this Agreement, any Contribution which you provide is on an
68+
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED, INCLUDING, WITHOUT
69+
LIMITATION,
70+
ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT, MERCHANTABILITY, OR FITNESS FOR A PARTICULAR PURPOSE.
71+
72+
This above is to ensure that the GNU Radio Project:
73+
74+
* Remains free/libre in the spirit of the open source licenses and [Public-Money-Public-Code](https://publiccode.eu/en/) principles
75+
(freedom, right-to-repair, tax savings, collaboration, serving the public, fostering innovation).
76+
* Stays or can be made compliant under international and national laws if these change (notably U.S. and EU stances on
77+
cybersecurity, product liability, GDPR, and use of AI).
78+
* Encourages public-private/industry partnerships to foster innovation and collaboration, ensuring that all can benefit
79+
from and contribute to the project.
7880

7981
## Code of Conduct
80-
To ensure an inclusive community, contributors and users in the GNU Radio
81-
community should follow the [code of conduct](./CODE_OF_CONDUCT.md).
82+
83+
To ensure an inclusive community, contributors and users in the GNU Radio community should follow
84+
the [code of conduct](./CODE_OF_CONDUCT.md).

0 commit comments

Comments
 (0)