* [ptxdist] [PATCH v3 1/2] libmodbus3: correct license
@ 2020-06-05 18:52 Bastian Krause
2020-06-05 18:52 ` [ptxdist] [PATCH v3 2/2] libmodbus3: version bump 3.1.4 -> 3.1.6 Bastian Krause
` (2 more replies)
0 siblings, 3 replies; 7+ messages in thread
From: Bastian Krause @ 2020-06-05 18:52 UTC (permalink / raw)
To: ptxdist; +Cc: 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 tests are licensed under BSD-3-Clause (since v3.1.2), but we do
install them, so we do not need to add that license.
Signed-off-by: Bastian Krause <bst@pengutronix.de>
---
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
^ permalink raw reply [flat|nested] 7+ messages in thread
* [ptxdist] [PATCH v3 2/2] libmodbus3: version bump 3.1.4 -> 3.1.6
2020-06-05 18:52 [ptxdist] [PATCH v3 1/2] libmodbus3: correct license Bastian Krause
@ 2020-06-05 18:52 ` Bastian Krause
2020-06-11 9:39 ` [ptxdist] [APPLIED] " Michael Olbrich
2020-06-08 8:39 ` [ptxdist] [PATCH v3 1/2] libmodbus3: correct license Roland Hieber
2020-06-11 9:39 ` [ptxdist] [APPLIED] " Michael Olbrich
2 siblings, 1 reply; 7+ messages in thread
From: Bastian Krause @ 2020-06-05 18:52 UTC (permalink / raw)
To: ptxdist; +Cc: Bastian Krause
The previous URL redirected to a new location, so use that.
Signed-off-by: Bastian Krause <bst@pengutronix.de>
---
Changes since v2:
- README.md is not referenced in LIBMODBUS3_LICENSE_FILES anymore, so no
need to update its line number
Changes since (implicit) v1:
- update line number of README.md referencing the license
---
rules/libmodbus3.make | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/rules/libmodbus3.make b/rules/libmodbus3.make
index 58f2df90b..5a8dc8cce 100644
--- a/rules/libmodbus3.make
+++ b/rules/libmodbus3.make
@@ -14,11 +14,11 @@ PACKAGES-$(PTXCONF_LIBMODBUS3) += libmodbus3
#
# Paths and names
#
-LIBMODBUS3_VERSION := 3.1.4
-LIBMODBUS3_MD5 := b1a8fd3a40d2db4de51fb0cbcb201806
+LIBMODBUS3_VERSION := 3.1.6
+LIBMODBUS3_MD5 := 15c84c1f7fb49502b3efaaa668cfd25e
LIBMODBUS3 := libmodbus-$(LIBMODBUS3_VERSION)
LIBMODBUS3_SUFFIX := tar.gz
-LIBMODBUS3_URL := http://libmodbus.org/site_media/build/$(LIBMODBUS3).$(LIBMODBUS3_SUFFIX)
+LIBMODBUS3_URL := https://libmodbus.org/releases/$(LIBMODBUS3).$(LIBMODBUS3_SUFFIX)
LIBMODBUS3_SOURCE := $(SRCDIR)/$(LIBMODBUS3).$(LIBMODBUS3_SUFFIX)
LIBMODBUS3_DIR := $(BUILDDIR)/$(LIBMODBUS3)
LIBMODBUS3_LICENSE := LGPL-2.1-or-later
--
2.27.0
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [ptxdist] [PATCH v3 1/2] libmodbus3: correct license
2020-06-05 18:52 [ptxdist] [PATCH v3 1/2] libmodbus3: correct license Bastian Krause
2020-06-05 18:52 ` [ptxdist] [PATCH v3 2/2] libmodbus3: version bump 3.1.4 -> 3.1.6 Bastian Krause
@ 2020-06-08 8:39 ` Roland Hieber
2020-06-08 8:58 ` Bastian Krause
2020-06-11 9:39 ` [ptxdist] [APPLIED] " Michael Olbrich
2 siblings, 1 reply; 7+ messages in thread
From: Roland Hieber @ 2020-06-08 8:39 UTC (permalink / raw)
To: ptxdist; +Cc: Bastian Krause
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?
> install them, so we do not need to add that license.
>
> Signed-off-by: Bastian Krause <bst@pengutronix.de>
> ---
> 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
>
--
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
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [ptxdist] [PATCH v3 1/2] libmodbus3: correct license
2020-06-08 8:39 ` [ptxdist] [PATCH v3 1/2] libmodbus3: correct license Roland Hieber
@ 2020-06-08 8:58 ` Bastian Krause
2020-06-11 14:17 ` Michael Olbrich
0 siblings, 1 reply; 7+ messages in thread
From: Bastian Krause @ 2020-06-08 8:58 UTC (permalink / raw)
To: ptxdist, 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 <bst@pengutronix.de>
>> ---
>> 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
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [ptxdist] [APPLIED] libmodbus3: correct license
2020-06-05 18:52 [ptxdist] [PATCH v3 1/2] libmodbus3: correct license Bastian Krause
2020-06-05 18:52 ` [ptxdist] [PATCH v3 2/2] libmodbus3: version bump 3.1.4 -> 3.1.6 Bastian Krause
2020-06-08 8:39 ` [ptxdist] [PATCH v3 1/2] libmodbus3: correct license Roland Hieber
@ 2020-06-11 9:39 ` Michael Olbrich
2 siblings, 0 replies; 7+ messages in thread
From: Michael Olbrich @ 2020-06-11 9:39 UTC (permalink / raw)
To: ptxdist; +Cc: Bastian Krause
Thanks, applied as c0e03c666057f81226f3a81bf82254e0d736f0dc.
Michael
[sent from post-receive hook]
On Thu, 11 Jun 2020 11:39:46 +0200, Bastian Krause <bst@pengutronix.de> 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
> install them, so we do not need to add that license.
>
> Signed-off-by: Bastian Krause <bst@pengutronix.de>
> Message-Id: <20200605185246.29364-1-bst@pengutronix.de>
> Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
>
> diff --git a/rules/libmodbus3.make b/rules/libmodbus3.make
> index f206ec4aa03d..58f2df90b1cf 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
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [ptxdist] [APPLIED] libmodbus3: version bump 3.1.4 -> 3.1.6
2020-06-05 18:52 ` [ptxdist] [PATCH v3 2/2] libmodbus3: version bump 3.1.4 -> 3.1.6 Bastian Krause
@ 2020-06-11 9:39 ` Michael Olbrich
0 siblings, 0 replies; 7+ messages in thread
From: Michael Olbrich @ 2020-06-11 9:39 UTC (permalink / raw)
To: ptxdist; +Cc: Bastian Krause
Thanks, applied as e18d82deeb3098228a3092f293b8c30cc497c6b7.
Michael
[sent from post-receive hook]
On Thu, 11 Jun 2020 11:39:47 +0200, Bastian Krause <bst@pengutronix.de> wrote:
> The previous URL redirected to a new location, so use that.
>
> Signed-off-by: Bastian Krause <bst@pengutronix.de>
> Message-Id: <20200605185246.29364-2-bst@pengutronix.de>
> Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
>
> diff --git a/rules/libmodbus3.make b/rules/libmodbus3.make
> index 58f2df90b1cf..5a8dc8cce725 100644
> --- a/rules/libmodbus3.make
> +++ b/rules/libmodbus3.make
> @@ -14,11 +14,11 @@ PACKAGES-$(PTXCONF_LIBMODBUS3) += libmodbus3
> #
> # Paths and names
> #
> -LIBMODBUS3_VERSION := 3.1.4
> -LIBMODBUS3_MD5 := b1a8fd3a40d2db4de51fb0cbcb201806
> +LIBMODBUS3_VERSION := 3.1.6
> +LIBMODBUS3_MD5 := 15c84c1f7fb49502b3efaaa668cfd25e
> LIBMODBUS3 := libmodbus-$(LIBMODBUS3_VERSION)
> LIBMODBUS3_SUFFIX := tar.gz
> -LIBMODBUS3_URL := http://libmodbus.org/site_media/build/$(LIBMODBUS3).$(LIBMODBUS3_SUFFIX)
> +LIBMODBUS3_URL := https://libmodbus.org/releases/$(LIBMODBUS3).$(LIBMODBUS3_SUFFIX)
> LIBMODBUS3_SOURCE := $(SRCDIR)/$(LIBMODBUS3).$(LIBMODBUS3_SUFFIX)
> LIBMODBUS3_DIR := $(BUILDDIR)/$(LIBMODBUS3)
> LIBMODBUS3_LICENSE := LGPL-2.1-or-later
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [ptxdist] [PATCH v3 1/2] libmodbus3: correct license
2020-06-08 8:58 ` Bastian Krause
@ 2020-06-11 14:17 ` Michael Olbrich
0 siblings, 0 replies; 7+ messages in thread
From: Michael Olbrich @ 2020-06-11 14:17 UTC (permalink / raw)
To: Bastian Krause; +Cc: ptxdist, Roland Hieber
On Mon, Jun 08, 2020 at 10:58:14AM +0200, Bastian Krause wrote:
> 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?
Ah, sorry. I accidentally applied this without the change :-/.
Michael
> >> install them, so we do not need to add that license.
> >>
> >> Signed-off-by: Bastian Krause <bst@pengutronix.de>
> >> ---
> >> 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
>
--
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
^ permalink raw reply [flat|nested] 7+ messages in thread
end of thread, other threads:[~2020-06-11 14:17 UTC | newest]
Thread overview: 7+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-06-05 18:52 [ptxdist] [PATCH v3 1/2] libmodbus3: correct license Bastian Krause
2020-06-05 18:52 ` [ptxdist] [PATCH v3 2/2] libmodbus3: version bump 3.1.4 -> 3.1.6 Bastian Krause
2020-06-11 9:39 ` [ptxdist] [APPLIED] " Michael Olbrich
2020-06-08 8:39 ` [ptxdist] [PATCH v3 1/2] libmodbus3: correct license Roland Hieber
2020-06-08 8:58 ` Bastian Krause
2020-06-11 14:17 ` Michael Olbrich
2020-06-11 9:39 ` [ptxdist] [APPLIED] " Michael Olbrich
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox