mailarchive of the ptxdist mailing list
 help / color / mirror / Atom feed
From: Roland Hieber <rhi@pengutronix.de>
To: ptxdist@pengutronix.de
Cc: Bruno Thomsen <bruno.thomsen@gmail.com>,
	Roland Hieber <rhi@pengutronix.de>
Subject: [ptxdist] [PATCH] gnutls: add LGPL license text, add GPL-3.0 if built with openssl compat
Date: Fri, 24 Nov 2023 12:43:33 +0100	[thread overview]
Message-ID: <20231124114333.1839479-1-rhi@pengutronix.de> (raw)

./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




             reply	other threads:[~2023-11-24 11:43 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-11-24 11:43 Roland Hieber [this message]
2023-11-27 19:59 ` Bruno Thomsen
2023-11-28  8:36 ` [ptxdist] [APPLIED] " Michael Olbrich

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=20231124114333.1839479-1-rhi@pengutronix.de \
    --to=rhi@pengutronix.de \
    --cc=bruno.thomsen@gmail.com \
    --cc=ptxdist@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