scripts/spdxcheck.py: Add dual license subdirectory [Linux 5.2]

scripts/spdxcheck.py: Add dual license subdirectory [Linux 5.2]

This Linux kernel change "scripts/spdxcheck.py: Add dual license subdirectory" is included in the Linux 5.2 release. This change is authored by Sven Eckelmann <sven [at] narfation.org> on Sat May 11 22:19:17 2019 +0200. The commit for this change in Linux stable tree is 29077bc (patch).

scripts/spdxcheck.py: Add dual license subdirectory

The licenses from the other directory were partially moved to the dual
directory in commit 8ea8814fcdcb ("LICENSES: Clearly mark dual license only
licenses"). checkpatch therefore rejected files like
drivers/staging/android/ashmem.h with

  WARNING: 'SPDX-License-Identifier: GPL-2.0 OR Apache-2.0 */' is not supported in LICENSES/...
  #1: FILE: drivers/staging/android/ashmem.h:1:
  +/* SPDX-License-Identifier: GPL-2.0 OR Apache-2.0 */

Fixes: 8ea8814fcdcb ("LICENSES: Clearly mark dual license only licenses")
Signed-off-by: Sven Eckelmann <[email protected]>
Reviewed-by: Christoph Hellwig <[email protected]>
Signed-off-by: Jonathan Corbet <[email protected]>

There are 2 lines of Linux source code added/deleted in this change. Code changes to Linux kernel are as follows.

 scripts/spdxcheck.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/spdxcheck.py b/scripts/spdxcheck.py
index 1a39b34..33df646 100755
--- a/scripts/spdxcheck.py
+++ b/scripts/spdxcheck.py
@@ -32,7 +32,7 @@ class SPDXdata(object):
 def read_spdxdata(repo):

     # The subdirectories of LICENSES in the kernel source
-    license_dirs = [ "preferred", "deprecated", "exceptions" ]
+    license_dirs = [ "preferred", "deprecated", "exceptions", "dual" ]
     lictree = repo.head.commit.tree['LICENSES']

     spdx = SPDXdata()

Leave a Reply

Your email address will not be published. Required fields are marked *