diff options
author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2019-05-08 18:22:19 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2019-05-09 16:31:55 +0100 |
commit | ffae400179fd0b64f8882cf79d78e1c0f2d74bee (patch) | |
tree | cc5e242e02c3621ea124552ecb9779371500335b /meta/lib/oeqa/utils | |
parent | c7592b01478def091b6787412390c61e7ce0a0cd (diff) | |
download | poky-ffae400179fd0b64f8882cf79d78e1c0f2d74bee.tar.gz |
meta/lib+scripts: Convert to SPDX license headers
This adds SPDX license headers in place of the wide assortment of things
currently in our script headers. We default to GPL-2.0-only except for the
oeqa code where it was clearly submitted and marked as MIT on the most part
or some scripts which had the "or later" GPL versioning.
The patch also drops other obsolete bits of file headers where they were
encoountered such as editor modelines, obsolete maintainer information or
the phrase "All rights reserved" which is now obsolete and not required in
copyright headers (in this case its actually confusing for licensing as all
rights were not reserved).
More work is needed for OE-Core but this takes care of the bulk of the scripts
and meta/lib directories.
The top level LICENSE files are tweaked to match the new structure and the
SPDX naming.
(From OE-Core rev: f8c9c511b5f1b7dbd45b77f345cb6c048ae6763e)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/lib/oeqa/utils')
-rw-r--r-- | meta/lib/oeqa/utils/__init__.py | 3 | ||||
-rw-r--r-- | meta/lib/oeqa/utils/buildproject.py | 4 | ||||
-rw-r--r-- | meta/lib/oeqa/utils/commands.py | 4 | ||||
-rw-r--r-- | meta/lib/oeqa/utils/decorators.py | 4 | ||||
-rw-r--r-- | meta/lib/oeqa/utils/dump.py | 4 | ||||
-rw-r--r-- | meta/lib/oeqa/utils/ftools.py | 4 | ||||
-rw-r--r-- | meta/lib/oeqa/utils/git.py | 2 | ||||
-rw-r--r-- | meta/lib/oeqa/utils/gitarchive.py | 9 | ||||
-rw-r--r-- | meta/lib/oeqa/utils/httpserver.py | 4 | ||||
-rw-r--r-- | meta/lib/oeqa/utils/logparser.py | 3 | ||||
-rw-r--r-- | meta/lib/oeqa/utils/metadata.py | 2 | ||||
-rw-r--r-- | meta/lib/oeqa/utils/network.py | 4 | ||||
-rw-r--r-- | meta/lib/oeqa/utils/package_manager.py | 4 | ||||
-rw-r--r-- | meta/lib/oeqa/utils/qemurunner.py | 4 | ||||
-rw-r--r-- | meta/lib/oeqa/utils/qemutinyrunner.py | 4 | ||||
-rw-r--r-- | meta/lib/oeqa/utils/sshcontrol.py | 5 | ||||
-rw-r--r-- | meta/lib/oeqa/utils/subprocesstweak.py | 3 | ||||
-rw-r--r-- | meta/lib/oeqa/utils/targetbuild.py | 4 | ||||
-rw-r--r-- | meta/lib/oeqa/utils/testexport.py | 4 |
19 files changed, 56 insertions, 19 deletions
diff --git a/meta/lib/oeqa/utils/__init__.py b/meta/lib/oeqa/utils/__init__.py index d38a323013..70fbe7b552 100644 --- a/meta/lib/oeqa/utils/__init__.py +++ b/meta/lib/oeqa/utils/__init__.py | |||
@@ -1,3 +1,6 @@ | |||
1 | # | ||
2 | # SPDX-License-Identifier: MIT | ||
3 | # | ||
1 | # Enable other layers to have modules in the same named directory | 4 | # Enable other layers to have modules in the same named directory |
2 | from pkgutil import extend_path | 5 | from pkgutil import extend_path |
3 | __path__ = extend_path(__path__, __name__) | 6 | __path__ = extend_path(__path__, __name__) |
diff --git a/meta/lib/oeqa/utils/buildproject.py b/meta/lib/oeqa/utils/buildproject.py index 01a803ab61..e6d80cc8dc 100644 --- a/meta/lib/oeqa/utils/buildproject.py +++ b/meta/lib/oeqa/utils/buildproject.py | |||
@@ -1,6 +1,8 @@ | |||
1 | # | ||
1 | # Copyright (C) 2013-2016 Intel Corporation | 2 | # Copyright (C) 2013-2016 Intel Corporation |
2 | # | 3 | # |
3 | # Released under the MIT license (see COPYING.MIT) | 4 | # SPDX-License-Identifier: MIT |
5 | # | ||
4 | 6 | ||
5 | # Provides a class for automating build tests for projects | 7 | # Provides a class for automating build tests for projects |
6 | 8 | ||
diff --git a/meta/lib/oeqa/utils/commands.py b/meta/lib/oeqa/utils/commands.py index 2e6a2289cd..59ebfbe125 100644 --- a/meta/lib/oeqa/utils/commands.py +++ b/meta/lib/oeqa/utils/commands.py | |||
@@ -1,6 +1,8 @@ | |||
1 | # | ||
1 | # Copyright (c) 2013-2014 Intel Corporation | 2 | # Copyright (c) 2013-2014 Intel Corporation |
2 | # | 3 | # |
3 | # Released under the MIT license (see COPYING.MIT) | 4 | # SPDX-License-Identifier: MIT |
5 | # | ||
4 | 6 | ||
5 | # DESCRIPTION | 7 | # DESCRIPTION |
6 | # This module is mainly used by scripts/oe-selftest and modules under meta/oeqa/selftest | 8 | # This module is mainly used by scripts/oe-selftest and modules under meta/oeqa/selftest |
diff --git a/meta/lib/oeqa/utils/decorators.py b/meta/lib/oeqa/utils/decorators.py index d876896921..aabf4110cb 100644 --- a/meta/lib/oeqa/utils/decorators.py +++ b/meta/lib/oeqa/utils/decorators.py | |||
@@ -1,6 +1,8 @@ | |||
1 | # | ||
1 | # Copyright (C) 2013 Intel Corporation | 2 | # Copyright (C) 2013 Intel Corporation |
2 | # | 3 | # |
3 | # Released under the MIT license (see COPYING.MIT) | 4 | # SPDX-License-Identifier: MIT |
5 | # | ||
4 | 6 | ||
5 | # Some custom decorators that can be used by unittests | 7 | # Some custom decorators that can be used by unittests |
6 | # Most useful is skipUnlessPassed which can be used for | 8 | # Most useful is skipUnlessPassed which can be used for |
diff --git a/meta/lib/oeqa/utils/dump.py b/meta/lib/oeqa/utils/dump.py index 79c22b75c4..d34e05e2b4 100644 --- a/meta/lib/oeqa/utils/dump.py +++ b/meta/lib/oeqa/utils/dump.py | |||
@@ -1,3 +1,7 @@ | |||
1 | # | ||
2 | # SPDX-License-Identifier: MIT | ||
3 | # | ||
4 | |||
1 | import os | 5 | import os |
2 | import sys | 6 | import sys |
3 | import errno | 7 | import errno |
diff --git a/meta/lib/oeqa/utils/ftools.py b/meta/lib/oeqa/utils/ftools.py index a7233d4ca6..3093419cc7 100644 --- a/meta/lib/oeqa/utils/ftools.py +++ b/meta/lib/oeqa/utils/ftools.py | |||
@@ -1,3 +1,7 @@ | |||
1 | # | ||
2 | # SPDX-License-Identifier: MIT | ||
3 | # | ||
4 | |||
1 | import os | 5 | import os |
2 | import re | 6 | import re |
3 | import errno | 7 | import errno |
diff --git a/meta/lib/oeqa/utils/git.py b/meta/lib/oeqa/utils/git.py index 757e3f0cbf..ea35a766eb 100644 --- a/meta/lib/oeqa/utils/git.py +++ b/meta/lib/oeqa/utils/git.py | |||
@@ -1,7 +1,7 @@ | |||
1 | # | 1 | # |
2 | # Copyright (C) 2016 Intel Corporation | 2 | # Copyright (C) 2016 Intel Corporation |
3 | # | 3 | # |
4 | # Released under the MIT license (see COPYING.MIT) | 4 | # SPDX-License-Identifier: MIT |
5 | # | 5 | # |
6 | """Git repository interactions""" | 6 | """Git repository interactions""" |
7 | import os | 7 | import os |
diff --git a/meta/lib/oeqa/utils/gitarchive.py b/meta/lib/oeqa/utils/gitarchive.py index 9520b2e126..6e8040eb5c 100644 --- a/meta/lib/oeqa/utils/gitarchive.py +++ b/meta/lib/oeqa/utils/gitarchive.py | |||
@@ -4,14 +4,7 @@ | |||
4 | # Copyright (c) 2017, Intel Corporation. | 4 | # Copyright (c) 2017, Intel Corporation. |
5 | # Copyright (c) 2019, Linux Foundation | 5 | # Copyright (c) 2019, Linux Foundation |
6 | # | 6 | # |
7 | # This program is free software; you can redistribute it and/or modify it | 7 | # SPDX-License-Identifier: GPL-2.0-only |
8 | # under the terms and conditions of the GNU General Public License, | ||
9 | # version 2, as published by the Free Software Foundation. | ||
10 | # | ||
11 | # This program is distributed in the hope it will be useful, but WITHOUT | ||
12 | # ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or | ||
13 | # FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for | ||
14 | # more details. | ||
15 | # | 8 | # |
16 | 9 | ||
17 | import os | 10 | import os |
diff --git a/meta/lib/oeqa/utils/httpserver.py b/meta/lib/oeqa/utils/httpserver.py index a48d4994fd..aa435590f0 100644 --- a/meta/lib/oeqa/utils/httpserver.py +++ b/meta/lib/oeqa/utils/httpserver.py | |||
@@ -1,3 +1,7 @@ | |||
1 | # | ||
2 | # SPDX-License-Identifier: MIT | ||
3 | # | ||
4 | |||
1 | import http.server | 5 | import http.server |
2 | import multiprocessing | 6 | import multiprocessing |
3 | import os | 7 | import os |
diff --git a/meta/lib/oeqa/utils/logparser.py b/meta/lib/oeqa/utils/logparser.py index 584ad4f263..cc6d18d94a 100644 --- a/meta/lib/oeqa/utils/logparser.py +++ b/meta/lib/oeqa/utils/logparser.py | |||
@@ -1,4 +1,7 @@ | |||
1 | #!/usr/bin/env python | 1 | #!/usr/bin/env python |
2 | # | ||
3 | # SPDX-License-Identifier: MIT | ||
4 | # | ||
2 | 5 | ||
3 | import sys | 6 | import sys |
4 | import os | 7 | import os |
diff --git a/meta/lib/oeqa/utils/metadata.py b/meta/lib/oeqa/utils/metadata.py index e0808ae0ac..8013aa684d 100644 --- a/meta/lib/oeqa/utils/metadata.py +++ b/meta/lib/oeqa/utils/metadata.py | |||
@@ -1,6 +1,6 @@ | |||
1 | # Copyright (C) 2016 Intel Corporation | 1 | # Copyright (C) 2016 Intel Corporation |
2 | # | 2 | # |
3 | # Released under the MIT license (see COPYING.MIT) | 3 | # SPDX-License-Identifier: MIT |
4 | # | 4 | # |
5 | # Functions to get metadata from the testing host used | 5 | # Functions to get metadata from the testing host used |
6 | # for analytics of test results. | 6 | # for analytics of test results. |
diff --git a/meta/lib/oeqa/utils/network.py b/meta/lib/oeqa/utils/network.py index 2768f6c5db..59cbbc4f1b 100644 --- a/meta/lib/oeqa/utils/network.py +++ b/meta/lib/oeqa/utils/network.py | |||
@@ -1,3 +1,7 @@ | |||
1 | # | ||
2 | # SPDX-License-Identifier: MIT | ||
3 | # | ||
4 | |||
1 | import socket | 5 | import socket |
2 | 6 | ||
3 | def get_free_port(): | 7 | def get_free_port(): |
diff --git a/meta/lib/oeqa/utils/package_manager.py b/meta/lib/oeqa/utils/package_manager.py index 1495f87321..2d358f7172 100644 --- a/meta/lib/oeqa/utils/package_manager.py +++ b/meta/lib/oeqa/utils/package_manager.py | |||
@@ -1,3 +1,7 @@ | |||
1 | # | ||
2 | # SPDX-License-Identifier: MIT | ||
3 | # | ||
4 | |||
1 | import os | 5 | import os |
2 | import json | 6 | import json |
3 | import shutil | 7 | import shutil |
diff --git a/meta/lib/oeqa/utils/qemurunner.py b/meta/lib/oeqa/utils/qemurunner.py index 1abb2c1b6c..fd386ef5a2 100644 --- a/meta/lib/oeqa/utils/qemurunner.py +++ b/meta/lib/oeqa/utils/qemurunner.py | |||
@@ -1,6 +1,8 @@ | |||
1 | # | ||
1 | # Copyright (C) 2013 Intel Corporation | 2 | # Copyright (C) 2013 Intel Corporation |
2 | # | 3 | # |
3 | # Released under the MIT license (see COPYING.MIT) | 4 | # SPDX-License-Identifier: MIT |
5 | # | ||
4 | 6 | ||
5 | # This module provides a class for starting qemu images using runqemu. | 7 | # This module provides a class for starting qemu images using runqemu. |
6 | # It's used by testimage.bbclass. | 8 | # It's used by testimage.bbclass. |
diff --git a/meta/lib/oeqa/utils/qemutinyrunner.py b/meta/lib/oeqa/utils/qemutinyrunner.py index 5aa99d0686..364005bd2d 100644 --- a/meta/lib/oeqa/utils/qemutinyrunner.py +++ b/meta/lib/oeqa/utils/qemutinyrunner.py | |||
@@ -1,6 +1,8 @@ | |||
1 | # | ||
1 | # Copyright (C) 2015 Intel Corporation | 2 | # Copyright (C) 2015 Intel Corporation |
2 | # | 3 | # |
3 | # Released under the MIT license (see COPYING.MIT) | 4 | # SPDX-License-Identifier: MIT |
5 | # | ||
4 | 6 | ||
5 | # This module provides a class for starting qemu images of poky tiny. | 7 | # This module provides a class for starting qemu images of poky tiny. |
6 | # It's used by testimage.bbclass. | 8 | # It's used by testimage.bbclass. |
diff --git a/meta/lib/oeqa/utils/sshcontrol.py b/meta/lib/oeqa/utils/sshcontrol.py index d292893c08..49a07264c6 100644 --- a/meta/lib/oeqa/utils/sshcontrol.py +++ b/meta/lib/oeqa/utils/sshcontrol.py | |||
@@ -1,7 +1,8 @@ | |||
1 | # -*- coding: utf-8 -*- | 1 | # |
2 | # Copyright (C) 2013 Intel Corporation | 2 | # Copyright (C) 2013 Intel Corporation |
3 | # | 3 | # |
4 | # Released under the MIT license (see COPYING.MIT) | 4 | # SPDX-License-Identifier: MIT |
5 | # | ||
5 | 6 | ||
6 | # Provides a class for setting up ssh connections, | 7 | # Provides a class for setting up ssh connections, |
7 | # running commands and copying files to/from a target. | 8 | # running commands and copying files to/from a target. |
diff --git a/meta/lib/oeqa/utils/subprocesstweak.py b/meta/lib/oeqa/utils/subprocesstweak.py index 1f7d11b55c..b47975a4bc 100644 --- a/meta/lib/oeqa/utils/subprocesstweak.py +++ b/meta/lib/oeqa/utils/subprocesstweak.py | |||
@@ -1,3 +1,6 @@ | |||
1 | # | ||
2 | # SPDX-License-Identifier: MIT | ||
3 | # | ||
1 | import subprocess | 4 | import subprocess |
2 | 5 | ||
3 | class OETestCalledProcessError(subprocess.CalledProcessError): | 6 | class OETestCalledProcessError(subprocess.CalledProcessError): |
diff --git a/meta/lib/oeqa/utils/targetbuild.py b/meta/lib/oeqa/utils/targetbuild.py index b8db7b2aca..1055810ca3 100644 --- a/meta/lib/oeqa/utils/targetbuild.py +++ b/meta/lib/oeqa/utils/targetbuild.py | |||
@@ -1,6 +1,8 @@ | |||
1 | # | ||
1 | # Copyright (C) 2013 Intel Corporation | 2 | # Copyright (C) 2013 Intel Corporation |
2 | # | 3 | # |
3 | # Released under the MIT license (see COPYING.MIT) | 4 | # SPDX-License-Identifier: MIT |
5 | # | ||
4 | 6 | ||
5 | # Provides a class for automating build tests for projects | 7 | # Provides a class for automating build tests for projects |
6 | 8 | ||
diff --git a/meta/lib/oeqa/utils/testexport.py b/meta/lib/oeqa/utils/testexport.py index be2a2110fc..e89d130a9c 100644 --- a/meta/lib/oeqa/utils/testexport.py +++ b/meta/lib/oeqa/utils/testexport.py | |||
@@ -1,6 +1,8 @@ | |||
1 | # | ||
1 | # Copyright (C) 2015 Intel Corporation | 2 | # Copyright (C) 2015 Intel Corporation |
2 | # | 3 | # |
3 | # Released under the MIT license (see COPYING.MIT) | 4 | # SPDX-License-Identifier: MIT |
5 | # | ||
4 | 6 | ||
5 | # Provides functions to help with exporting binaries obtained from built targets | 7 | # Provides functions to help with exporting binaries obtained from built targets |
6 | 8 | ||