From patchwork Tue Jun 18 10:05:54 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: patrick@subset.ch X-Patchwork-Id: 45299 X-Patchwork-Delegate: steve@sakoman.com 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 7258FC27C4F for ; Tue, 18 Jun 2024 10:06:32 +0000 (UTC) Received: from pv50p00im-zteg10011401.me.com (pv50p00im-zteg10011401.me.com [17.58.6.41]) by mx.groups.io with SMTP id smtpd.web10.83041.1718705185706231187 for ; Tue, 18 Jun 2024 03:06:26 -0700 Authentication-Results: mx.groups.io; dkim=fail reason="dkim: body hash did not verify" header.i=@subset.ch header.s=sig1 header.b=WpkQgTUD; spf=pass (domain: subset.ch, ip: 17.58.6.41, mailfrom: patrick@subset.ch) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=subset.ch; s=sig1; t=1718705185; bh=pHIYjVXDNmLkWiJC6hyuOp7AzjImrbX0cZTIqFYtkj8=; h=From:To:Subject:Date:Message-ID:MIME-Version; b=WpkQgTUDQqMbxfwrwGbe+LyNp2XOqp5l2/aYM+e7gHhmo1TJoDam9CUnGrAmXRzMw oMyv+j/DXW1bZxpoPTUUo0jF3KWSNIFNZJdryMq53QHBHeWu5QRfgsklnkyjUhjDA4 gfYl7ZZdmJsa6vJtTovikhCpAsoD+JBd2t/Mbml8HSO5XCockQwhhKbQtBNL/BsCeN KjSrzghLJADfSoN0yqZ9BaneWP72rzaGd6jr7qWXyqyOYXsif0hyt7vOquVSSR3FsS 138wqkdfCCSZmBv6hvHSQYbH5hqY4/KJvmL2MCwCPvgABFVPO/+maNkPfkvoQ+zExZ 1rvhyiOxhlzyA== Received: from thinkpad.. (pv50p00im-dlb-asmtp-mailmevip.me.com [17.56.9.10]) by pv50p00im-zteg10011401.me.com (Postfix) with ESMTPSA id A5738DC01F9; Tue, 18 Jun 2024 10:06:21 +0000 (UTC) From: patrick@subset.ch To: openembedded-core@lists.openembedded.org Cc: Patrick Wicki Subject: [OE-core][scarthgap][master][PATCH] gpgme: move gpgme-tool to own sub-package Date: Tue, 18 Jun 2024 12:05:54 +0200 Message-ID: <20240618100554.2793454-1-patrick@subset.ch> X-Mailer: git-send-email 2.45.2 MIME-Version: 1.0 X-Proofpoint-GUID: JMmPmbD7zJC6hj3Aa5bVBvvzEJmjscUK X-Proofpoint-ORIG-GUID: JMmPmbD7zJC6hj3Aa5bVBvvzEJmjscUK X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.272,Aquarius:18.0.1039,Hydra:6.0.680,FMLib:17.12.28.16 definitions=2024-06-18_02,2024-06-17_01,2024-05-17_01 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 spamscore=0 mlxscore=0 phishscore=0 malwarescore=0 bulkscore=0 adultscore=0 suspectscore=0 mlxlogscore=999 clxscore=1030 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.19.0-2308100000 definitions=main-2406180075 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 ; Tue, 18 Jun 2024 10:06:32 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/200865 From: Patrick Wicki The gpgme-tool binary is licensed GPL-3.0-or-later. Split it out into its own package that can be opted out of. Signed-off-by: Patrick Wicki --- meta/recipes-support/gpgme/gpgme_1.23.2.bb | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/meta/recipes-support/gpgme/gpgme_1.23.2.bb b/meta/recipes-support/gpgme/gpgme_1.23.2.bb index d8807b3af2..55f164e4a9 100644 --- a/meta/recipes-support/gpgme/gpgme_1.23.2.bb +++ b/meta/recipes-support/gpgme/gpgme_1.23.2.bb @@ -3,11 +3,18 @@ DESCRIPTION = "GnuPG Made Easy (GPGME) is a library designed to make access to G HOMEPAGE = "http://www.gnupg.org/gpgme.html" BUGTRACKER = "https://bugs.g10code.com/gnupg/index" -LICENSE = "GPL-2.0-or-later & LGPL-2.1-or-later" +LICENSE = "GPL-2.0-or-later & LGPL-2.1-or-later & GPL-3.0-or-later" +LICENSE:${PN} = "GPL-2.0-or-later & LGPL-2.1-or-later" +LICENSE:${PN}-cpp = "GPL-2.0-or-later & LGPL-2.1-or-later" +LICENSE:${PN}-tool = "GPL-3.0-or-later" +LICENSE:python3-gpg = "GPL-2.0-or-later & LGPL-2.1-or-later" + LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \ file://COPYING.LESSER;md5=bbb461211a33b134d42ed5ee802b37ff \ file://src/gpgme.h.in;endline=23;md5=2f0bf06d1c7dcb28532a9d0f94a7ca1d \ - file://src/engine.h;endline=22;md5=4b6d8ba313d9b564cc4d4cfb1640af9d" + file://src/engine.h;endline=22;md5=4b6d8ba313d9b564cc4d4cfb1640af9d \ + file://src/gpgme-tool.c;endline=21;md5=66c5381e0e05475792e24982d15e7ce8 \ + " UPSTREAM_CHECK_URI = "https://gnupg.org/download/index.html" SRC_URI = "${GNUPG_MIRROR}/gpgme/${BP}.tar.bz2 \ @@ -33,6 +40,8 @@ RDEPENDS:${PN}-cpp += "libstdc++" RDEPENDS:python3-gpg += "python3-unixadmin" +RRECOMMENDS:${PN} += "${PN}-tool" + BINCONFIG = "${bindir}/gpgme-config" # Default in configure.ac: "cl cpp python qt" @@ -61,9 +70,10 @@ export PKG_CONFIG='pkg-config' BBCLASSEXTEND = "native nativesdk" -PACKAGES =+ "${PN}-cpp python3-gpg" +PACKAGES =+ "${PN}-cpp ${PN}-tool python3-gpg" FILES:${PN}-cpp = "${libdir}/libgpgmepp.so.*" +FILES:${PN}-tool = "${bindir}/gpgme-tool" FILES:python3-gpg = "${PYTHON_SITEPACKAGES_DIR}/*" FILES:${PN}-dev += "${datadir}/common-lisp/source/gpgme/*"