From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: <thomas@monjalon.net> Received: from out4-smtp.messagingengine.com (out4-smtp.messagingengine.com [66.111.4.28]) by dpdk.org (Postfix) with ESMTP id 9A0002BE9; Tue, 28 Nov 2017 19:39:40 +0100 (CET) Received: from compute1.internal (compute1.nyi.internal [10.202.2.41]) by mailout.nyi.internal (Postfix) with ESMTP id 4E66120A17; Tue, 28 Nov 2017 13:39:40 -0500 (EST) Received: from frontend2 ([10.202.2.161]) by compute1.internal (MEProxy); Tue, 28 Nov 2017 13:39:40 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=monjalon.net; h= cc:date:from:in-reply-to:message-id:references:subject:to :x-me-sender:x-me-sender:x-sasl-enc; s=mesmtp; bh=RmsNKMW9BCrurK Oqqvr7ALWGQ+MkYrfogVrc4NTIasU=; b=DShJx56T69nJXXFn2rXWvjj1SUgPjJ 52cj3SJzTkCmGwozqh1t3hD8izVYrabq4p6qdjfUvK3VJkwgKQp11kzvFDVrBzxw PweR7SydLzVHMK60cvPm4TAIIb9OCErEnyOU7Xor7XdpviodNmZTi/ayQvCdTizS 1/M5mnx2ZHYpg= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:date:from:in-reply-to:message-id :references:subject:to:x-me-sender:x-me-sender:x-sasl-enc; s= fm1; bh=RmsNKMW9BCrurKOqqvr7ALWGQ+MkYrfogVrc4NTIasU=; b=AZQo5jn7 IxRtgOu1oQQcd2G0Q//YGHTiEiSUTMuZ6x9a7AP1GwjdBpZ1goU4+jrvggy4nLA3 eu8QqorgyZcuRXyM9cQqgRvEt+IFzqbLBT7zqqj338r/6Oi5C+xo1Cdh3xNvIA7U oF/eQWU6uIakxuekILMoUf/FnwJD8AMb/1iGjiciD+g3AsjBOM5NYLq/fuRipGhc iOkdTQ+wONhmVPlq/ky3+ocJxNL6d+0O/LOt6NxxMR/vGxgWD9/PGUdBLkFy5mrk py72VfHWdP2gPNPPkCdLwIAy0DQP7myqrimGvEj5KgrWGNdYEgblli2W64uF/W+0 YfGPVRUyaFpDQQ== X-ME-Sender: <xms:bK0dWrvii_Juq9xW7yadch4g4Cg_UVgzjGIEAq4xqPQPBK5j-WDSpA> Received: from xps.monjalon.net (184.203.134.77.rev.sfr.net [77.134.203.184]) by mail.messagingengine.com (Postfix) with ESMTPA id 74E2924A6C; Tue, 28 Nov 2017 13:39:39 -0500 (EST) From: Thomas Monjalon <thomas@monjalon.net> To: tdelanerolle@linuxfoundation.org Cc: web@dpdk.org, govboard@dpdk.org, techboard@dpdk.org Date: Tue, 28 Nov 2017 19:39:16 +0100 Message-Id: <20171128183917.17742-4-thomas@monjalon.net> X-Mailer: git-send-email 2.15.0 In-Reply-To: <20171128183917.17742-1-thomas@monjalon.net> References: <20171018150431.17200-1-thomas@monjalon.net> <20171128183917.17742-1-thomas@monjalon.net> Subject: [dpdk-web] [PATCH v2 3/4] update license policy wording X-BeenThere: web@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: DPDK website maintenance <web.dpdk.org> List-Unsubscribe: <http://dpdk.org/ml/options/web>, <mailto:web-request@dpdk.org?subject=unsubscribe> List-Archive: <http://dpdk.org/ml/archives/web/> List-Post: <mailto:web@dpdk.org> List-Help: <mailto:web-request@dpdk.org?subject=help> List-Subscribe: <http://dpdk.org/ml/listinfo/web>, <mailto:web-request@dpdk.org?subject=subscribe> X-List-Received-Date: Tue, 28 Nov 2017 18:39:41 -0000 Linux Foundation and Governing Board ask to - change wording of the license names - use spdx.org to describe licenses - change dual licensing wording with "OR" keyword - replace "shall" by "will" Signed-off-by: Thomas Monjalon <thomas@monjalon.net> --- about/charter.html | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/about/charter.html b/about/charter.html index b73cda8..f93fba7 100644 --- a/about/charter.html +++ b/about/charter.html @@ -448,11 +448,11 @@ <ol> <li> All new inbound contributions to DPDK - shall be made under the following licenses: + will be made under the following licenses: <ol> <li> - The <a href="https://www.gnu.org/licenses/old-licenses/gpl-2.0.en.html" - >GPLv2 license</a> + The <a href="https://spdx.org/licenses/GPL-2.0.html" + >GPL-2.0 license</a> shall be used for code that runs in the kernel. Current examples of this are: <ol> @@ -466,20 +466,20 @@ lib/librte_eal/linuxapp/kni/ethtool/ixgbe </ol> <li> - A dual - <a href="https://opensource.org/licenses/BSD-3-Clause" - >3-clause BSD</a> / - <a href="https://www.gnu.org/licenses/old-licenses/gpl-2.0.en.html" - >GPLv2</a> license or - <a href="https://opensource.org/licenses/BSD-3-Clause" - >3-clause BSD</a> / - <a href="https://www.gnu.org/licenses/old-licenses/lgpl-2.0.en.html" - >LGPLv2</a> license - shall be used for code that is shared between the kernel and userspace. + A disjunctive licence choice of + <a href="https://spdx.org/licenses/BSD-3-Clause.html" + >BSD-3-Clause</a> OR + <a href="https://spdx.org/licenses/GPL-2.0.html" + >GPL-2.0</a> or + <a href="https://spdx.org/licenses/BSD-3-Clause.html" + >BSD-3-Clause</a> OR + <a href="https://spdx.org/licenses/LGPL-2.0.html" + >LGPL-2.0</a> + will be used for code that is shared between the kernel and userspace. Current examples of this are: <ul> <li> - BSD/GPLv2: + BSD-3-Clause OR GPL-2.0: <ol> <li> All files in @@ -497,7 +497,7 @@ >dom0_mm_misc.c</a> </ol> <li> - BSD/LGPLv2: + BSD-3-Clause OR LGPL-2.0: <ol start="4"> <li> <a href="/browse/dpdk/tree/lib/librte_eal/bsdapp/eal/include/exec-env/rte_dom0_common.h" @@ -510,9 +510,9 @@ </ol> </ul> <li> - The <a href="https://opensource.org/licenses/BSD-3-Clause" - >3-clause BSD license</a> - shall be used for all other contributions. + The <a href="https://spdx.org/licenses/BSD-3-Clause.html" + >BSD-3-Clause license</a> + will be used for all other contributions. </ol> <li> All contributions shall include a "Signed-off-by:" line -- 2.15.0