From mboxrd@z Thu Jan 1 00:00:00 1970 Delivery-date: Fri, 30 Jul 2021 10:32:15 +0200 Received: from metis.ext.pengutronix.de ([2001:67c:670:201:290:27ff:fe1d:cc33]) by lore.white.stw.pengutronix.de with esmtp (Exim 4.92) (envelope-from ) id 1m9NwF-0005cS-EH for lore@lore.pengutronix.de; Fri, 30 Jul 2021 10:32:15 +0200 Received: from localhost ([127.0.0.1] helo=metis.ext.pengutronix.de) by metis.ext.pengutronix.de with esmtp (Exim 4.92) (envelope-from ) id 1m9NwF-0006ZJ-45; Fri, 30 Jul 2021 10:32:15 +0200 Received: from dude.hi.pengutronix.de ([2001:67c:670:100:1d::7] helo=dude.pengutronix.de.) by metis.ext.pengutronix.de with esmtp (Exim 4.92) (envelope-from ) id 1m9Nvz-0006Yd-2y; Fri, 30 Jul 2021 10:31:59 +0200 From: Bastian Krause To: ptxdist@pengutronix.de Date: Fri, 30 Jul 2021 10:31:57 +0200 Message-Id: <20210730083157.7588-1-bst@pengutronix.de> X-Mailer: git-send-email 2.30.2 MIME-Version: 1.0 Subject: [ptxdist] [PATCH v3] cairo: fix license identifier X-BeenThere: ptxdist@pengutronix.de X-Mailman-Version: 2.1.29 Precedence: list List-Id: PTXdist Development Mailing List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: ptxdist@pengutronix.de Cc: Bastian Krause Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "ptxdist" X-SA-Exim-Connect-IP: 127.0.0.1 X-SA-Exim-Mail-From: ptxdist-bounces@pengutronix.de X-SA-Exim-Scanned: No (on metis.ext.pengutronix.de); SAEximRunCond expanded to false Cairo is dual-licensed: "Cairo is free software and is available to be redistributed and/or modified under the terms of either the GNU Lesser General Public License (LGPL) version 2.1 or the Mozilla Public License (MPL) version 1.1 at your option." (https://www.cairographics.org/) While at it, pin down the copying files. Signed-off-by: Bastian Krause --- Changes since (implicit) v1: - add CAIRO_LICENSE_FILES pinning down COPYING Changes since v2: - add COPYING-LGPL-2.1 and COPYING-MPL-1.1 to CAIRO_LICENSE_FILES --- rules/cairo.make | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/rules/cairo.make b/rules/cairo.make index cfaa74518..6d2f05272 100644 --- a/rules/cairo.make +++ b/rules/cairo.make @@ -21,7 +21,11 @@ CAIRO_SUFFIX := tar.xz CAIRO_URL := http://cairographics.org/releases/cairo-$(CAIRO_VERSION).$(CAIRO_SUFFIX) CAIRO_SOURCE := $(SRCDIR)/$(CAIRO).$(CAIRO_SUFFIX) CAIRO_DIR := $(BUILDDIR)/$(CAIRO) -CAIRO_LICENSE := LGPL-2.1-only AND MPL-1.1 +CAIRO_LICENSE := LGPL-2.1-only OR MPL-1.1 +CAIRO_LICENSE_FILES := \ + file://COPYING;md5=e73e999e0c72b5ac9012424fa157ad77 \ + file://COPYING-LGPL-2.1;md5=c9bb0ee6dbe833915b94063d594c4bfc \ + file://COPYING-MPL-1.1;md5=bfe1f75d606912a4111c90743d6c7325 # ---------------------------------------------------------------------------- # Prepare -- 2.30.2 _______________________________________________ ptxdist mailing list ptxdist@pengutronix.de To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de