From: Michael Olbrich <m.olbrich@pengutronix.de>
To: ptxdist@pengutronix.de
Subject: Re: [ptxdist] [PATCH v2 1/9] acl: fix license
Date: Fri, 5 Apr 2019 16:38:55 +0200 [thread overview]
Message-ID: <20190405143855.ypsmcgec4qvbaonf@pengutronix.de> (raw)
In-Reply-To: <20190405142845.26132-1-christian.hermann@hytera.de>
On Fri, Apr 05, 2019 at 04:28:37PM +0200, Christian Hermann wrote:
> Signed-off-by: Christian Hermann <christian.hermann@hytera.de>
> ---
> Hi,
> this one should make more sense, thanks's Alex.
>
> rules/acl.make | 11 ++++++-----
> 1 file changed, 6 insertions(+), 5 deletions(-)
>
> diff --git a/rules/acl.make b/rules/acl.make
> index b950b0401..cf13526d8 100644
> --- a/rules/acl.make
> +++ b/rules/acl.make
> @@ -23,11 +23,12 @@ ACL_SUFFIX := tar.gz
> ACL_URL := http://download.savannah.gnu.org/releases/acl/$(ACL).src.$(ACL_SUFFIX)
> ACL_SOURCE := $(SRCDIR)/$(ACL).src.$(ACL_SUFFIX)
> ACL_DIR := $(BUILDDIR)/$(ACL)
> -ACL_LICENSE := GPL-2.0-only AND LGPL-2.1-only
> -ACL_LICENSE_FILES := \
> - file://doc/COPYING;md5=c781d70ed2b4d48995b790403217a249 \
> - file://doc/COPYING.LGPL;md5=9e9a206917f8af112da634ce3ab41764
> -
> +ACL_LICENSE := LGPL-2.1-or-later
> +ACL_LICENSE_FILES := file://doc/COPYING;md5=c781d70ed2b4d48995b790403217a249
> +ifdef PTXCONF_ACL_TOOLS
> + ACL_LICENSE+= AND GPL-2.0.or-later
> + ACL_LICENSE_FILES+= file://doc/COPYING.LGPL;md5=9e9a206917f8af112da634ce3ab41764
See my other mail about the files.
And don't indent here.
Michael
> +endif
> # ----------------------------------------------------------------------------
> # Prepare
> # ----------------------------------------------------------------------------
> --
> 2.21.0
>
>
> _______________________________________________
> ptxdist mailing list
> ptxdist@pengutronix.de
--
Pengutronix e.K. | |
Industrial Linux Solutions | http://www.pengutronix.de/ |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 |
Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
prev parent reply other threads:[~2019-04-05 14:38 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-04-05 14:28 Christian Hermann
2019-04-05 14:38 ` 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=20190405143855.ypsmcgec4qvbaonf@pengutronix.de \
--to=m.olbrich@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