summaryrefslogtreecommitdiffstats
path: root/scripts/lib/resulttool/merge.py
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2019-05-08 18:22:19 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2019-05-09 16:31:55 +0100
commitffae400179fd0b64f8882cf79d78e1c0f2d74bee (patch)
treecc5e242e02c3621ea124552ecb9779371500335b /scripts/lib/resulttool/merge.py
parentc7592b01478def091b6787412390c61e7ce0a0cd (diff)
downloadpoky-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 'scripts/lib/resulttool/merge.py')
-rw-r--r--scripts/lib/resulttool/merge.py10
1 files changed, 2 insertions, 8 deletions
diff --git a/scripts/lib/resulttool/merge.py b/scripts/lib/resulttool/merge.py
index 7159463f6e..70d23a48fd 100644
--- a/scripts/lib/resulttool/merge.py
+++ b/scripts/lib/resulttool/merge.py
@@ -3,15 +3,9 @@
3# Copyright (c) 2019, Intel Corporation. 3# Copyright (c) 2019, Intel Corporation.
4# Copyright (c) 2019, Linux Foundation 4# Copyright (c) 2019, Linux Foundation
5# 5#
6# This program is free software; you can redistribute it and/or modify it 6# SPDX-License-Identifier: GPL-2.0-only
7# under the terms and conditions of the GNU General Public License,
8# version 2, as published by the Free Software Foundation.
9#
10# This program is distributed in the hope it will be useful, but WITHOUT
11# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
12# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
13# more details.
14# 7#
8
15import os 9import os
16import json 10import json
17import resulttool.resultutils as resultutils 11import resulttool.resultutils as resultutils