From mboxrd@z Thu Jan 1 00:00:00 1970 Delivery-date: Wed, 28 Jul 2021 13:55:36 +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 1m8i9w-0005GL-T7 for lore@lore.pengutronix.de; Wed, 28 Jul 2021 13:55:36 +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 1m8i9w-0006LR-H6; Wed, 28 Jul 2021 13:55:36 +0200 Received: from gallifrey.ext.pengutronix.de ([2001:67c:670:201:5054:ff:fe8d:eefb] helo=[127.0.0.1]) by metis.ext.pengutronix.de with esmtp (Exim 4.92) (envelope-from ) id 1m8i9r-0006L7-2w for ptxdist@pengutronix.de; Wed, 28 Jul 2021 13:55:31 +0200 To: ptxdist@pengutronix.de References: <20210728115146.7542-1-bst@pengutronix.de> From: Bastian Krause Message-ID: <155b7a4d-223b-82de-7ff1-151438f77afb@pengutronix.de> Date: Wed, 28 Jul 2021 13:55:30 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:78.0) Gecko/20100101 Thunderbird/78.11.0 MIME-Version: 1.0 In-Reply-To: <20210728115146.7542-1-bst@pengutronix.de> Content-Language: en-US Subject: Re: [ptxdist] [PATCH v2] 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 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 On 7/28/21 1:51 PM, Bastian Krause wrote: > 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 file. > > Signed-off-by: Bastian Krause Forgot the changelog: Changes since (implicit) v1: - add CAIRO_LICENSE_FILES pinning down COPYING, which states: "See the following files in this directory for the precise terms and conditions of either license: COPYING-LGPL-2.1 COPYING-MPL-1.1" Regards, Bastian > --- > rules/cairo.make | 4 +++- > 1 file changed, 3 insertions(+), 1 deletion(-) > > diff --git a/rules/cairo.make b/rules/cairo.make > index cfaa74518..3e52ea233 100644 > --- a/rules/cairo.make > +++ b/rules/cairo.make > @@ -21,7 +21,9 @@ 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 > > # ---------------------------------------------------------------------------- > # Prepare > -- Pengutronix e.K. | | Steuerwalder Str. 21 | http://www.pengutronix.de/ | 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 | Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 | _______________________________________________ ptxdist mailing list ptxdist@pengutronix.de To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de