From patchwork Mon May 15 13:29:53 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ross Burton X-Patchwork-Id: 23959 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id B4DF0C7EE2E for ; Mon, 15 May 2023 13:30:02 +0000 (UTC) Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by mx.groups.io with SMTP id smtpd.web10.88630.1684157401472590806 for ; Mon, 15 May 2023 06:30:01 -0700 Authentication-Results: mx.groups.io; dkim=missing; spf=pass (domain: arm.com, ip: 217.140.110.172, mailfrom: ross.burton@arm.com) Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id CA8B44B3; Mon, 15 May 2023 06:30:45 -0700 (PDT) Received: from oss-tx204.lab.cambridge.arm.com (usa-sjc-imap-foss1.foss.arm.com [10.121.207.14]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPA id A91633F67D; Mon, 15 May 2023 06:30:00 -0700 (PDT) From: ross.burton@arm.com To: openembedded-core@lists.openembedded.org Cc: nd@arm.com Subject: [PATCH 6/8] glib-networking: fix LICENSE statement Date: Mon, 15 May 2023 14:29:53 +0100 Message-Id: <20230515132955.2231164-6-ross.burton@arm.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230515132955.2231164-1-ross.burton@arm.com> References: <20230515132955.2231164-1-ross.burton@arm.com> MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Mon, 15 May 2023 13:30:02 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/181256 From: Ross Burton The glib-networking license is LGPLv2.1 _or later_ and also has an additional exception if OpenSSL is being used. Add source comments to the checksum, and extend LICENSE if the openssl PACKAGECONFIG has been enabled. Signed-off-by: Ross Burton --- .../glib-networking/glib-networking_2.74.0.bb | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/meta/recipes-core/glib-networking/glib-networking_2.74.0.bb b/meta/recipes-core/glib-networking/glib-networking_2.74.0.bb index b3a88aca8db..ebf9e260508 100644 --- a/meta/recipes-core/glib-networking/glib-networking_2.74.0.bb +++ b/meta/recipes-core/glib-networking/glib-networking_2.74.0.bb @@ -3,8 +3,13 @@ DESCRIPTION = "glib-networking contains the implementations of certain GLib netw HOMEPAGE = "https://gitlab.gnome.org/GNOME/glib-networking/" BUGTRACKER = "http://bugzilla.gnome.org" -LICENSE = "LGPL-2.1-only" -LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c" +LICENSE = "LGPL-2.1-or-later" +LICENSE:append = "${@bb.utils.contains('PACKAGECONFIG', 'openssl', ' & Glib-Networking-OpenSSL-Exception', '', d)}" +NO_GENERIC_LICENSE[Glib-Networking-OpenSSL-Exception] = "LICENSE_EXCEPTION" + +LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c \ + file://LICENSE_EXCEPTION;md5=0f5be697951b5e71aff00f4a4ce66be8 \ + file://tls/base/gtlsconnection-base.c;beginline=7;endline=22;md5=ab641ac307f3337811008ea9afe7059f" SECTION = "libs" DEPENDS = "glib-2.0-native glib-2.0"