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

[Michael Olbrich <m.olbrich@pengutronix.de>]

On Fri, Apr 05, 2019 at 02:25:00PM +0200, Christian Hermann wrote:
> Signed-off-by: Christian Hermann <christian.hermann@hytera.de>
> ---
>  rules/acl.make | 8 ++++----
>  1 file changed, 4 insertions(+), 4 deletions(-)
> 
> diff --git a/rules/acl.make b/rules/acl.make
> index b950b0401..429baf148 100644
> --- a/rules/acl.make
> +++ b/rules/acl.make
> @@ -23,10 +23,8 @@ 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
>  
>  # ----------------------------------------------------------------------------
>  # Prepare
> @@ -67,6 +65,8 @@ ifdef PTXCONF_ACL_TOOLS
>  	@$(call install_copy, acl, 0, 0, 0755, -, /usr/bin/chacl)
>  	@$(call install_copy, acl, 0, 0, 0755, -, /usr/bin/setfacl)
>  	@$(call install_copy, acl, 0, 0, 0755, -, /usr/bin/getfacl)
> +	ACL_LICENSE+= AND GPL-2.0.or-later
> +	ACL_LICENSE_FILES+=file://doc/COPYING.LGPL;md5=9e9a206917f8af112da634ce3ab41764

Interesting idea, splitting the license variables like this.
So the license is indeed '-or-later'. But you got the files mixed up.
You're adding the LGPL file with the GPL identifier.

Also, please move this to the top of the file directly below the first
license stuff.

Michael

>  endif
>  	@$(call install_lib, acl, 0, 0, 0644, libacl)
>  
> -- 
> 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