From: Michael Olbrich <m.olbrich@pengutronix.de>
To: ptxdist@pengutronix.de
Cc: Alexander Dahl <ada@thorsis.com>
Subject: Re: [ptxdist] [APPLIED] libmicrohttpd: Update license handling
Date: Fri, 10 Dec 2021 14:07:14 +0100 [thread overview]
Message-ID: <20211210130714.3902294-1-m.olbrich@pengutronix.de> (raw)
In-Reply-To: <20211203100103.3476-3-ada@thorsis.com>
Thanks, applied as 44dc6d6a3111c379afb2349abb3caa9fb92e2355.
Michael
[sent from post-receive hook]
On Fri, 10 Dec 2021 14:07:14 +0100, Alexander Dahl <ada@thorsis.com> wrote:
> License options depend on whether gnutls is linked or not.
>
> Signed-off-by: Alexander Dahl <ada@thorsis.com>
> Message-Id: <20211203100103.3476-3-ada@thorsis.com>
> Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
>
> diff --git a/rules/libmicrohttpd.make b/rules/libmicrohttpd.make
> index 2a4700ead249..313a52c9b751 100644
> --- a/rules/libmicrohttpd.make
> +++ b/rules/libmicrohttpd.make
> @@ -22,7 +22,17 @@ LIBMICROHTTPD_SUFFIX := tar.gz
> LIBMICROHTTPD_URL := $(call ptx/mirror, GNU, libmicrohttpd/$(LIBMICROHTTPD).$(LIBMICROHTTPD_SUFFIX))
> LIBMICROHTTPD_SOURCE := $(SRCDIR)/$(LIBMICROHTTPD).$(LIBMICROHTTPD_SUFFIX)
> LIBMICROHTTPD_DIR := $(BUILDDIR)/$(LIBMICROHTTPD)
> +
> +LIBMICROHTTPD_LICENSE_FILES := \
> + file://README;startline=10;endline=11;md5=c6f1444a4efd67e04f3452dc1e97c24d \
> + file://COPYING;md5=57d09285feac8a64efa878e692b14f36
> +ifdef PTXCONF_LIBMICROHTTPD_HTTPS
> +LIBMICROHTTPD_LICENSE := LGPL-2.1-only
> +else
> LIBMICROHTTPD_LICENSE := LGPL-2.1-only OR GPL-2.0-only WITH eCos-exception-2.0
> +LIBMICROHTTPD_LICENSE_FILES += \
> + file://doc/ecos.texi;md5=2f39d254e3e5ed800a68ed0fc265b8a1
> +endif
>
> # ----------------------------------------------------------------------------
> # Prepare
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de
next prev parent reply other threads:[~2021-12-10 13:08 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-12-03 10:01 [ptxdist] [PATCH v1 0/3] libmicrohttpd: version bump Alexander Dahl
2021-12-03 10:01 ` [ptxdist] [PATCH v1 1/3] libmicrohttpd: Pin down more configure options Alexander Dahl
2021-12-10 13:07 ` [ptxdist] [APPLIED] " Michael Olbrich
2021-12-03 10:01 ` [ptxdist] [PATCH v1 2/3] libmicrohttpd: Update license handling Alexander Dahl
2021-12-10 13:07 ` Michael Olbrich [this message]
2021-12-03 10:01 ` [ptxdist] [PATCH v1 3/3] libmicrohttpd: version bump 0.9.66 -> 0.9.73 Alexander Dahl
2021-12-10 13:07 ` [ptxdist] [APPLIED] " Michael Olbrich
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=20211210130714.3902294-1-m.olbrich@pengutronix.de \
--to=m.olbrich@pengutronix.de \
--cc=ada@thorsis.com \
--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