Update the documentation to be explicit about the signed-off-by convention.
Signed-off-by: Kevin O'Connor kevin@koconnor.net --- docs/Contributing.md | 5 ++++ docs/developer-certificate-of-origin | 37 ++++++++++++++++++++++++++++ 2 files changed, 42 insertions(+) create mode 100644 docs/developer-certificate-of-origin
diff --git a/docs/Contributing.md b/docs/Contributing.md index d0f2b5b..88888d7 100644 --- a/docs/Contributing.md +++ b/docs/Contributing.md @@ -18,3 +18,8 @@ submit patches. The SeaBIOS C code does follow a slightly different coding style from QEMU (eg, mixed code and C99 style variable declarations are encouraged, braces are not required around single statement blocks), however patches in the QEMU style are acceptable. + +As with QEMU, commits should contain a "Signed-off-by" line using your +real name (sorry, no pseudonyms or anonymous contributions) and a +current email address. It indicates agreement with the terms of the +[developer certificate of origin](https://git.seabios.org/cgit/seabios.git/tree/docs/developer-certificate-of-...). diff --git a/docs/developer-certificate-of-origin b/docs/developer-certificate-of-origin new file mode 100644 index 0000000..8201f99 --- /dev/null +++ b/docs/developer-certificate-of-origin @@ -0,0 +1,37 @@ +Developer Certificate of Origin +Version 1.1 + +Copyright (C) 2004, 2006 The Linux Foundation and its contributors. +1 Letterman Drive +Suite D4700 +San Francisco, CA, 94129 + +Everyone is permitted to copy and distribute verbatim copies of this +license document, but changing it is not allowed. + + +Developer's Certificate of Origin 1.1 + +By making a contribution to this project, I certify that: + +(a) The contribution was created in whole or in part by me and I + have the right to submit it under the open source license + indicated in the file; or + +(b) The contribution is based upon previous work that, to the best + of my knowledge, is covered under an appropriate open source + license and I have the right under that license to submit that + work with modifications, whether created in whole or in part + by me, under the same open source license (unless I am + permitted to submit under a different license), as indicated + in the file; or + +(c) The contribution was provided directly to me by some other + person who certified (a), (b) or (c) and I have not modified + it. + +(d) I understand and agree that this project and the contribution + are public and that a record of the contribution (including all + personal information I submit with it, including my sign-off) is + maintained indefinitely and may be redistributed consistent with + this project or the open source license(s) involved.
On 10/21/19 5:31 PM, Kevin O'Connor wrote:
Update the documentation to be explicit about the signed-off-by convention.
Signed-off-by: Kevin O'Connor kevin@koconnor.net
Reviewed-by: Philippe Mathieu-Daudé philmd@redhat.com
docs/Contributing.md | 5 ++++ docs/developer-certificate-of-origin | 37 ++++++++++++++++++++++++++++ 2 files changed, 42 insertions(+) create mode 100644 docs/developer-certificate-of-origin
diff --git a/docs/Contributing.md b/docs/Contributing.md index d0f2b5b..88888d7 100644 --- a/docs/Contributing.md +++ b/docs/Contributing.md @@ -18,3 +18,8 @@ submit patches. The SeaBIOS C code does follow a slightly different coding style from QEMU (eg, mixed code and C99 style variable declarations are encouraged, braces are not required around single statement blocks), however patches in the QEMU style are acceptable.
+As with QEMU, commits should contain a "Signed-off-by" line using your +real name (sorry, no pseudonyms or anonymous contributions) and a +current email address. It indicates agreement with the terms of the +[developer certificate of origin](https://git.seabios.org/cgit/seabios.git/tree/docs/developer-certificate-of-...). diff --git a/docs/developer-certificate-of-origin b/docs/developer-certificate-of-origin new file mode 100644 index 0000000..8201f99 --- /dev/null +++ b/docs/developer-certificate-of-origin @@ -0,0 +1,37 @@ +Developer Certificate of Origin +Version 1.1
+Copyright (C) 2004, 2006 The Linux Foundation and its contributors. +1 Letterman Drive +Suite D4700 +San Francisco, CA, 94129
+Everyone is permitted to copy and distribute verbatim copies of this +license document, but changing it is not allowed.
+Developer's Certificate of Origin 1.1
+By making a contribution to this project, I certify that:
+(a) The contribution was created in whole or in part by me and I
- have the right to submit it under the open source license
- indicated in the file; or
+(b) The contribution is based upon previous work that, to the best
- of my knowledge, is covered under an appropriate open source
- license and I have the right under that license to submit that
- work with modifications, whether created in whole or in part
- by me, under the same open source license (unless I am
- permitted to submit under a different license), as indicated
- in the file; or
+(c) The contribution was provided directly to me by some other
- person who certified (a), (b) or (c) and I have not modified
- it.
+(d) I understand and agree that this project and the contribution
- are public and that a record of the contribution (including all
- personal information I submit with it, including my sign-off) is
- maintained indefinitely and may be redistributed consistent with
- this project or the open source license(s) involved.
Kevin O'Connor wrote:
Update the documentation to be explicit about the signed-off-by convention.
FWIW I'm against that convention, and would rather see it abandoned, than the project submitting to arbitrary and ridiculous requirements set by legal departments in US corporations. *shrug*
//Peter
On 10/21/19 17:31, Kevin O'Connor wrote:
Update the documentation to be explicit about the signed-off-by convention.
Signed-off-by: Kevin O'Connor kevin@koconnor.net
docs/Contributing.md | 5 ++++ docs/developer-certificate-of-origin | 37 ++++++++++++++++++++++++++++ 2 files changed, 42 insertions(+) create mode 100644 docs/developer-certificate-of-origin
diff --git a/docs/Contributing.md b/docs/Contributing.md index d0f2b5b..88888d7 100644 --- a/docs/Contributing.md +++ b/docs/Contributing.md @@ -18,3 +18,8 @@ submit patches. The SeaBIOS C code does follow a slightly different coding style from QEMU (eg, mixed code and C99 style variable declarations are encouraged, braces are not required around single statement blocks), however patches in the QEMU style are acceptable.
+As with QEMU, commits should contain a "Signed-off-by" line using your +real name (sorry, no pseudonyms or anonymous contributions) and a +current email address. It indicates agreement with the terms of the +[developer certificate of origin](https://git.seabios.org/cgit/seabios.git/tree/docs/developer-certificate-of-...). diff --git a/docs/developer-certificate-of-origin b/docs/developer-certificate-of-origin new file mode 100644 index 0000000..8201f99 --- /dev/null +++ b/docs/developer-certificate-of-origin @@ -0,0 +1,37 @@ +Developer Certificate of Origin +Version 1.1
+Copyright (C) 2004, 2006 The Linux Foundation and its contributors. +1 Letterman Drive +Suite D4700 +San Francisco, CA, 94129
+Everyone is permitted to copy and distribute verbatim copies of this +license document, but changing it is not allowed.
+Developer's Certificate of Origin 1.1
+By making a contribution to this project, I certify that:
+(a) The contribution was created in whole or in part by me and I
- have the right to submit it under the open source license
- indicated in the file; or
+(b) The contribution is based upon previous work that, to the best
- of my knowledge, is covered under an appropriate open source
- license and I have the right under that license to submit that
- work with modifications, whether created in whole or in part
- by me, under the same open source license (unless I am
- permitted to submit under a different license), as indicated
- in the file; or
+(c) The contribution was provided directly to me by some other
- person who certified (a), (b) or (c) and I have not modified
- it.
+(d) I understand and agree that this project and the contribution
- are public and that a record of the contribution (including all
- personal information I submit with it, including my sign-off) is
- maintained indefinitely and may be redistributed consistent with
- this project or the open source license(s) involved.
(I don't mean to derail this discussion, so feel free to ignore my comments.)
I've grown to dislike URLs, pointing into git WebUIs, that lack a commit hash. They basically mean "look at this file at the current master HEAD" -- but that's a moving target.
I can see two ways to fix that:
- add the DCO in a separate commit, and then hard-code the commit hash in the next patch (the one that adds the URL to Contributing.md)
- Capture the version of the DCO (1.1) in the file name ("docs/developer-certificate-of-origin-1.1"), and update the URL accordingly. Assuming the DCO is upgraded, or changed otherwise, at a later point, the DCO version part in the filename should change as well. This will at least *break* old links (i.e. when looking at the link in an old checkout of "docs/Contributing.md"), and warn users that they have to find the DCO themselves that matches "Contributing.md" (such as, check out the whole tree).
I don't know if a URL format exists that says,
look at file "docs/developer-certificate-of-origin" at the same commit hash at which you are looking at "docs/Contributing.md" right now
(Because that's what you normally get with a plain local "git checkout HASH" command.)
But, again, if this feels overly cautious, feel free to ignore.
Thanks Laszlo
Hello Kevin,
On 10/21/19 5:31 PM, Kevin O'Connor wrote:
Update the documentation to be explicit about the signed-off-by convention.
I like this change in general. Note however that I could not have signed-off my patch that resulted in fc92d092ea4f704bc4d283c3911ee9894733f4ce according to the rules you introduce here. The best match for this patch would be (a) in the DCO, but there is no "open source license indicated in the file" (vgasrc/svgamodes.c). So you might want to assert that each file declares its license before you introduce a requirement that cannot be fulfilled for future changes of some of the project's files.
Best regards Uwe
On Mon, Oct 21, 2019 at 10:33:19PM +0200, Uwe Kleine-König wrote:
Hello Kevin,
On 10/21/19 5:31 PM, Kevin O'Connor wrote:
Update the documentation to be explicit about the signed-off-by convention.
[...]
The best match for this patch would be (a) in the DCO, but there is no "open source license indicated in the file" (vgasrc/svgamodes.c)
The lack of a copyright statement on svgamodes.c appears to be an ommission in commit 004f5b3a where the contents of that file were created from another file without copying over the license statement. I will submit a fix for it.
I like this change in general. Note however that I could not have signed-off my patch that resulted in fc92d092ea4f704bc4d283c3911ee9894733f4ce according to the rules you introduce here.
I don't want to be nitpicky, but it is unclear if you are uncomfortable with the submission. If you are, please state that and I will revert the commit.
We do try to make the copyrights and submission process transparent. I don't feel the license or process has been unclear. The DCO was indirectly documented before via the QEMU documentation: https://www.seabios.org/Contributing states the process follows: http://wiki.qemu.org/Contribute/SubmitAPatch The SeaBIOS license is in the COPYING and COPYING.LESSER files in the git repo.
Thanks, -Kevin
On Mon, Oct 21, 2019 at 05:00:55PM +0000, Peter Stuge wrote:
Kevin O'Connor wrote:
Update the documentation to be explicit about the signed-off-by convention.
FWIW I'm against that convention, and would rather see it abandoned, than the project submitting to arbitrary and ridiculous requirements set by legal departments in US corporations. *shrug*
I understand. For better or for worse, it is the convention that SeaBIOS has been following and I think it makes sense to state it explicitly within the seabios git repo.
FWIW, I have found keeping names and contact info in the commits to be helpful. (Occasionally people have questions about using the code in other projects and I've seen it be useful when reaching out to past contributors.) I don't feel the 7 sentences in the developer-certificate-of-origin is a harsh burden.
Cheers, -Kevin
On Mon, Oct 21, 2019 at 08:31:11PM +0200, Laszlo Ersek wrote:
On 10/21/19 17:31, Kevin O'Connor wrote:
Update the documentation to be explicit about the signed-off-by convention.
I've grown to dislike URLs, pointing into git WebUIs, that lack a commit hash. They basically mean "look at this file at the current master HEAD" -- but that's a moving target.
Ah, good point. I proposed the given link so that the wiki would render it properly. I'm currently manually copying the docs from git into the wiki on a change. I'll figure out a way for the link to be meaningful in both the repo and the wiki.
-Kevin
Hello Kevin,
On 10/22/19 12:35 AM, Kevin O'Connor wrote:
On Mon, Oct 21, 2019 at 10:33:19PM +0200, Uwe Kleine-König wrote:
I like this change in general. Note however that I could not have signed-off my patch that resulted in fc92d092ea4f704bc4d283c3911ee9894733f4ce according to the rules you introduce here.
I don't want to be nitpicky, but it is unclear if you are uncomfortable with the submission. If you are, please state that and I will revert the commit.
I'm not really uncomfortable. You are free to consider my submissions to be covered by GPLv3 or LGPLv3 and integrate them into seabios as you did. So "in spirit" I agree to the DCO.
I just think that being picky is right when talking about license stuff and being picky some files not having a copyright might be problematic. And as pointed out earlier on this list[1], this is not only about vgasrc/svgamodes.c.
We do try to make the copyrights and submission process transparent. I don't feel the license or process has been unclear.
If you think that the semantic you formalized in your change was in effect already before, then Gerd's mail to that topic[2] was at least incomplete. I asked about clarifying the semantic and didn't understand Matt's reply as to also apply to seabios but instead thought he describes the semantic for the kernel only and for seabios the semantic was only what Gerd described.
So my S-o-b was given -- while right by intend -- wrong by the letter.
The DCO was indirectly documented before via the QEMU documentation: https://www.seabios.org/Contributing states the process follows: http://wiki.qemu.org/Contribute/SubmitAPatch The SeaBIOS license is in the COPYING and COPYING.LESSER files in the git repo.
So a contributor can select himself if he wants GPL or LGPL?
Best regards Uwe
[1] https://mail.coreboot.org/hyperkitty/list/seabios@seabios.org/thread/Z6FPBB7..., My mail from Oct 14, 09:45 [2] https://mail.coreboot.org/hyperkitty/list/seabios@seabios.org/thread/Z6FPBB7..., Gerd's mail from Oct 17, 10:51
On Tue, Oct 22, 2019 at 10:01:28AM +0200, Uwe Kleine-König wrote:
On 10/22/19 12:35 AM, Kevin O'Connor wrote:
On Mon, Oct 21, 2019 at 10:33:19PM +0200, Uwe Kleine-König wrote:
I like this change in general. Note however that I could not have signed-off my patch that resulted in fc92d092ea4f704bc4d283c3911ee9894733f4ce according to the rules you introduce here.
I don't want to be nitpicky, but it is unclear if you are uncomfortable with the submission. If you are, please state that and I will revert the commit.
I'm not really uncomfortable. You are free to consider my submissions to be covered by GPLv3 or LGPLv3 and integrate them into seabios as you did. So "in spirit" I agree to the DCO.
Thanks.
If you think that the semantic you formalized in your change was in effect already before, then Gerd's mail to that topic[2] was at least incomplete. I asked about clarifying the semantic and didn't understand Matt's reply as to also apply to seabios but instead thought he describes the semantic for the kernel only and for seabios the semantic was only what Gerd described.
I apologize for the confusion.
The SeaBIOS license is in the COPYING and COPYING.LESSER files in the git repo.
So a contributor can select himself if he wants GPL or LGPL?
SeaBIOS itself uses the GNU LGPLv3 license. All of the c code in the src/ and vgasrc/ directories should state that (or, for a handful of files that came from external projects, should state a license compatible with the LGPLv3). It does appear a few c files are missing a license statement - this was a harmless omission.
I don't feel there is a reasonable confusion on the SeaBIOS license - I feel the intent is clear that the SeaBIOS code is licensed under the GNU LGPLv3.
-Kevin
On Mon, Oct 21, 2019 at 11:31:04AM -0400, Kevin O'Connor wrote:
Update the documentation to be explicit about the signed-off-by convention.
Signed-off-by: Kevin O'Connor kevin@koconnor.net
FYI, I committed a slightly modified version of this patch. Hopefully links in both the wiki and docs/ directory will appear okay now.
-Kevin
-
Kevin O'Connor -
Laszlo Ersek -
Peter Stuge -
Philippe Mathieu-Daudé -
Uwe Kleine-König