From mboxrd@z Thu Jan 1 00:00:00 1970 Return-path: References: <20200605185246.29364-1-bst@pengutronix.de> <20200608083926.2gr2b3c3owpeqkmk@pengutronix.de> From: Bastian Krause Message-ID: <2d4b0343-a292-ed94-f189-9313c92cae76@pengutronix.de> Date: Mon, 8 Jun 2020 10:58:14 +0200 MIME-Version: 1.0 In-Reply-To: <20200608083926.2gr2b3c3owpeqkmk@pengutronix.de> Content-Language: en-US Subject: Re: [ptxdist] [PATCH v3 1/2] 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, Roland Hieber On 6/8/20 10:39 AM, Roland Hieber wrote: > On Fri, Jun 05, 2020 at 08:52:45PM +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 tests are licensed under BSD-3-Clause (since v3.1.2), but we do > > Looks like here's "not" missing? Argh, right. Michael, could you fix that while applying? bst > >> install them, so we do not need to add that license. >> >> Signed-off-by: Bastian Krause >> --- >> Changes since v2: >> - remove BSD-3-Clause, only the tests are licensed like that and we do >> not install them >> - remove README.md and test file from LIBMODBUS3_LICENSE_FILES >> - add src/modbus.c to LIBMODBUS3_LICENSE_FILES to reference SPDX >> identifier >> >> 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 | 19 +++++++++++-------- >> 1 file changed, 11 insertions(+), 8 deletions(-) >> >> diff --git a/rules/libmodbus3.make b/rules/libmodbus3.make >> index f206ec4aa..58f2df90b 100644 >> --- a/rules/libmodbus3.make >> +++ b/rules/libmodbus3.make >> @@ -14,14 +14,17 @@ 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 >> +LIBMODBUS3_LICENSE_FILES := \ >> + file://COPYING.LESSER;md5=4fbd65380cdd255951079008b364516c \ >> + file://src/modbus.c;startline=4;endline=4;md5=09383b02650315a322dba1dcf8aad811 >> >> # ---------------------------------------------------------------------------- >> # Prepare >> -- >> 2.27.0 >> >> >> _______________________________________________ >> ptxdist mailing list >> ptxdist@pengutronix.de >> To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de >> > -- 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 ptxdist@pengutronix.de To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de