From mboxrd@z Thu Jan 1 00:00:00 1970 Return-path: Received: from ptx.hi.pengutronix.de ([2001:67c:670:100:1d::c0]) by metis.ext.pengutronix.de with esmtps (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1jglnw-0000ps-64 for ptxdist@pengutronix.de; Thu, 04 Jun 2020 11:04:52 +0200 Received: from rhi by ptx.hi.pengutronix.de with local (Exim 4.92) (envelope-from ) id 1jglnv-0003fp-Ta for ptxdist@pengutronix.de; Thu, 04 Jun 2020 11:04:51 +0200 Date: Thu, 4 Jun 2020 11:04:51 +0200 From: Roland Hieber Message-ID: <20200604090451.gwp6itayehfvsfwg@pengutronix.de> References: <20200528090426.27565-1-bst@pengutronix.de> <20200529084448.GE31789@pengutronix.de> <34fbd75a-e35f-5e51-5325-f8f544d56dbf@pengutronix.de> <20200602132839.GA1470@pengutronix.de> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20200602132839.GA1470@pengutronix.de> Subject: Re: [ptxdist] [PATCH v2 1/3] libmodbus3: correct license List-Id: PTXdist Development Mailing List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: ptxdist@pengutronix.de Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: ptxdist-bounces@pengutronix.de Sender: "ptxdist" To: ptxdist@pengutronix.de On Tue, Jun 02, 2020 at 03:28:39PM +0200, Michael Olbrich wrote: > 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 > > >> --- > > >> 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? At least not including it would be consistent with all other packages in which this was done, so I would opt for it here too. - Roland -- Roland Hieber, Pengutronix e.K. | r.hieber@pengutronix.de | Steuerwalder Str. 21 | https://www.pengutronix.de/ | 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 | Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 | _______________________________________________ ptxdist mailing list ptxdist@pengutronix.de To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de