[elbe-devel] [PATCH 04/15] makofiles: Use the poky scripts under MIT
Benedikt Spranger
b.spranger at linutronix.de
Thu Oct 26 15:41:02 CEST 2023
From: Bastian Germann <bage at linutronix.de>
The SDK scripts that were copied from poky are dual-licensed under GPL-2 or
MIT. In later versions, poky removed the GPL-2 option.
Using them under MIT is preferrable because the license can easily be
embedded in the files that are integrated in Elbe's build output.
Embed the MIT in the mako templates and add the SPDX license headers.
Signed-off-by: Bastian Germann <bage at linutronix.de>
Reviewed-by: Benedikt Spranger <b.spranger at linutronix.de>
---
debian/copyright | 57 +++++++++++--
.../makofiles/environment-setup-elbe.mako | 79 +++++++++++--------
.../makofiles/toolchain-shar-extract.sh.mako | 49 +++++++-----
3 files changed, 128 insertions(+), 57 deletions(-)
diff --git a/debian/copyright b/debian/copyright
index 554f020e..56eaaeac 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -11,6 +11,36 @@ Files: contrib/k8s/*
Copyright: Manuel Traut <manuel.traut at mt.com>
License: GPL-3+
+Files: elbepack/makofiles/environment-setup-elbe.mako
+Copyright: Richard Purdie <richard.purdie at linuxfoundation.org>
+ Lianhao Lu <lianhao.lu at intel.com>
+ Jessica Zhang <jessica.zhang at intel.com>
+ Richard Purdie <rpurdie at linux.intel.com>
+ Joshua Lock <joshua.g.lock at intel.com>
+ Mark Hatle <mark.hatle at windriver.com>
+ Otavio Salvador <otavio at ossystems.com.br>
+ Randy Witt <randy.e.witt at linux.intel.com>
+ Dongxiao Xu <dongxiao.xu at intel.com>
+ Joshua Lock <josh at linux.intel.com>
+ Khem Raj <raj.khem at gmail.com>
+ Robert Yang <liezhi.yang at windriver.com>
+ Ross Burton <ross.burton at intel.com>
+ Stephano Cetola <stephano.cetola at linux.intel.com>
+ Zongchun Yu <b40527 at freescale.com>
+ Andre McCurdy <armccurdy at gmail.com>
+ Christopher Larson <chris_larson at mentor.com>
+ Denys Dmytriyenko <denys at ti.com>
+ Fang Jia <fang.jia at windriver.com>
+ Jacob Kroon <jacob.kroon at gmail.com>
+ Jun Zhang <jun.zhang at windriver.com>
+ Kevin Tian <kevin.tian at intel.com>
+ Koen Kooi <koen at dominion.thruhere.net>
+ Laszlo Papp <lpapp at kde.org>
+ Laurentiu Palcu <laurentiu.palcu at intel.com>
+ Martin Ertsaas <mertsas at cisco.com>
+ Nitin A Kamble <nitin.a.kamble at intel.com>
+License: Expat
+
Files: elbepack/makofiles/toolchain-shar-extract.sh.mako
Copyright: Aníbal Limón <anibal.limon at linux.intel.com>
Brendan Le Foll <brendan.le.foll at intel.com>
@@ -18,17 +48,13 @@ Copyright: Aníbal Limón <anibal.limon at linux.intel.com>
George Nita <george.nita at enea.com>
Maxin B. John <maxin.john at intel.com>
Paul Eggleton <paul.eggleton at linux.intel.com>
- Qi.Chen at windriver.com <Qi.Chen at windriver.com>
+ Qi Chen <Qi.Chen at windriver.com>
Randy Witt <randy.e.witt at linux.intel.com>
Richard Purdie <richard.purdie at linuxfoundation.org>
Robert Yang <liezhi.yang at windriver.com>
Todor Minchev <todor.minchev at linux.intel.com>
Wenlin Kang <wenlin.kang at windriver.com>
-License: GPL-2
- SPDX-License-Identifier: GPL-2.0-only
- On Debian systems, the full text of the GNU General Public
- License version 2 can be found in the file
- `/usr/share/common-licenses/GPL-2'.
+License: Expat
Files: .gitignore AUTHORS THANKS examples/*
docs/asciidoc.conf docs/conf.py
@@ -95,6 +121,25 @@ License: W3C
Title to copyright in this software and any associated documentation will at all times
remain with copyright holders.
+License: Expat
+ Permission is hereby granted, free of charge, to any person obtaining a copy
+ of this software and associated documentation files (the "Software"), to deal
+ in the Software without restriction, including without limitation the rights
+ to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ copies of the Software, and to permit persons to whom the Software is
+ furnished to do so, subject to the following conditions:
+ .
+ The above copyright notice and this permission notice shall be included in
+ all copies or substantial portions of the Software.
+ .
+ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ THE SOFTWARE.
+
License: GPL-3+
SPDX-License-Identifier: GPL-3.0-or-later
On Debian systems, the full text of the GNU General Public
diff --git a/elbepack/makofiles/environment-setup-elbe.mako b/elbepack/makofiles/environment-setup-elbe.mako
index b758f011..b5282706 100644
--- a/elbepack/makofiles/environment-setup-elbe.mako
+++ b/elbepack/makofiles/environment-setup-elbe.mako
@@ -1,40 +1,53 @@
-## This file was copied from http://git.yoctoproject.org/git/poky
-## 16e22f3e37788afb83044f5089d24187d70094bd
+## This file was copied from
+## https://git.yoctoproject.org/poky/tree/meta/classes/toolchain-scripts.bbclass
+## ?id=16e22f3e37788afb83044f5089d24187d70094bd
##
-## origin location of the file is: 'meta/classes/toolchain-scripts.bbclass'
+## SPDX-License-Identifier: MIT
+## SPDX-FileCopyrightText: Richard Purdie <richard.purdie at linuxfoundation.org>
+## SPDX-FileCopyrightText: Lianhao Lu <lianhao.lu at intel.com>
+## SPDX-FileCopyrightText: Jessica Zhang <jessica.zhang at intel.com>
+## SPDX-FileCopyrightText: Richard Purdie <rpurdie at linux.intel.com>
+## SPDX-FileCopyrightText: Joshua Lock <joshua.g.lock at intel.com>
+## SPDX-FileCopyrightText: Mark Hatle <mark.hatle at windriver.com>
+## SPDX-FileCopyrightText: Otavio Salvador <otavio at ossystems.com.br>
+## SPDX-FileCopyrightText: Randy Witt <randy.e.witt at linux.intel.com>
+## SPDX-FileCopyrightText: Dongxiao Xu <dongxiao.xu at intel.com>
+## SPDX-FileCopyrightText: Joshua Lock <josh at linux.intel.com>
+## SPDX-FileCopyrightText: Khem Raj <raj.khem at gmail.com>
+## SPDX-FileCopyrightText: Robert Yang <liezhi.yang at windriver.com>
+## SPDX-FileCopyrightText: Ross Burton <ross.burton at intel.com>
+## SPDX-FileCopyrightText: Stephano Cetola <stephano.cetola at linux.intel.com>
+## SPDX-FileCopyrightText: Zongchun Yu <b40527 at freescale.com>
+## SPDX-FileCopyrightText: Andre McCurdy <armccurdy at gmail.com>
+## SPDX-FileCopyrightText: Christopher Larson <chris_larson at mentor.com>
+## SPDX-FileCopyrightText: Denys Dmytriyenko <denys at ti.com>
+## SPDX-FileCopyrightText: Fang Jia <fang.jia at windriver.com>
+## SPDX-FileCopyrightText: Jacob Kroon <jacob.kroon at gmail.com>
+## SPDX-FileCopyrightText: Jun Zhang <jun.zhang at windriver.com>
+## SPDX-FileCopyrightText: Kevin Tian <kevin.tian at intel.com>
+## SPDX-FileCopyrightText: Koen Kooi <koen at dominion.thruhere.net>
+## SPDX-FileCopyrightText: Laszlo Papp <lpapp at kde.org>
+## SPDX-FileCopyrightText: Laurentiu Palcu <laurentiu.palcu at intel.com>
+## SPDX-FileCopyrightText: Martin Ertsaas <mertsas at cisco.com>
+## SPDX-FileCopyrightText: Nitin A Kamble <nitin.a.kamble at intel.com>
##
-## known authors of the origin file are:
+## Permission is hereby granted, free of charge, to any person obtaining a copy
+## of this software and associated documentation files (the "Software"), to deal
+## in the Software without restriction, including without limitation the rights
+## to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+## copies of the Software, and to permit persons to whom the Software is
+## furnished to do so, subject to the following conditions:
##
-## Richard Purdie <richard.purdie at linuxfoundation.org>
-## Lianhao Lu <lianhao.lu at intel.com>
-## Jessica Zhang <jessica.zhang at intel.com>
-## Richard Purdie <rpurdie at linux.intel.com>
-## Joshua Lock <joshua.g.lock at intel.com>
-## Mark Hatle <mark.hatle at windriver.com>
-## Otavio Salvador <otavio at ossystems.com.br>
-## Randy Witt <randy.e.witt at linux.intel.com>
-## Dongxiao Xu <dongxiao.xu at intel.com>
-## Joshua Lock <josh at linux.intel.com>
-## Khem Raj <raj.khem at gmail.com>
-## Robert Yang <liezhi.yang at windriver.com>
-## Ross Burton <ross.burton at intel.com>
-## Stephano Cetola <stephano.cetola at linux.intel.com>
-## Zongchun Yu <b40527 at freescale.com>
-## Andre McCurdy <armccurdy at gmail.com>
-## Christopher Larson <chris_larson at mentor.com>
-## Denys Dmytriyenko <denys at ti.com>
-## Fang Jia <fang.jia at windriver.com>
-## Jacob Kroon <jacob.kroon at gmail.com>
-## Jun Zhang <jun.zhang at windriver.com>
-## Kevin Tian <kevin.tian at intel.com>
-## Koen Kooi <koen at dominion.thruhere.net>
-## Laszlo Papp <lpapp at kde.org>
-## Laurentiu Palcu <laurentiu.palcu at intel.com>
-## Martin Ertsaas <mertsas at cisco.com>
-## Nitin A Kamble <nitin.a.kamble at intel.com>
+## The above copyright notice and this permission notice shall be included in
+## all copies or substantial portions of the Software.
##
-## The 'meta' folder of the origin repo contains a
-## COPYING.GPLv2 and COPYING.MIT file.
+## THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+## IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+## FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+## AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+## LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+## OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+## THE SOFTWARE.
# Check for LD_LIBRARY_PATH being set, which can break SDK and generally is a bad practice
# http://tldp.org/HOWTO/Program-Library-HOWTO/shared-libraries.html#AEN80
diff --git a/elbepack/makofiles/toolchain-shar-extract.sh.mako b/elbepack/makofiles/toolchain-shar-extract.sh.mako
index 0f9736dc..6c4d54c0 100644
--- a/elbepack/makofiles/toolchain-shar-extract.sh.mako
+++ b/elbepack/makofiles/toolchain-shar-extract.sh.mako
@@ -1,27 +1,40 @@
#!/bin/sh
##
-## This file was copied from http://git.yoctoproject.org/git/poky
-## 16e22f3e37788afb83044f5089d24187d70094bd
+## This file was copied from
+## https://git.yoctoproject.org/poky/tree/meta/files/toolchain-shar-extract.sh
+## ?id=16e22f3e37788afb83044f5089d24187d70094bd
##
-## origin location of the file is: 'meta/files/toolchain-shar-extract.sh'
+## SPDX-License-Identifier: MIT
+## SPDX-FileCopyrightText: Anibal Limon <anibal.limon at linux.intel.com>
+## SPDX-FileCopyrightText: Brendan Le Foll <brendan.le.foll at intel.com>
+## SPDX-FileCopyrightText: Ed Bartosh <ed.bartosh at linux.intel.com>
+## SPDX-FileCopyrightText: George Nita <george.nita at enea.com>
+## SPDX-FileCopyrightText: Maxin B. John <maxin.john at intel.com>
+## SPDX-FileCopyrightText: Paul Eggleton <paul.eggleton at linux.intel.com>
+## SPDX-FileCopyrightText: Qi Chen <Qi.Chen at windriver.com>
+## SPDX-FileCopyrightText: Randy Witt <randy.e.witt at linux.intel.com>
+## SPDX-FileCopyrightText: Richard Purdie <richard.purdie at linuxfoundation.org>
+## SPDX-FileCopyrightText: Robert Yang <liezhi.yang at windriver.com>
+## SPDX-FileCopyrightText: Todor Minchev <todor.minchev at linux.intel.com>
+## SPDX-FileCopyrightText: Wenlin Kang <wenlin.kang at windriver.com>
##
-## known authors of the origin file are:
+## Permission is hereby granted, free of charge, to any person obtaining a copy
+## of this software and associated documentation files (the "Software"), to deal
+## in the Software without restriction, including without limitation the rights
+## to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+## copies of the Software, and to permit persons to whom the Software is
+## furnished to do so, subject to the following conditions:
##
-## Anibal Limon <anibal.limon at linux.intel.com>
-## Brendan Le Foll <brendan.le.foll at intel.com>
-## Ed Bartosh <ed.bartosh at linux.intel.com>
-## George Nita <george.nita at enea.com>
-## Maxin B. John <maxin.john at intel.com>
-## Paul Eggleton <paul.eggleton at linux.intel.com>
-## Qi.Chen at windriver.com <Qi.Chen at windriver.com>
-## Randy Witt <randy.e.witt at linux.intel.com>
-## Richard Purdie <richard.purdie at linuxfoundation.org>
-## Robert Yang <liezhi.yang at windriver.com>
-## Todor Minchev <todor.minchev at linux.intel.com>
-## Wenlin Kang <wenlin.kang at windriver.com>
+## The above copyright notice and this permission notice shall be included in
+## all copies or substantial portions of the Software.
##
-## The 'meta' folder of the origin repo contains a
-## COPYING.GPLv2 and COPYING.MIT file.
+## THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+## IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+## FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+## AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+## LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+## OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+## THE SOFTWARE.
[ -z "$ENVCLEANED" ] && exec /usr/bin/env -i ENVCLEANED=1 HOME="$HOME" \
LC_ALL=en_US.UTF-8 \
--
2.42.0
More information about the elbe-devel
mailing list