lkml.org 
[lkml]   [2018]   [Apr]   [26]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
SubjectRe: [patch V2 1/7] LICENSES/GPL2.0: Add GPL-2.0-only/or-later as valid identifiers
Em Wed, 25 Apr 2018 22:30:21 +0200
Thomas Gleixner <tglx@linutronix.de> escreveu:

> From: Thomas Gleixner tglx@linutronix.de
>
> Quite some files have been flagged with the new GPL-2.0-only and
> GPL-2.0-or-later identifiers which replace the original GPL-2.0 and
> GPL-2.0+ identifiers in the SPDX license identifier specification, but the
> identifiers are not mentioned as valid in the GPL-2.0 license file.
>
> Add them to the license file and to the Linux-syscall-note exception to
> make everything consistent again.
>
> Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
> Cc: Hans Verkuil <hans.verkuil@cisco.com>
> Cc: Mauro Carvalho Chehab <mchehab@s-opensource.com>

Reviewed-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org>

>
> diff --git a/LICENSES/exceptions/Linux-syscall-note b/LICENSES/exceptions/Linux-syscall-note
> index 6b60b61be4e9..9abdad71fafd 100644
> --- a/LICENSES/exceptions/Linux-syscall-note
> +++ b/LICENSES/exceptions/Linux-syscall-note
> @@ -1,6 +1,6 @@
> SPDX-Exception-Identifier: Linux-syscall-note
> SPDX-URL: https://spdx.org/licenses/Linux-syscall-note.html
> -SPDX-Licenses: GPL-2.0, GPL-2.0+, GPL-1.0+, LGPL-2.0, LGPL-2.0+, LGPL-2.1, LGPL-2.1+
> +SPDX-Licenses: GPL-2.0, GPL-2.0+, GPL-1.0+, LGPL-2.0, LGPL-2.0+, LGPL-2.1, LGPL-2.1+, GPL-2.0-only, GPL-2.0-or-later
> Usage-Guide:
> This exception is used together with one of the above SPDX-Licenses
> to mark user space API (uapi) header files so they can be included
> diff --git a/LICENSES/preferred/GPL-2.0 b/LICENSES/preferred/GPL-2.0
> index b8db91d3a1cb..ff0812fd89cc 100644
> --- a/LICENSES/preferred/GPL-2.0
> +++ b/LICENSES/preferred/GPL-2.0
> @@ -1,5 +1,7 @@
> Valid-License-Identifier: GPL-2.0
> +Valid-License-Identifier: GPL-2.0-only
> Valid-License-Identifier: GPL-2.0+
> +Valid-License-Identifier: GPL-2.0-or-later
> SPDX-URL: https://spdx.org/licenses/GPL-2.0.html
> Usage-Guide:
> To use this license in source code, put one of the following SPDX
> @@ -7,8 +9,12 @@ Usage-Guide:
> guidelines in the licensing rules documentation.
> For 'GNU General Public License (GPL) version 2 only' use:
> SPDX-License-Identifier: GPL-2.0
> + or
> + SPDX-License-Identifier: GPL-2.0-only
> For 'GNU General Public License (GPL) version 2 or any later version' use:
> SPDX-License-Identifier: GPL-2.0+
> + or
> + SPDX-License-Identifier: GPL-2.0-or-later
> License-Text:
>
> GNU GENERAL PUBLIC LICENSE
>
>



Thanks,
Mauro

\
 
 \ /
  Last update: 2018-04-26 11:53    [W:0.160 / U:2.200 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site