mailarchive of the ptxdist mailing list
 help / color / mirror / Atom feed
From: Michael Olbrich <m.olbrich@pengutronix.de>
To: ptxdist@pengutronix.de
Cc: Michael Olbrich <m.olbrich@pengutronix.de>
Subject: [ptxdist] [PATCH] libnl3: fix license information
Date: Thu, 10 Oct 2019 11:25:46 +0200	[thread overview]
Message-ID: <20191010092546.27561-1-m.olbrich@pengutronix.de> (raw)
In-Reply-To: <72c268e5c918dfd63a620f147874a59fa412c144.camel@cn-eng.de>

Let's stick with the GPL-2.0-only for the tools that still have this in the
header but make it clear that this does not apply to the library by making
it conditional.
Also add the missing BSD-3-Clause identifiery and file.

Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
---

So if had forgotten about the old discussion when I applied the patch. How
about this patch. I don't really care about the kernel headers. It makes no
difference if they are shipped with the package or the toolchain. The
result is the same.
And with the condition below, we still mention the GPL-2.0-only but make it
more obvious that this does not apply to libnl itself.

Michael

 rules/libnl3.make | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/rules/libnl3.make b/rules/libnl3.make
index 5b3af00659c6..191e00126831 100644
--- a/rules/libnl3.make
+++ b/rules/libnl3.make
@@ -22,7 +22,14 @@ LIBNL3_SUFFIX	:= tar.gz
 LIBNL3_URL	:= https://github.com/thom311/libnl/releases/download/$(LIBNL3_RELEASE)/$(LIBNL3).$(LIBNL3_SUFFIX)
 LIBNL3_SOURCE	:= $(SRCDIR)/$(LIBNL3).$(LIBNL3_SUFFIX)
 LIBNL3_DIR	:= $(BUILDDIR)/$(LIBNL3)
-LIBNL3_LICENSE	:= LGPL-2.1-only
+LIBNL3_LICENSE	:= LGPL-2.1-only AND BSD-3-Clause
+LIBNL3_LICENSE_FILES := \
+	file://COPYING;md5=4fbd65380cdd255951079008b364516c \
+	file://lib/xfrm/ae.c;startline=3;endline=32;md5=6813917a92b539b07534e1a79f5a6aca
+
+ifdef PTXCONF_LIBNL3_ENABLE_CLI
+LIBNL3_LICENSE	+= AND GPL-2.0-only
+endif
 
 #
 # autoconf
-- 
2.20.1


_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de

  reply	other threads:[~2019-10-10  9:25 UTC|newest]

Thread overview: 15+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-10-08 20:01 [ptxdist] [PATCH 0/2] libnl3: version bump 3.4.0 -> 3.5.0 and license fix Andreas Pretzsch
2019-10-08 20:01 ` [ptxdist] [PATCH 1/2] libnl3: version bump 3.4.0 -> 3.5.0 Andreas Pretzsch
2019-10-08 20:01 ` [ptxdist] [PATCH 2/2] libnl3: fix license identifier (GPL-2.0-only -> LGPL-2.1-only) Andreas Pretzsch
2019-10-09  8:22   ` Roland Hieber
2019-10-09  8:27     ` Roland Hieber
2019-10-09  8:36     ` Alexander Dahl
2019-10-09 21:46       ` Andreas Pretzsch
2019-10-10  9:25         ` Michael Olbrich [this message]
2019-10-10  9:57           ` [ptxdist] [PATCH] libnl3: fix license information Roland Hieber
2019-10-10 10:21           ` Alexander Dahl
2019-10-10 11:56           ` Andreas Pretzsch
2019-10-15  7:51             ` Michael Olbrich
2019-10-15 12:21               ` Andreas Pretzsch
2019-10-09 21:46     ` [ptxdist] [PATCH 2/2] libnl3: fix license identifier (GPL-2.0-only -> LGPL-2.1-only) Andreas Pretzsch
2019-10-10  9:54       ` Roland Hieber

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=20191010092546.27561-1-m.olbrich@pengutronix.de \
    --to=m.olbrich@pengutronix.de \
    --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