* [ptxdist] [PATCH] gnutls: add LGPL license text, add GPL-3.0 if built with openssl compat
@ 2023-11-24 11:43 Roland Hieber
2023-11-27 19:59 ` Bruno Thomsen
2023-11-28 8:36 ` [ptxdist] [APPLIED] " Michael Olbrich
0 siblings, 2 replies; 3+ messages in thread
From: Roland Hieber @ 2023-11-24 11:43 UTC (permalink / raw)
To: ptxdist; +Cc: Bruno Thomsen, Roland Hieber
./LICENSE mentions that the openssl compat code is licensed under
GPL-3.0, and references the full license texts in doc/.
Cc: Bruno Thomsen <bruno.thomsen@gmail.com>
Signed-off-by: Roland Hieber <rhi@pengutronix.de>
---
rules/gnutls.make | 8 ++++++++
1 file changed, 8 insertions(+)
diff --git a/rules/gnutls.make b/rules/gnutls.make
index d49fbd1b17d6..35df7f76c688 100644
--- a/rules/gnutls.make
+++ b/rules/gnutls.make
@@ -23,8 +23,16 @@ GNUTLS_SOURCE := $(SRCDIR)/$(GNUTLS).$(GNUTLS_SUFFIX)
GNUTLS_DIR := $(BUILDDIR)/$(GNUTLS)
GNUTLS_LICENSE := LGPL-3.0-or-later
GNUTLS_LICENSE_FILES := \
+ file://doc/COPYING.LESSER;md5=a6f89e2100d9b6cdffcea4f398e37343 \
file://LICENSE;md5=71391c8e0c1cfe68077e7fce3b586283
+ifdef PTXCONF_GNUTLS_OPENSSL
+GNUTLS_LICENSE += AND GPL-3.0-or-later
+GNUTLS_LICENSE_FILES += \
+ file://extra/gnutls_openssl.c;startline=1;endline=19;md5=b8b99cb92b0fbb522912f20e3359913c \
+ file://doc/COPYING;md5=c678957b0c8e964aa6c70fd77641a71e
+endif
+
# ----------------------------------------------------------------------------
# Prepare
# ----------------------------------------------------------------------------
--
2.39.2
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [ptxdist] [PATCH] gnutls: add LGPL license text, add GPL-3.0 if built with openssl compat
2023-11-24 11:43 [ptxdist] [PATCH] gnutls: add LGPL license text, add GPL-3.0 if built with openssl compat Roland Hieber
@ 2023-11-27 19:59 ` Bruno Thomsen
2023-11-28 8:36 ` [ptxdist] [APPLIED] " Michael Olbrich
1 sibling, 0 replies; 3+ messages in thread
From: Bruno Thomsen @ 2023-11-27 19:59 UTC (permalink / raw)
To: Roland Hieber, ptxdist
Den fre. 24. nov. 2023 kl. 12.43 skrev Roland Hieber <rhi@pengutronix.de>:
>
> ./LICENSE mentions that the openssl compat code is licensed under
> GPL-3.0, and references the full license texts in doc/.
>
> Cc: Bruno Thomsen <bruno.thomsen@gmail.com>
> Signed-off-by: Roland Hieber <rhi@pengutronix.de>
Reviewed-by: Bruno Thomsen <bruno.thomsen@gmail.com>
Very nice way of handling the multiple licenses based on the kconfig option.
/Bruno
> ---
> rules/gnutls.make | 8 ++++++++
> 1 file changed, 8 insertions(+)
>
> diff --git a/rules/gnutls.make b/rules/gnutls.make
> index d49fbd1b17d6..35df7f76c688 100644
> --- a/rules/gnutls.make
> +++ b/rules/gnutls.make
> @@ -23,8 +23,16 @@ GNUTLS_SOURCE := $(SRCDIR)/$(GNUTLS).$(GNUTLS_SUFFIX)
> GNUTLS_DIR := $(BUILDDIR)/$(GNUTLS)
> GNUTLS_LICENSE := LGPL-3.0-or-later
> GNUTLS_LICENSE_FILES := \
> + file://doc/COPYING.LESSER;md5=a6f89e2100d9b6cdffcea4f398e37343 \
> file://LICENSE;md5=71391c8e0c1cfe68077e7fce3b586283
>
> +ifdef PTXCONF_GNUTLS_OPENSSL
> +GNUTLS_LICENSE += AND GPL-3.0-or-later
> +GNUTLS_LICENSE_FILES += \
> + file://extra/gnutls_openssl.c;startline=1;endline=19;md5=b8b99cb92b0fbb522912f20e3359913c \
> + file://doc/COPYING;md5=c678957b0c8e964aa6c70fd77641a71e
> +endif
> +
> # ----------------------------------------------------------------------------
> # Prepare
> # ----------------------------------------------------------------------------
> --
> 2.39.2
>
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [ptxdist] [APPLIED] gnutls: add LGPL license text, add GPL-3.0 if built with openssl compat
2023-11-24 11:43 [ptxdist] [PATCH] gnutls: add LGPL license text, add GPL-3.0 if built with openssl compat Roland Hieber
2023-11-27 19:59 ` Bruno Thomsen
@ 2023-11-28 8:36 ` Michael Olbrich
1 sibling, 0 replies; 3+ messages in thread
From: Michael Olbrich @ 2023-11-28 8:36 UTC (permalink / raw)
To: ptxdist; +Cc: Roland Hieber
Thanks, applied as f15305e1f7c24b8ad100d132dfbce3776e1c939f.
Michael
[sent from post-receive hook]
On Tue, 28 Nov 2023 09:36:54 +0100, Roland Hieber <rhi@pengutronix.de> wrote:
> ./LICENSE mentions that the openssl compat code is licensed under
> GPL-3.0, and references the full license texts in doc/.
>
> Cc: Bruno Thomsen <bruno.thomsen@gmail.com>
> Signed-off-by: Roland Hieber <rhi@pengutronix.de>
> Message-Id: <20231124114333.1839479-1-rhi@pengutronix.de>
> Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
>
> diff --git a/rules/gnutls.make b/rules/gnutls.make
> index d49fbd1b17d6..35df7f76c688 100644
> --- a/rules/gnutls.make
> +++ b/rules/gnutls.make
> @@ -23,8 +23,16 @@ GNUTLS_SOURCE := $(SRCDIR)/$(GNUTLS).$(GNUTLS_SUFFIX)
> GNUTLS_DIR := $(BUILDDIR)/$(GNUTLS)
> GNUTLS_LICENSE := LGPL-3.0-or-later
> GNUTLS_LICENSE_FILES := \
> + file://doc/COPYING.LESSER;md5=a6f89e2100d9b6cdffcea4f398e37343 \
> file://LICENSE;md5=71391c8e0c1cfe68077e7fce3b586283
>
> +ifdef PTXCONF_GNUTLS_OPENSSL
> +GNUTLS_LICENSE += AND GPL-3.0-or-later
> +GNUTLS_LICENSE_FILES += \
> + file://extra/gnutls_openssl.c;startline=1;endline=19;md5=b8b99cb92b0fbb522912f20e3359913c \
> + file://doc/COPYING;md5=c678957b0c8e964aa6c70fd77641a71e
> +endif
> +
> # ----------------------------------------------------------------------------
> # Prepare
> # ----------------------------------------------------------------------------
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2023-11-28 8:38 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2023-11-24 11:43 [ptxdist] [PATCH] gnutls: add LGPL license text, add GPL-3.0 if built with openssl compat Roland Hieber
2023-11-27 19:59 ` Bruno Thomsen
2023-11-28 8:36 ` [ptxdist] [APPLIED] " Michael Olbrich
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox