Skip to content

Commit 3dbc56e

Browse files
committed
Updated to DCO-1.1.
Signed-off-by: Ralph Lange <ralph.lange@de.bosch.com>
1 parent d009b1d commit 3dbc56e

File tree

1 file changed

+49
-27
lines changed

1 file changed

+49
-27
lines changed

CONTRIBUTING.md

Lines changed: 49 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,8 @@ the GitHub issues tracking system prior to any code development to coordinate
66
with the system_modes development team early in the process. Coordinating up
77
front helps to avoid frustration later on.
88

9+
## License
10+
911
Your contribution must be licensed under the Apache-2.0 license, the license
1012
used by this project.
1113

@@ -18,48 +20,58 @@ copyright holders.
1820

1921
## Sign your work
2022

21-
This project tracks patch provenance and licensing using a modified Developer
22-
Certificate of Origin (DCO; from [OSDL][DCO]) and Signed-off-by tags initially
23-
developed by the Linux kernel project.
23+
This project tracks patch provenance and licensing using the Developer
24+
Certificate of Origin 1.1 (DCO) from [developercertificate.org][DCO] and
25+
Signed-off-by tags initially developed by the Linux kernel project.
2426

25-
```
26-
system_modes Developer's Certificate of Origin. Version 1.0
27+
```text
28+
Developer Certificate of Origin
29+
Version 1.1
30+
31+
Copyright (C) 2004, 2006 The Linux Foundation and its contributors.
32+
1 Letterman Drive
33+
Suite D4700
34+
San Francisco, CA, 94129
35+
36+
Everyone is permitted to copy and distribute verbatim copies of this
37+
license document, but changing it is not allowed.
38+
39+
40+
Developer's Certificate of Origin 1.1
2741
2842
By making a contribution to this project, I certify that:
2943
3044
(a) The contribution was created in whole or in part by me and I
31-
have the right to submit it under the "Apache License, Version 2.0"
32-
("Apache-2.0"); or
45+
have the right to submit it under the open source license
46+
indicated in the file; or
3347
34-
(b) The contribution is based upon previous work that is covered by
35-
an appropriate open source license and I have the right under
36-
that license to submit that work with modifications, whether
37-
created in whole or in part by me, under the Apache-2.0 license;
38-
or
48+
(b) The contribution is based upon previous work that, to the best
49+
of my knowledge, is covered under an appropriate open source
50+
license and I have the right under that license to submit that
51+
work with modifications, whether created in whole or in part
52+
by me, under the same open source license (unless I am
53+
permitted to submit under a different license), as indicated
54+
in the file; or
3955
4056
(c) The contribution was provided directly to me by some other
41-
person who certified (a) or (b) and I have not modified it.
57+
person who certified (a), (b) or (c) and I have not modified
58+
it.
4259
4360
(d) I understand and agree that this project and the contribution
4461
are public and that a record of the contribution (including all
45-
metadata and personal information I submit with it, including my
46-
sign-off) is maintained indefinitely and may be redistributed
47-
consistent with this project and the requirements of the Apache-2.0
48-
license or any open source license(s) involved, where they are
49-
relevant.
50-
51-
(e) I am granting the contribution to this project under the terms of
52-
Apache-2.0.
53-
54-
http://www.apache.org/licenses/LICENSE-2.0
62+
personal information I submit with it, including my sign-off) is
63+
maintained indefinitely and may be redistributed consistent with
64+
this project or the open source license(s) involved.
5565
```
5666

5767
With the sign-off in a commit message you certify that you authored the patch
5868
or otherwise have the right to submit it under an open source license. The
59-
procedure is simple: To certify above system_modes Developer's Certificate of
60-
Origin 1.0 for your contribution just append a line
69+
procedure is simple: To certify above Developer's Certificate of
70+
Origin 1.1 for your contribution just append a line
6171

62-
Signed-off-by: Random J Developer <random@developer.example.org>
72+
```text
73+
Signed-off-by: Random J Developer <random@developer.example.org>
74+
```
6375

6476
to every commit message using your real name or your pseudonym and a valid
6577
email address.
@@ -69,6 +81,16 @@ automatically sign the commit by running the git-commit command with the `-s`
6981
option. There may be multiple sign-offs if more than one developer was
7082
involved in authoring the contribution.
7183

84+
Another option to automatically add the `Signed-off-by:` is to once use the
85+
command
86+
87+
```sh
88+
git config core.hooksPath .githooks
89+
```
90+
91+
in your system_modes working directory. This will then add the `Signed-off-by:` line
92+
automatically.
93+
7294
For a more detailed description of this procedure, please see
7395
[SubmittingPatches][] which was extracted from the Linux kernel project, and
7496
which is stored in an external repository.
@@ -102,6 +124,6 @@ contribution was provided directly to me by some other person who certified
102124
holder(s) to the [NOTICE](NOTICE) file as part of your contribution.
103125

104126

105-
[DCO]: http://web.archive.org/web/20070306195036/http://osdlab.org/newsroom/press_releases/2004/2004_05_24_dco.html
127+
[DCO]: https://developercertificate.org/
106128

107129
[SubmittingPatches]: https://github.com/wking/signed-off-by/blob/7d71be37194df05c349157a2161c7534feaf86a4/Documentation/SubmittingPatches

0 commit comments

Comments
 (0)