mailarchive of the ptxdist mailing list
 help / color / mirror / Atom feed
From: Michael Olbrich <mol@pengutronix.de>
To: ptxdist@pengutronix.de
Cc: Bastian Krause <bst@pengutronix.de>
Subject: Re: [ptxdist] [APPLIED] libmodbus3: correct license
Date: Thu, 11 Jun 2020 11:39:46 +0200	[thread overview]
Message-ID: <E1jjJgY-0006GM-Sw@dude02.lab.pengutronix.de> (raw)
In-Reply-To: <20200605185246.29364-1-bst@pengutronix.de>

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

      parent reply	other threads:[~2020-06-11  9:39 UTC|newest]

Thread overview: 7+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-06-05 18:52 [ptxdist] [PATCH v3 1/2] " 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 ` Michael Olbrich [this message]

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=E1jjJgY-0006GM-Sw@dude02.lab.pengutronix.de \
    --to=mol@pengutronix.de \
    --cc=bst@pengutronix.de \
    --cc=ptxdist@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