summaryrefslogtreecommitdiffstats
path: root/tools/buildman
diff options
context:
space:
mode:
authorTom Rini <trini@konsulko.com>2018-05-06 17:58:06 -0400
committerTom Rini <trini@konsulko.com>2018-05-07 09:34:12 -0400
commit83d290c56fab2d38cd1ab4c4cc7099559c1d5046 (patch)
tree5e5d1b40b52aaf96b707e0da2474573306d22f7b /tools/buildman
parent7ce85318cfff5fd82a059131761559cba7fef309 (diff)
downloadu-boot-83d290c56fab2d38cd1ab4c4cc7099559c1d5046.tar.gz
u-boot-83d290c56fab2d38cd1ab4c4cc7099559c1d5046.tar.xz
u-boot-83d290c56fab2d38cd1ab4c4cc7099559c1d5046.zip
SPDX: Convert all of our single license tags to Linux Kernel style
When U-Boot started using SPDX tags we were among the early adopters and there weren't a lot of other examples to borrow from. So we picked the area of the file that usually had a full license text and replaced it with an appropriate SPDX-License-Identifier: entry. Since then, the Linux Kernel has adopted SPDX tags and they place it as the very first line in a file (except where shebangs are used, then it's second line) and with slightly different comment styles than us. In part due to community overlap, in part due to better tag visibility and in part for other minor reasons, switch over to that style. This commit changes all instances where we have a single declared license in the tag as both the before and after are identical in tag contents. There's also a few places where I found we did not have a tag and have introduced one. Signed-off-by: Tom Rini <trini@konsulko.com>
Diffstat (limited to 'tools/buildman')
-rw-r--r--tools/buildman/README4
-rw-r--r--tools/buildman/board.py4
-rw-r--r--tools/buildman/bsettings.py4
-rw-r--r--tools/buildman/builder.py3
-rw-r--r--tools/buildman/builderthread.py3
-rwxr-xr-xtools/buildman/buildman.py3
-rw-r--r--tools/buildman/cmdline.py4
-rw-r--r--tools/buildman/control.py3
-rw-r--r--tools/buildman/func_test.py4
-rw-r--r--tools/buildman/kconfiglib.py3
-rw-r--r--tools/buildman/test.py4
-rw-r--r--tools/buildman/toolchain.py3
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