From: Joe Perches <joe@xxxxxxxxxxx> Subject: 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: o Remove the checkpatch test as it will have its own SPDX license identifier. Link: http://lkml.kernel.org/r/7eeefc862194930c773e662cb2152e178441d3b8.camel@xxxxxxxxxxx Signed-off-by: Joe Perches <joe@xxxxxxxxxxx> Reviewed-by: Thomas Gleixner <tglx@xxxxxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- scripts/spdxcheck.py | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) --- a/scripts/spdxcheck.py~spdxcheck-work-with-current-head-licenses-directory +++ a/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) _
