Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9376ff9b authored by Thomas Gleixner's avatar Thomas Gleixner Committed by Jonathan Corbet
Browse files

LICENSES/GPL2.0: Add GPL-2.0-only/or-later as valid identifiers 



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: default avatarThomas Gleixner <tglx@linutronix.de>
Reviewed-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Reviewed-by: default avatarMauro Carvalho Chehab <mchehab+samsung@kernel.org>
Cc: Hans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: default avatarJonathan Corbet <corbet@lwn.net>
parent e37274fa

LICENSES/exceptions/Linux-syscall-note

+1 −1
Original line number Diff line number Diff line 
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

LICENSES/preferred/GPL-2.0

+6 −0
Original line number Diff line number Diff line 
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