mailarchive of the ptxdist mailing list
 help / color / mirror / Atom feed
From: Christian Hermann <christian.hermann@hytera.de>
To: ptxdist@pengutronix.de
Cc: Christian Hermann <christian.hermann@hytera.de>
Subject: [ptxdist] [PATCH 1/9] acl: fix license
Date: Fri, 5 Apr 2019 14:25:00 +0200	[thread overview]
Message-ID: <20190405122508.13502-1-christian.hermann@hytera.de> (raw)

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


_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de

             reply	other threads:[~2019-04-05 12:25 UTC|newest]

Thread overview: 11+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-04-05 12:25 Christian Hermann [this message]
2019-04-05 12:25 ` [ptxdist] [PATCH 2/9] inetutils: " Christian Hermann
2019-04-05 12:25 ` [ptxdist] [PATCH 3/9] nodejs: " Christian Hermann
2019-04-05 12:25 ` [ptxdist] [PATCH 4/9] ntp: " Christian Hermann
2019-04-05 12:25 ` [ptxdist] [PATCH 5/9] openldap: " Christian Hermann
2019-04-05 12:25 ` [ptxdist] [PATCH 6/9] pciutils: " Christian Hermann
2019-04-05 12:25 ` [ptxdist] [PATCH 7/9] perl: " Christian Hermann
2019-04-05 12:25 ` [ptxdist] [PATCH 8/9] tar: " Christian Hermann
2019-04-05 12:25 ` [ptxdist] [PATCH 9/9] tmux: " Christian Hermann
2019-04-05 12:37 ` [ptxdist] [PATCH 1/9] acl: " Alexander Dahl
2019-04-05 14:36 ` 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=20190405122508.13502-1-christian.hermann@hytera.de \
    --to=christian.hermann@hytera.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