Merge branch 'for-next/license' into master

4 files changed, 12 insertions, 25 deletions

diff --git a/scripts/imx/imx-image.c b/scripts/imx/imx-image.c
index de04962b09..f5e89d07a6 100644
--- a/scripts/imx/imx-image.c
+++ b/scripts/imx/imx-image.c
@@ -1,17 +1,6 @@
-/*
- * (C) Copyright 2013 Sascha Hauer, Pengutronix
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of
- * the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- */
+// SPDX-License-Identifier: GPL-2.0-or-later
+// SPDX-FileCopyrightText: 2013 Sascha Hauer, Pengutronix
+
 #define _GNU_SOURCE
 #include <stdio.h>
 #include <unistd.h>
diff --git a/scripts/mxsimage.c b/scripts/mxsimage.c
index 8a63d76939..81507d1924 100644
--- a/scripts/mxsimage.c
+++ b/scripts/mxsimage.c
@@ -1,10 +1,7 @@
-/*
- * Freescale i.MX23/i.MX28 SB image generator
- *
- * Copyright (C) 2012-2013 Marek Vasut <marex@denx.de>
- *
- * SPDX-License-Identifier:	GPL-2.0+
- */
+// SPDX-License-Identifier: GPL-2.0-or-later WITH LicenseRef-OpenSSL-exception
+// SPDX-FileCopyrightText: 2012-2013 Marek Vasut <marex@denx.de>
+
+/* Freescale i.MX23/i.MX28 SB image generator */
 
 #include <errno.h>
 #include <fcntl.h>
diff --git a/scripts/rsatoc.c b/scripts/rsatoc.c
index 8f2eb8fded..f2d91b8e0d 100644
--- a/scripts/rsatoc.c
+++ b/scripts/rsatoc.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-2.0+
+// SPDX-License-Identifier: GPL-2.0-or-later WITH LicenseRef-OpenSSL-exception
 /*
  * rsatoc - utility to convert an RSA key to a C struct
  *
diff --git a/scripts/spdxcheck.py b/scripts/spdxcheck.py
index 723bfa4ebf..6374e078a5 100755
--- a/scripts/spdxcheck.py
+++ b/scripts/spdxcheck.py
@@ -32,7 +32,8 @@ class SPDXdata(object):
 def read_spdxdata(repo):
 
     # The subdirectories of LICENSES in the kernel source
-    license_dirs = [ "preferred" ]
+    # Note: exceptions needs to be parsed as last directory.
+    license_dirs = [ "preferred", "dual", "deprecated", "exceptions" ]
     lictree = repo.head.commit.tree['LICENSES']
 
     spdx = SPDXdata()
@@ -58,13 +59,13 @@ def read_spdxdata(repo):
                 elif l.startswith('SPDX-Licenses:'):
                     for lic in l.split(':')[1].upper().strip().replace(' ', '').replace('\t', '').split(','):
                         if not lic in spdx.licenses:
-                            raise SPDXException(None, 'Exception %s missing license %s' %(ex, lic))
+                            raise SPDXException(None, 'Exception %s missing license %s' %(exception, lic))
                         spdx.exceptions[exception].append(lic)
 
                 elif l.startswith("License-Text:"):
                     if exception:
                         if not len(spdx.exceptions[exception]):
-                            raise SPDXException(el, 'Exception %s is missing SPDX-Licenses' %excid)
+                            raise SPDXException(el, 'Exception %s is missing SPDX-Licenses' %exception)
                         spdx.exception_files += 1
                     else:
                         spdx.license_files += 1