Commit fde5e903 authored Aug 17, 2018 by Joe Perches Committed by Linus Torvalds Aug 17, 2018

scripts/spdxcheck.py: work with current HEAD LICENSES/ directory

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:

 - Remove the checkpatch test as it will have its own SPDX license
   identifier.

Link: http://lkml.kernel.org/r/7eeefc862194930c773e662cb2152e178441d3b8.camel@perches.com


Signed-off-by: Joe Perches <joe@perches.com>
Reviewed-by: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

parent f08957d0

scripts/spdxcheck.py

+1 −3

Original line number	Diff line number	Diff line
		@@ -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)

Admin message