diff mbox series

[RFC,01/28] Add Zlib License

Message ID 20210701061611.957918-2-seanga2@gmail.com
State RFC
Delegated to: Tom Rini
Headers show
Series cli: Add a new shell | expand

Commit Message

Sean Anderson July 1, 2021, 6:15 a.m. UTC 
This adds the Zlib License which is compatible with GPLv2 as long as its
terms are met. Files originally licensed as Zlib should use the "GPL-2.0+
AND Zlib" SPDX identifier.

Signed-off-by: Sean Anderson <seanga2@gmail.com>
---

 Licenses/README   |  1 +
 Licenses/zlib.txt | 14 ++++++++++++++
 2 files changed, 15 insertions(+)
 create mode 100644 Licenses/zlib.txt

Comments

Simon Glass July 5, 2021, 3:29 p.m. UTC | #1 
On Thu, 1 Jul 2021 at 00:16, Sean Anderson <seanga2@gmail.com> wrote:
>
> This adds the Zlib License which is compatible with GPLv2 as long as its
> terms are met. Files originally licensed as Zlib should use the "GPL-2.0+
> AND Zlib" SPDX identifier.
>
> Signed-off-by: Sean Anderson <seanga2@gmail.com>
> ---
>
>  Licenses/README   |  1 +
>  Licenses/zlib.txt | 14 ++++++++++++++
>  2 files changed, 15 insertions(+)
>  create mode 100644 Licenses/zlib.txt

Reviewed-by: Simon Glass <sjg@chromium.org>
diff mbox series

Patch

diff --git a/Licenses/README b/Licenses/README
index d09f0fe2cb..d5af353520 100644
--- a/Licenses/README
+++ b/Licenses/README
@@ -152,4 +152,5 @@  IBM PIBS (PowerPC Initialization and		IBM-pibs			ibm-pibs.txt
 ISC License					ISC		Y		isc.txt			https://spdx.org/licenses/ISC
 MIT License					MIT		Y		mit.txt			https://spdx.org/licenses/MIT.html
 SIL OPEN FONT LICENSE (OFL-1.1)			OFL-1.1		Y		OFL.txt			https://spdx.org/licenses/OFL-1.1.html
+zlib License					Zlib		Y		zlib.txt		https://spdx.org/licenses/Zlib.html
 X11 License					X11				x11.txt			https://spdx.org/licenses/X11.html
diff --git a/Licenses/zlib.txt b/Licenses/zlib.txt
new file mode 100644
index 0000000000..7ea8dde871
--- /dev/null
+++ b/Licenses/zlib.txt
@@ -0,0 +1,14 @@ 
+This software is provided 'as-is', without any express or implied warranty. In
+no event will the authors be held liable for any damages arising from the use
+of this software.
+
+Permission is granted to anyone to use this software for any purpose, including
+commercial applications, and to alter it and redistribute it freely, subject
+to the following restrictions:
+  1. The origin of this software must not be misrepresented; you must not
+claim that you wrote the original software. If you use this software in a
+product, an acknowledgment in the product documentation would be appreciated
+but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.