From mboxrd@z Thu Jan 1 00:00:00 1970 Return-path: From: Bastian Krause Date: Thu, 28 May 2020 11:04:24 +0200 Message-Id: <20200528090426.27565-1-bst@pengutronix.de> MIME-Version: 1.0 Subject: [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 Cc: post@lespocky.de, rhi@pengutronix.de, Bastian Krause 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 \ + file://tests/version.c;startline=4;endline=4;md5=b23faac1da952fa6845fd4fb63a20ffe # ---------------------------------------------------------------------------- # Prepare # ---------------------------------------------------------------------------- -- 2.26.2 _______________________________________________ ptxdist mailing list ptxdist@pengutronix.de To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de