12 files changed, 12 insertions, 30 deletions
diff --git a/tools/buildman/README b/tools/buildman/README
index aaee58152b..6c43c546f8 100644
--- a/tools/buildman/README
+++ b/tools/buildman/README
@@ -1,7 +1,5 @@
+# SPDX-License-Identifier: GPL-2.0+
 # Copyright (c) 2013 The Chromium OS Authors.
-#
-# SPDX-License-Identifier:	GPL-2.0+
-#
 
 (Please read 'How to change from MAKEALL' if you are used to that tool)
 
diff --git a/tools/buildman/board.py b/tools/buildman/board.py
index f842d3a1fa..272bac0c21 100644
--- a/tools/buildman/board.py
+++ b/tools/buildman/board.py
@@ -1,7 +1,5 @@
+# SPDX-License-Identifier: GPL-2.0+
 # Copyright (c) 2012 The Chromium OS Authors.
-#
-# SPDX-License-Identifier:	GPL-2.0+
-#
 
 import re
 
diff --git a/tools/buildman/bsettings.py b/tools/buildman/bsettings.py
index 892cfa09e2..03d7439aa5 100644
--- a/tools/buildman/bsettings.py
+++ b/tools/buildman/bsettings.py
@@ -1,7 +1,5 @@
+# SPDX-License-Identifier: GPL-2.0+
 # Copyright (c) 2012 The Chromium OS Authors.
-#
-# SPDX-License-Identifier:	GPL-2.0+
-#
 
 import ConfigParser
 import os
diff --git a/tools/buildman/builder.py b/tools/buildman/builder.py
index 4e72b7d60d..2ccdee02a3 100644
--- a/tools/buildman/builder.py
+++ b/tools/buildman/builder.py
@@ -1,9 +1,8 @@
+# SPDX-License-Identifier: GPL-2.0+
 # Copyright (c) 2013 The Chromium OS Authors.
 #
 # Bloat-o-meter code used here Copyright 2004 Matt Mackall <mpm@selenic.com>
 #
-# SPDX-License-Identifier:	GPL-2.0+
-#
 
 import collections
 from datetime import datetime, timedelta
diff --git a/tools/buildman/builderthread.py b/tools/buildman/builderthread.py
index 9ac101a5a4..fa9dec043a 100644
--- a/tools/buildman/builderthread.py
+++ b/tools/buildman/builderthread.py
@@ -1,7 +1,6 @@
+# SPDX-License-Identifier: GPL-2.0+
 # Copyright (c) 2014 Google, Inc
 #
-# SPDX-License-Identifier:      GPL-2.0+
-#
 
 import errno
 import glob
diff --git a/tools/buildman/buildman.py b/tools/buildman/buildman.py
index 473117ccff..f17aa15e7c 100755
--- a/tools/buildman/buildman.py
+++ b/tools/buildman/buildman.py
@@ -1,9 +1,8 @@
 #!/usr/bin/env python2
+# SPDX-License-Identifier: GPL-2.0+
 #
 # Copyright (c) 2012 The Chromium OS Authors.
 #
-# SPDX-License-Identifier:	GPL-2.0+
-#
 
 """See README for more information"""
 
diff --git a/tools/buildman/cmdline.py b/tools/buildman/cmdline.py
index 6949d6bf2c..b8ddd4795c 100644
--- a/tools/buildman/cmdline.py
+++ b/tools/buildman/cmdline.py
@@ -1,8 +1,6 @@
-#
+# SPDX-License-Identifier: GPL-2.0+
 # Copyright (c) 2014 Google, Inc
 #
-# SPDX-License-Identifier:      GPL-2.0+
-#
 
 from optparse import OptionParser
 
diff --git a/tools/buildman/control.py b/tools/buildman/control.py
index 3cac9f7cf6..c14b87842d 100644
--- a/tools/buildman/control.py
+++ b/tools/buildman/control.py
@@ -1,7 +1,6 @@
+# SPDX-License-Identifier: GPL-2.0+
 # Copyright (c) 2013 The Chromium OS Authors.
 #
-# SPDX-License-Identifier:	GPL-2.0+
-#
 
 import multiprocessing
 import os
diff --git a/tools/buildman/func_test.py b/tools/buildman/func_test.py
index eec0f9bd37..8d96c1a94d 100644
--- a/tools/buildman/func_test.py
+++ b/tools/buildman/func_test.py
@@ -1,8 +1,6 @@
-#
+# SPDX-License-Identifier: GPL-2.0+
 # Copyright (c) 2014 Google, Inc
 #
-# SPDX-License-Identifier:      GPL-2.0+
-#
 
 import os
 import shutil
diff --git a/tools/buildman/kconfiglib.py b/tools/buildman/kconfiglib.py
index 68b470a3a7..d68af056b6 100644
--- a/tools/buildman/kconfiglib.py
+++ b/tools/buildman/kconfiglib.py
@@ -1,5 +1,4 @@
-#
-# SPDX-License-Identifier:	ISC
+# SPDX-License-Identifier: ISC
 #
 # Author: Ulf Magnusson
 #   https://github.com/ulfalizer/Kconfiglib
diff --git a/tools/buildman/test.py b/tools/buildman/test.py
index e564a8a142..c36bcdf6fb 100644
--- a/tools/buildman/test.py
+++ b/tools/buildman/test.py
@@ -1,8 +1,6 @@
-#
+# SPDX-License-Identifier: GPL-2.0+
 # Copyright (c) 2012 The Chromium OS Authors.
 #
-# SPDX-License-Identifier:	GPL-2.0+
-#
 
 import os
 import shutil
diff --git a/tools/buildman/toolchain.py b/tools/buildman/toolchain.py
index 2076323d5d..fb3157b2ea 100644
--- a/tools/buildman/toolchain.py
+++ b/tools/buildman/toolchain.py
@@ -1,7 +1,6 @@
+# SPDX-License-Identifier: GPL-2.0+
 # Copyright (c) 2012 The Chromium OS Authors.
 #
-# SPDX-License-Identifier:	GPL-2.0+
-#
 
 import re
 import glob