[PATCH] spdxcheck: Work with current HEAD LICENSES/ directory

[PATCH] spdxcheck: Work with current HEAD LICENSES/ directory

[Joe Perches]

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@perches.com>
---
 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)

Re: [PATCH] spdxcheck: Work with current HEAD LICENSES/ directory

[Thomas Gleixner]

On Tue, 5 Jun 2018, Joe Perches wrote:

> 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@perches.com>

Reviewed-by: Thomas Gleixner <tglx@linutronix.de>

Re: [PATCH] spdxcheck: Work with current HEAD LICENSES/ directory

[Joe Perches]

On Tue, 2018-06-05 at 21:22 +0200, Thomas Gleixner wrote:
> On Tue, 5 Jun 2018, Joe Perches wrote:
> 
> > 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@perches.com>
> 
> Reviewed-by: Thomas Gleixner <tglx@linutronix.de>

Can either of you apply this?

https://patchwork.kernel.org/patch/10448573/