[ptxdist] [PATCH v2 1/9] acl: fix license

[ptxdist] [PATCH v2 1/9] acl: fix license

[Christian Hermann]

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
+endif
 # ----------------------------------------------------------------------------
 # Prepare
 # ----------------------------------------------------------------------------
-- 
2.21.0


_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de

Re: [ptxdist] [PATCH v2 1/9] acl: fix license

[Michael Olbrich]

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