From: Bastian Krause <bst@pengutronix.de>
To: ptxdist@pengutronix.de
Cc: post@lespocky.de, rhi@pengutronix.de,
Bastian Krause <bst@pengutronix.de>
Subject: [ptxdist] [PATCH v2 1/3] libmodbus3: correct license
Date: Thu, 28 May 2020 11:04:24 +0200 [thread overview]
Message-ID: <20200528090426.27565-1-bst@pengutronix.de> (raw)
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 <bst@pengutronix.de>
---
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
next reply other threads:[~2020-05-28 9:04 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-05-28 9:04 Bastian Krause [this message]
2020-05-28 9:04 ` [ptxdist] [PATCH v2 2/3] libmodbus3: version bump 3.1.4 -> 3.1.6 Bastian Krause
2020-05-28 9:04 ` [ptxdist] [PATCH v2 3/3] libftdi1: version bump 1.1 -> 1.4 Bastian Krause
2020-05-29 8:44 ` [ptxdist] [PATCH v2 1/3] libmodbus3: correct license Michael Olbrich
2020-05-29 13:06 ` Bastian Krause
2020-06-02 13:28 ` Michael Olbrich
2020-06-04 9:04 ` Roland Hieber
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200528090426.27565-1-bst@pengutronix.de \
--to=bst@pengutronix.de \
--cc=post@lespocky.de \
--cc=ptxdist@pengutronix.de \
--cc=rhi@pengutronix.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox