mail archive of the barebox mailing list
 help / color / mirror / Atom feed
From: Ahmad Fatoum <a.fatoum@pengutronix.de>
To: barebox@lists.infradead.org
Cc: Ahmad Fatoum <a.fatoum@pengutronix.de>,
	ukl@pengutronix.de, rhi@pengutronix.de
Subject: [PATCH v2 3/4] LICENSES: exceptions: factor out eCos-exception-2.0 for GPL
Date: Thu, 26 Nov 2020 18:55:52 +0100	[thread overview]
Message-ID: <20201126175553.16934-3-a.fatoum@pengutronix.de> (raw)
In-Reply-To: <20201126175553.16934-1-a.fatoum@pengutronix.de>

We have code imported from eCos that's licensed with this exception.
Replace instances of the exceptions with a SPDX-License-Identifier
referencing the exception in our LICENSES directory.

Signed-off-by: Ahmad Fatoum <a.fatoum@pengutronix.de>
---
v1 -> v2: dropped files that changed meanwhile (in next and earlier in
          the series)
---
 LICENSES/exceptions/eCos-exception-2.0 | 13 +++++++++++++
 drivers/serial/arm_dcc.c               | 21 +--------------------
 2 files changed, 14 insertions(+), 20 deletions(-)
 create mode 100644 LICENSES/exceptions/eCos-exception-2.0

diff --git a/LICENSES/exceptions/eCos-exception-2.0 b/LICENSES/exceptions/eCos-exception-2.0
new file mode 100644
index 000000000000..291103666f10
--- /dev/null
+++ b/LICENSES/exceptions/eCos-exception-2.0
@@ -0,0 +1,13 @@
+SPDX-Exception-Identifier: eCos-exception-2.0
+SPDX-URL: https://spdx.org/licenses/eCos-exception-2.0.html
+SPDX-Licenses: GPL-2.0-only, GPL-2.0-or-later, GPL-2.0, GPL-2.0+
+License-Text:
+  As a special exception, if other files instantiate templates or use macros or
+  inline functions from this file, or you compile this file and link it with
+  other works to produce a work based on this file, this file does not by itself
+  cause the resulting work to be covered by the GNU General Public License.
+  However the source code for this file must still be made available in
+  accordance with section (3) of the GNU General Public License.
+
+  This exception does not invalidate any other reasons why a work based on this
+  file might be covered by the GNU General Public License.
diff --git a/drivers/serial/arm_dcc.c b/drivers/serial/arm_dcc.c
index e5f2bbe5e2ae..db0ee7fe0908 100644
--- a/drivers/serial/arm_dcc.c
+++ b/drivers/serial/arm_dcc.c
@@ -1,26 +1,7 @@
+/* SPDX-License-Identifier: GPL-2.0-only WITH eCos-exception-2.0 */
 /*
  * Copyright (C) 2004-2007 ARM Limited.
  * Copyright (C) 2008 Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License version 2
- * as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- *
- * As a special exception, if other files instantiate templates or use macros
- * or inline functions from this file, or you compile this file and link it
- * with other works to produce a work based on this file, this file does not
- * by itself cause the resulting work to be covered by the GNU General Public
- * License. However the source code for this file must still be made available
- * in accordance with section (3) of the GNU General Public License.
-
- * This exception does not invalidate any other reasons why a work based on
- * this file might be covered by the GNU General Public License.
  */
 
 #include <common.h>
-- 
2.29.2


_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

  parent reply	other threads:[~2020-11-26 17:56 UTC|newest]

Thread overview: 11+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-11-26 17:55 [PATCH v2 1/4] ARM: at91: sama5d2: giantboard: fix typo in SPDX-License-Identifier Ahmad Fatoum
2020-11-26 17:55 ` [PATCH v2 2/4] common: dummy_malloc: remove unintended GPL2 eCos-exception-2.0 Ahmad Fatoum
2020-11-26 19:43   ` Uwe Kleine-König
2020-11-29 20:08   ` Roland Hieber
2020-11-29 21:17     ` Ahmad Fatoum
2020-11-26 17:55 ` Ahmad Fatoum [this message]
2020-11-26 19:45   ` [PATCH v2 3/4] LICENSES: exceptions: factor out eCos-exception-2.0 for GPL Uwe Kleine-König
2020-11-26 19:49     ` Ahmad Fatoum
2020-11-26 17:55 ` [PATCH v2 4/4] common: replace license statements with SPDX-License-Identifiers Ahmad Fatoum
2020-11-26 19:55   ` Uwe Kleine-König
2020-11-27  8:55 ` [PATCH v2 1/4] ARM: at91: sama5d2: giantboard: fix typo in SPDX-License-Identifier Sascha Hauer

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20201126175553.16934-3-a.fatoum@pengutronix.de \
    --to=a.fatoum@pengutronix.de \
    --cc=barebox@lists.infradead.org \
    --cc=rhi@pengutronix.de \
    --cc=ukl@pengutronix.de \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox