Skip to content

Commit a95041c

Browse files
mbr0wnmarcusmueller
authored andcommitted
Update the repository to reflect the requirement to sign the DCO
Going forward, we will be requiring contributors to sign the DCO. This commit adds the DCO text itself and updates the contribution guidelines. Signed-off-by: Martin Braun <[email protected]>
1 parent a54c735 commit a95041c

File tree

2 files changed

+52
-6
lines changed

2 files changed

+52
-6
lines changed

CONTRIBUTING.md

+15-6
Original file line numberDiff line numberDiff line change
@@ -23,12 +23,22 @@ list, answers on Stack Overflow, Wiki page edits, examples... We very much
2323
appreciate those. However, this document is specifically about contributing
2424
code.
2525

26-
## CLA filed?
26+
## DCO Signed?
2727

28-
The GNU Radio codebase's copyright belongs to the Free Software Foundation. Any
29-
submission that gets merged must therefore be assigned to the FSF. Exceptions
30-
are small or obvious changes (< 10 lines, typically) or documentation changes.
31-
See also [What's this Copyright Assignment?][cla].
28+
Any code contributions going into GNU Radio will become part of a GPL-licensed,
29+
open source repository. It is therefore imperative that code submissions belong
30+
to the authors, and that submitters have the authority to merge that code into
31+
the public GNU Radio codebase.
32+
33+
For that purpose, we use the [Developer's Certificate of Origin](DCO.txt). It
34+
is the same document used by other projects. Signing the DCO states that there
35+
are no legal reasons to not merge your code.
36+
37+
To sign the DCO, suffix your git commits with a "Signed-off-by" line. When
38+
using the command line, you can use `git commit -s` to automatically add this
39+
line. If there were multiple authors of the code, or other types of
40+
stakeholders, make sure that all are listed, each with a separate Signed-off-by
41+
line.
3242

3343
## Coding Guidelines
3444

@@ -79,6 +89,5 @@ please follow existing examples regarding their command line arguments, and
7989
reuse them.
8090

8191
[grep1]: https://github.com/gnuradio/greps/blob/master/grep-0001-coding-guidelines.md
82-
[cla]: https://wiki.gnuradio.org/index.php/Development#What.27s_this_Copyright_Assignment.3F
8392
[wikicontrib]: https://wiki.gnuradio.org/index.php/Development
8493
[gr-devs]: https://github.com/orgs/gnuradio/teams/gr-devs

DCO.txt

+37
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
Developer Certificate of Origin
2+
Version 1.1
3+
4+
Copyright (C) 2004, 2006 The Linux Foundation and its contributors.
5+
1 Letterman Drive
6+
Suite D4700
7+
San Francisco, CA, 94129
8+
9+
Everyone is permitted to copy and distribute verbatim copies of this
10+
license document, but changing it is not allowed.
11+
12+
13+
Developer's Certificate of Origin 1.1
14+
15+
By making a contribution to this project, I certify that:
16+
17+
(a) The contribution was created in whole or in part by me and I
18+
have the right to submit it under the open source license
19+
indicated in the file; or
20+
21+
(b) The contribution is based upon previous work that, to the best
22+
of my knowledge, is covered under an appropriate open source
23+
license and I have the right under that license to submit that
24+
work with modifications, whether created in whole or in part
25+
by me, under the same open source license (unless I am
26+
permitted to submit under a different license), as indicated
27+
in the file; or
28+
29+
(c) The contribution was provided directly to me by some other
30+
person who certified (a), (b) or (c) and I have not modified
31+
it.
32+
33+
(d) I understand and agree that this project and the contribution
34+
are public and that a record of the contribution (including all
35+
personal information I submit with it, including my sign-off) is
36+
maintained indefinitely and may be redistributed consistent with
37+
this project or the open source license(s) involved.

0 commit comments

Comments
 (0)