From mboxrd@z Thu Jan 1 00:00:00 1970 Return-path: Received: from mail-eopbgr20061.outbound.protection.outlook.com ([40.107.2.61] helo=EUR02-VE1-obe.outbound.protection.outlook.com) by metis.ext.pengutronix.de with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.92) (envelope-from ) id 1hoRpz-00047X-9d for ptxdist@pengutronix.de; Fri, 19 Jul 2019 14:18:11 +0200 Received: from nbmx01.hytera.de (unknown [172.21.102.22]) by ibmx32.hytera.de (Postfix) with ESMTP id 2045311478 for ; Fri, 19 Jul 2019 14:17:55 +0200 (CEST) From: Christian Hermann Date: Fri, 19 Jul 2019 14:17:59 +0200 Message-ID: <20190719121803.28963-9-christian.hermann@hytera.de> In-Reply-To: <20190719121803.28963-1-christian.hermann@hytera.de> References: <20190719121803.28963-1-christian.hermann@hytera.de> MIME-Version: 1.0 Subject: [ptxdist] [PATCH 09/13] fuse: fix license identifier (split) List-Id: PTXdist Development Mailing List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: ptxdist@pengutronix.de Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: ptxdist-bounces@pengutronix.de Sender: "ptxdist" To: ptxdist@pengutronix.de Signed-off-by: Christian Hermann --- rules/fuse.make | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/rules/fuse.make b/rules/fuse.make index b3c55bfe5..88c6eae1e 100644 --- a/rules/fuse.make +++ b/rules/fuse.make @@ -21,7 +21,15 @@ FUSE_SUFFIX := tar.gz FUSE_URL := https://github.com/libfuse/libfuse/releases/download/$(FUSE)/$(FUSE).$(FUSE_SUFFIX) FUSE_SOURCE := $(SRCDIR)/$(FUSE).$(FUSE_SUFFIX) FUSE_DIR := $(BUILDDIR)/$(FUSE) -FUSE_LICENSE := GPL-2.0-only AND LGPL-2.1-only +ifdef PTXCONF_FUSE_UTIL +FUSE_LICENSE := GPL-2.0-only +endif +ifdef PTXCONF_FUSE_LIB +ifdef FUSE_LICENSE +FUSE_LICENSE += AND +endif +FUSE_LICENSE += LGPL-2.1-only +endif # ---------------------------------------------------------------------------- # Prepare -- 2.22.0 _______________________________________________ ptxdist mailing list ptxdist@pengutronix.de