On Fri, May 29, 2020 at 03:06:51PM +0200, Bastian Krause wrote:
>
> On 5/29/20 10:44 AM, Michael Olbrich wrote:
> > On Thu, May 28, 2020 at 11:04:24AM +0200, Bastian Krause wrote:
> >> libmodbus reverted its license with v3.0.0, commit 1275387 ("Revert
> >> libmodbus licence from LGPLv3 to LGPLv2.1") to LGPL-2.1-or-later.
> >> 820e15f ("SPDX: change LGPL-2.1+ to LGPL-2.1-or-later") updates the SPDX
> >> identifier in file headers to the recent version.
> >> The README.md states "or later" part of the license, so add that to
> >> LIBMODBUS3_LICENSE_FILES.
> >>
> >> The tests are licensed under BSD-3-Clause since v3.1.2, commit bdd5379
> >> ("Switch test programs to a BSD license").
> >>
> >> Signed-off-by: Bastian Krause <[email protected]>
> >> ---
> >> Changes since (implicit) v1:
> >> - add " AND BSD-3-Clause" to license since the tests are licensed under
> >> BSD-3-Clause
> >> - add LIBMODBUS3_LICENSE_FILES
> >> ---
> >> rules/libmodbus3.make | 21 ++++++++++++---------
> >> 1 file changed, 12 insertions(+), 9 deletions(-)
> >>
> >> diff --git a/rules/libmodbus3.make b/rules/libmodbus3.make
> >> index f206ec4aa..06721aa05 100644
> >> --- a/rules/libmodbus3.make
> >> +++ b/rules/libmodbus3.make
> >> @@ -14,15 +14,18 @@ PACKAGES-$(PTXCONF_LIBMODBUS3) += libmodbus3
> >> #
> >> # Paths and names
> >> #
> >> -LIBMODBUS3_VERSION := 3.1.4
> >> -LIBMODBUS3_MD5 := b1a8fd3a40d2db4de51fb0cbcb201806
> >> -LIBMODBUS3 := libmodbus-$(LIBMODBUS3_VERSION)
> >> -LIBMODBUS3_SUFFIX := tar.gz
> >> -LIBMODBUS3_URL :=
> >> http://libmodbus.org/site_media/build/$(LIBMODBUS3).$(LIBMODBUS3_SUFFIX)
> >> -LIBMODBUS3_SOURCE := $(SRCDIR)/$(LIBMODBUS3).$(LIBMODBUS3_SUFFIX)
> >> -LIBMODBUS3_DIR := $(BUILDDIR)/$(LIBMODBUS3)
> >> -LIBMODBUS3_LICENSE := LGPL-3.0-only
> >> -
> >> +LIBMODBUS3_VERSION := 3.1.4
> >> +LIBMODBUS3_MD5 := b1a8fd3a40d2db4de51fb0cbcb201806
> >> +LIBMODBUS3 := libmodbus-$(LIBMODBUS3_VERSION)
> >> +LIBMODBUS3_SUFFIX := tar.gz
> >> +LIBMODBUS3_URL :=
> >> http://libmodbus.org/site_media/build/$(LIBMODBUS3).$(LIBMODBUS3_SUFFIX)
> >> +LIBMODBUS3_SOURCE := $(SRCDIR)/$(LIBMODBUS3).$(LIBMODBUS3_SUFFIX)
> >> +LIBMODBUS3_DIR := $(BUILDDIR)/$(LIBMODBUS3)
> >> +LIBMODBUS3_LICENSE := LGPL-2.1-or-later AND BSD-3-Clause
> >> +LIBMODBUS3_LICENSE_FILES := \
> >> + file://COPYING.LESSER;md5=4fbd65380cdd255951079008b364516c \
> >> +
> >> file://README.md;startline=17;endline=17;md5=c0937f6beb7c75412b9259e48222e077
> >> \
> >
> > I don't think this line adds anything. The source files make the 'or-later'
> > clear and we don't have anything like this for any other package.
>
> Okay, should I add a source file with startline/endline pointing to the
> SPDX identifier instead?
Yes, I think that's better.
> >
> >> +
> >> file://tests/version.c;startline=4;endline=4;md5=b23faac1da952fa6845fd4fb63a20ffe
> >
> > This is not sufficient. For BSD style licenses the copyright line is
> > relevant and must be added.
> > And we need the license text which is missing :-/.
> >
> > The BSD-3-Clause license states:
> > "Redistributions of source code must retain the above copyright notice,
> > this list of conditions and the following disclaimer."
> >
> > The license is in the git repo but not the release tarball :-/. I've
> > reported this upstream[1].
Hmmm, anyways, this is about the test, and we don't install those anyways,
so I don't think we need the license here. Opinions?
Michael
> Thanks!
>
> Regards,
> Bastian
>
> >
> > [1] https://github.com/stephane/libmodbus/issues/542
> >
> >> #
> >> ----------------------------------------------------------------------------
> >> # Prepare
> >> #
> >> ----------------------------------------------------------------------------
> >> --
> >> 2.26.2
> >>
> >>
> >> _______________________________________________
> >> ptxdist mailing list
> >> [email protected]
> >> To unsubscribe, send a mail with subject "unsubscribe" to
> >> [email protected]
> >>
> >
>
>
> --
> Pengutronix e.K. | |
> Steuerwalder Str. 21 | http://www.pengutronix.de/ |
> 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 |
> Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |
>
> _______________________________________________
> ptxdist mailing list
> [email protected]
> To unsubscribe, send a mail with subject "unsubscribe" to
> [email protected]
>
--
Pengutronix e.K. | |
Steuerwalder Str. 21 | http://www.pengutronix.de/ |
31137 Hildesheim, Germany | Phone: +49-5121-206917-0 |
Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |
_______________________________________________
ptxdist mailing list
[email protected]
To unsubscribe, send a mail with subject "unsubscribe" to
[email protected]
