[libcamera-devel,PATCH/RFC,v1.1] licenses: Move developer's certificate of origin to Documentation/

Message ID 20200213163522.31159-1-laurent.pinchart@ideasonboard.com
State Accepted
Commit 5bbc607c9f6f72f16fc35a6ec92fa1ba6178be32
Headers show
Series
  • [libcamera-devel,PATCH/RFC,v1.1] licenses: Move developer's certificate of origin to Documentation/
Related show

Commit Message

Laurent Pinchart Feb. 13, 2020, 4:35 p.m. UTC
The developer's certificate of origin isn't a license, move it from
LICENSES/ to Documentation/ by incorporating it in contributing.rst.

Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
---
 Documentation/contributing.rst               | 42 +++++++++++++++++++-
 LICENSES/developer-certificate-of-origin.txt | 37 -----------------
 2 files changed, 41 insertions(+), 38 deletions(-)
 delete mode 100644 LICENSES/developer-certificate-of-origin.txt

Comments

Kieran Bingham Feb. 13, 2020, 4:40 p.m. UTC | #1
Hi Laurent,

On 13/02/2020 16:35, Laurent Pinchart wrote:
> The developer's certificate of origin isn't a license, move it from
> LICENSES/ to Documentation/ by incorporating it in contributing.rst.
> 
> Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>

Great - I think that's better.
I like keeping the link back to the dco.org from the title too.

Reviewed-by: Kieran Bingham <kieran.bingham@ideasonboard.com>


> ---
>  Documentation/contributing.rst               | 42 +++++++++++++++++++-
>  LICENSES/developer-certificate-of-origin.txt | 37 -----------------
>  2 files changed, 41 insertions(+), 38 deletions(-)
>  delete mode 100644 LICENSES/developer-certificate-of-origin.txt
> 
> diff --git a/Documentation/contributing.rst b/Documentation/contributing.rst
> index 1cfbd0ec6b25..c7c6f7d2cb28 100644
> --- a/Documentation/contributing.rst
> +++ b/Documentation/contributing.rst
> @@ -60,7 +60,47 @@ model as utilised by the Linux kernel, and requires the use of 'Signed-off-by:'
>  tags in all patches.
>  
>  By signing your contributions you are certifying your work in accordance with
> -the `Developer's Certificate of Origin`_
> +the following:
> +
> +`Developer's 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.
> +
>  
>  .. _Developer's Certificate of Origin: https://developercertificate.org/
>  
> diff --git a/LICENSES/developer-certificate-of-origin.txt b/LICENSES/developer-certificate-of-origin.txt
> deleted file mode 100644
> index 8201f992154a..000000000000
> --- a/LICENSES/developer-certificate-of-origin.txt
> +++ /dev/null
> @@ -1,37 +0,0 @@
> -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.
>

Patch

diff --git a/Documentation/contributing.rst b/Documentation/contributing.rst
index 1cfbd0ec6b25..c7c6f7d2cb28 100644
--- a/Documentation/contributing.rst
+++ b/Documentation/contributing.rst
@@ -60,7 +60,47 @@  model as utilised by the Linux kernel, and requires the use of 'Signed-off-by:'
 tags in all patches.
 
 By signing your contributions you are certifying your work in accordance with
-the `Developer's Certificate of Origin`_
+the following:
+
+`Developer's 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.
+
 
 .. _Developer's Certificate of Origin: https://developercertificate.org/
 
diff --git a/LICENSES/developer-certificate-of-origin.txt b/LICENSES/developer-certificate-of-origin.txt
deleted file mode 100644
index 8201f992154a..000000000000
--- a/LICENSES/developer-certificate-of-origin.txt
+++ /dev/null
@@ -1,37 +0,0 @@ 
-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.