From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from out4-smtp.messagingengine.com (out4-smtp.messagingengine.com [66.111.4.28]) by dpdk.org (Postfix) with ESMTP id 8C0F0199B6; Wed, 18 Oct 2017 17:04:47 +0200 (CEST) Received: from compute1.internal (compute1.nyi.internal [10.202.2.41]) by mailout.nyi.internal (Postfix) with ESMTP id 397B720E7B; Wed, 18 Oct 2017 11:04:47 -0400 (EDT) Received: from frontend1 ([10.202.2.160]) by compute1.internal (MEProxy); Wed, 18 Oct 2017 11:04:47 -0400 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=2jQy7xB4iT+PrI M+3BKL1ogKtBh1m+oZtbgeCvS4sHs=; b=d5P8K3qRjpE11GRNbEpQljKzmMt2Pj kB1U/zNAfouBqbkCEd/O0CrZouNmcJNzMJOcewsgfbMswvMYxPmx1DVEp/+Q73tf K6jSKql0EHQ3ccpO8JIc7fa9YNEmgMtjjmW5yaAJWYzNBC2RAKfIZwR/Ex2lCMoe pZATRkCGYYM68= 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=2jQy7xB4iT+PrIM+3BKL1ogKtBh1m+oZtbgeCvS4sHs=; b=rCr/5DWz igFuqINvStASFWE4QU54848yZuuTOZU8vezQh1pcHalwRSGoQEr4QwoHH3yJXN1m 1nsl3FSaQi93TeYYLnTYIIKIsKxYrJgEr1EZhyTVoP/Sf7HA0sN2eDYLhvodRIV0 KNnsob1kvu8d/xBUDivIJb6jmv3Xle11NRmnhmVWcSV8j+kqmuP038k8LvDOGSUi jaU4oLifdYv5l//1UewfxjDiuFZZio9yQO9c3CuQrUPBpsDUnop7HhuNitdDHqQT uXiZglU5BHS6KjhY2kGccOLP/7fVv+WAUghUANpF8qcuzn3etDTtZdkiWsAERBIK FLfjTG9Xu/AnyA== X-ME-Sender: Received: from xps.monjalon.net (184.203.134.77.rev.sfr.net [77.134.203.184]) by mail.messagingengine.com (Postfix) with ESMTPA id 5D6B17F91C; Wed, 18 Oct 2017 11:04:46 -0400 (EDT) From: Thomas Monjalon To: tdelanerolle@linuxfoundation.org Cc: web@dpdk.org, govboard@dpdk.org, techboard@dpdk.org Date: Wed, 18 Oct 2017 17:04:31 +0200 Message-Id: <20171018150431.17200-4-thomas@monjalon.net> X-Mailer: git-send-email 2.14.2 In-Reply-To: <20171018150431.17200-1-thomas@monjalon.net> References: <20171018150431.17200-1-thomas@monjalon.net> Subject: [dpdk-web] [PATCH 3/3] update license policy wording X-BeenThere: web@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: DPDK website maintenance List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 18 Oct 2017 15:04:48 -0000 Linux Foundation asks 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 --- about/charter.html | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/about/charter.html b/about/charter.html index 235ebba..9ac8a32 100644 --- a/about/charter.html +++ b/about/charter.html @@ -447,11 +447,11 @@
  1. All new inbound contributions to DPDK - shall be made under the following licenses: + will be made under the following licenses:
    1. - The GPLv2 license + The GPL-2.0 license shall be used for code that runs in the kernel. Current examples of this are:
        @@ -465,20 +465,20 @@ lib/librte_eal/linuxapp/kni/ethtool/ixgbe
    2. - A dual - 3-clause BSD / - GPLv2 license or - 3-clause BSD / - LGPLv2 license - shall be used for code that is shared between the kernel and userspace. + A disjonctive licence choice of + BSD-3-Clause OR + GPL-2.0 or + BSD-3-Clause OR + LGPL-2.0 + will be used for code that is shared between the kernel and userspace. Current examples of this are:
      • - BSD/GPLv2: + BSD-3-Clause OR GPL-2.0:
        1. All files in @@ -496,7 +496,7 @@ >dom0_mm_misc.c
      • - BSD/LGPLv2: + BSD-3-Clause OR LGPL-2.0:
    3. - The 3-clause BSD license - shall be used for all other contributions. + The BSD-3-Clause license + will be used for all other contributions.
  2. All contributions shall include a "Signed-off-by:" line -- 2.14.2