From fd8dc3a2f320f5b8335202ba9f366ed93bf53dd5 Mon Sep 17 00:00:00 2001 From: Patrick Wicki Date: Tue, 18 Jun 2024 12:05:54 +0200 Subject: gpgme: move gpgme-tool to own sub-package The gpgme-tool binary is licensed GPL-3.0-or-later. Split it out into its own package that can be opted out of. (From OE-Core rev: bbcd56bace90f4a148960a7108dc8d0e6c364903) Signed-off-by: Patrick Wicki Signed-off-by: Alexandre Belloni Signed-off-by: Richard Purdie --- 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/*" -- cgit v1.2.3-54-g00ecf