On Thu, Oct 10, 2019 at 11:25:46AM +0200, Michael Olbrich wrote: > 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.olbr...@pengutronix.de> > ---
Acked-by: Roland Hieber <r...@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 > -- Roland Hieber | r.hie...@pengutronix.de | Pengutronix e.K. | https://www.pengutronix.de/ | Peiner Str. 6-8, 31137 Hildesheim | Phone: +49-5121-206917-5086 | Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 | _______________________________________________ ptxdist mailing list ptxdist@pengutronix.de
