From: Sven Eckelmann Date: Sat, 11 May 2019 20:19:17 +0000 (+0200) Subject: scripts/spdxcheck.py: Add dual license subdirectory X-Git-Tag: v5.4-rc1~151^2~202 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=29077bc5b7a4644dd8b536a327fa63c88e6f872e;p=platform%2Fkernel%2Flinux-rpi.git 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 Reviewed-by: Christoph Hellwig Signed-off-by: Jonathan Corbet --- diff --git a/scripts/spdxcheck.py b/scripts/spdxcheck.py index 1a39b345..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()