[PATCH] spdxcheck: Work with current HEAD LICENSES/ directory
From: Joe Perches
Date: Tue Jun 05 2018 - 12:12:44 EST
Depending on how old your -next tree is, it may
not have a master that has the LICENSES directory.
Change the lookup to HEAD and find whatever
LICENSE directory files are used in that branch.
Miscellanea:
o Remove the checkpatch test as it will have its own
SPDX license identifier.
Signed-off-by: Joe Perches <joe@xxxxxxxxxxx>
---
scripts/spdxcheck.py | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
diff --git a/scripts/spdxcheck.py b/scripts/spdxcheck.py
index 7deaef297f52..a6041f29b18e 100755
--- a/scripts/spdxcheck.py
+++ b/scripts/spdxcheck.py
@@ -32,7 +32,7 @@ def read_spdxdata(repo):
# The subdirectories of LICENSES in the kernel source
license_dirs = [ "preferred", "other", "exceptions" ]
- lictree = repo.heads.master.commit.tree['LICENSES']
+ lictree = repo.head.commit.tree['LICENSES']
spdx = SPDXdata()
@@ -199,8 +199,6 @@ def scan_git_tree(tree):
continue
if el.path.find("license-rules.rst") >= 0:
continue
- if el.path == 'scripts/checkpatch.pl':
- continue
if not os.path.isfile(el.path):
continue
parser.parse_lines(open(el.path), args.maxlines, el.path)