From patchwork Thu Feb 13 16:35:22 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Laurent Pinchart X-Patchwork-Id: 2824 Return-Path: Received: from perceval.ideasonboard.com (perceval.ideasonboard.com [IPv6:2001:4b98:dc2:55:216:3eff:fef7:d647]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id AE9916196C for ; Thu, 13 Feb 2020 17:35:42 +0100 (CET) Received: from pendragon.bb.dnainternet.fi (81-175-216-236.bb.dnainternet.fi [81.175.216.236]) by perceval.ideasonboard.com (Postfix) with ESMTPSA id 2DCCE504 for ; Thu, 13 Feb 2020 17:35:42 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com; s=mail; t=1581611742; bh=LvzTFibcWXRMNSmiqGyykrBCCjnyDBmCW3iOxqF06KI=; h=From:To:Subject:Date:In-Reply-To:References:From; b=o5Rq0YrpXZH4pEook5LXGP9xWKJ77YI3RQTwhOK4dzG184g+8/xtaux2bfbH0Jj5j +gblDBaFTKglyIjkcg/yLf3uq7ICxy4MeseFggYMHV9gp90wQc6H1YIe9CwB9uS7f9 HqFTUXIeNRvWUn3sAUgKrEki29k2uZWv3wUW3CP4= From: Laurent Pinchart To: libcamera-devel@lists.libcamera.org Date: Thu, 13 Feb 2020 18:35:22 +0200 Message-Id: <20200213163522.31159-1-laurent.pinchart@ideasonboard.com> X-Mailer: git-send-email 2.24.1 In-Reply-To: <20200213162235.GA29760@pendragon.ideasonboard.com> References: <20200213162235.GA29760@pendragon.ideasonboard.com> MIME-Version: 1.0 Subject: [libcamera-devel] [PATCH/RFC v1.1] licenses: Move developer's certificate of origin to Documentation/ X-BeenThere: libcamera-devel@lists.libcamera.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 13 Feb 2020 16:35:42 -0000 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 Reviewed-by: Kieran Bingham --- 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.