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