From patchwork Wed May 13 13:35:53 2026 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ross Burton X-Patchwork-Id: 88041 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 C7927CD4851 for ; Wed, 13 May 2026 13:36:04 +0000 (UTC) Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by mx.groups.io with SMTP id smtpd.msgproc02-g2.7821.1778679362576462755 for ; Wed, 13 May 2026 06:36:02 -0700 Authentication-Results: mx.groups.io; dkim=fail reason="dkim: body hash did not verify" header.i=@arm.com header.s=foss header.b=rjKTM0bu; 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 C627E1596 for ; Wed, 13 May 2026 06:35:56 -0700 (PDT) Received: from cesw-amp-gbt-1s-m12830-04.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 A1A813F836 for ; Wed, 13 May 2026 06:36:01 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=arm.com; s=foss; t=1778679362; bh=KvCqtlU6xNPzlR/ab2RQ4HXWUpBTSFe4vl1iqaVUF24=; h=From:To:Subject:Date:From; b=rjKTM0buHDQtpzUDCqZhwZm4rAvfAvZe0C1lunmvYbXxOvBWkwYknpcDmdysZYXqP XWSwoxLYbdCEF8xNobnPoJc6WmiC+FfN2eUKMeSMoh/PriDTJbXpCxO/kDPfCQRELN nX0uqmmr1vfydP3VW9+pMQvqUy0mnv/OAUas2hMs= From: Ross Burton To: openembedded-core@lists.openembedded.org Subject: [PATCH v2 1/5] libportal: add explicit PACKAGECONFIG for gtk4 support Date: Wed, 13 May 2026 14:35:53 +0100 Message-ID: <20260513133557.2951262-1-ross.burton@arm.com> X-Mailer: git-send-email 2.43.0 MIME-Version: 1.0 List-Id: X-Webhook-Received: from 45-33-107-173.ip.linodeusercontent.com [45.33.107.173] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Wed, 13 May 2026 13:36:04 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/236980 Instead of using the presence of the opengl DISTRO_FEATURE to control whether the GTK 4 integration is built, add a PACKAGECONFIG for it. Signed-off-by: Ross Burton --- meta/recipes-gnome/libportal/libportal_0.9.1.bb | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/meta/recipes-gnome/libportal/libportal_0.9.1.bb b/meta/recipes-gnome/libportal/libportal_0.9.1.bb index 9713f70dbb1..f4924355f93 100644 --- a/meta/recipes-gnome/libportal/libportal_0.9.1.bb +++ b/meta/recipes-gnome/libportal/libportal_0.9.1.bb @@ -14,6 +14,9 @@ GIDOCGEN_MESON_OPTION = 'docs' ANY_OF_DISTRO_FEATURES = "${GTK3DISTROFEATURES}" -DEPENDS += "glib-2.0 glib-2.0-native gtk+3 ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'gtk4', '', d)}" +DEPENDS += "glib-2.0 glib-2.0-native gtk+3" + +PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'gtk4', '', d)}" +PACKAGECONFIG[gtk4] = "-Dbackend-gtk4=enabled,-Dbackend-gtk4=disabled,gtk4" EXTRA_OEMESON = "${@bb.utils.contains('GI_DATA_ENABLED', 'True', '-Dvapi=true', '-Dvapi=false', d)} -Dbackend-qt5=disabled" From patchwork Wed May 13 13:35:54 2026 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ross Burton X-Patchwork-Id: 88043 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 CFDB5CD4F24 for ; Wed, 13 May 2026 13:36:04 +0000 (UTC) Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by mx.groups.io with SMTP id smtpd.msgproc01-g2.7721.1778679363355728490 for ; Wed, 13 May 2026 06:36:03 -0700 Authentication-Results: mx.groups.io; dkim=fail reason="dkim: body hash did not verify" header.i=@arm.com header.s=foss header.b=nW1oL+UE; 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 771951596 for ; Wed, 13 May 2026 06:35:57 -0700 (PDT) Received: from cesw-amp-gbt-1s-m12830-04.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 5C7F83F836 for ; Wed, 13 May 2026 06:36:02 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=arm.com; s=foss; t=1778679362; bh=1tZ3wrh8ebXrjFbe1Ntcf5is9N1LWzteDgeAfr/sDBg=; h=From:To:Subject:Date:In-Reply-To:References:From; b=nW1oL+UE2c1JHt7kAcQZN/YQlsBnJu6yLdi1YifIG5Zy3XKMOkLz/VELgAzPz51Sb j/9m2jgajGiP6pBcenhp9yVhl58IcIvAC5lA6L5aT+b+G89lzShQn5DtAkcIkQXZ+5 ihmtO4X2EmnV50VP9b6wb+Nv2o0rtU5loMRpUp8A= From: Ross Burton To: openembedded-core@lists.openembedded.org Subject: [PATCH v2 2/5] libportal: split out GTK libraries into sub-packages Date: Wed, 13 May 2026 14:35:54 +0100 Message-ID: <20260513133557.2951262-2-ross.burton@arm.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260513133557.2951262-1-ross.burton@arm.com> References: <20260513133557.2951262-1-ross.burton@arm.com> MIME-Version: 1.0 List-Id: X-Webhook-Received: from 45-33-107-173.ip.linodeusercontent.com [45.33.107.173] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Wed, 13 May 2026 13:36:04 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/236981 We shouldn't package the bare libportal and the GTK3 and GTK4 libraries into one package. Instead package the UI libraries into separate packages, so that dependencies are contained. Add PACKAGECONFIGs for the gtk3 and gtk3 libraries so that they can be controlled individually. Keep the existing behaviour of enabling both GTK 3 and 4 as various recipes use both, but this allows building libportal without any GTK dependencies if required. The PACKAGECONFIG logic is "fun": if either of wayland or x11 are enabled then we can enable GTK+3 by default, and if either of those _and_ opengl are enabled then we can also do GTK 4. Signed-off-by: Ross Burton --- meta/recipes-gnome/libportal/libportal_0.9.1.bb | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/meta/recipes-gnome/libportal/libportal_0.9.1.bb b/meta/recipes-gnome/libportal/libportal_0.9.1.bb index f4924355f93..59252e2a67b 100644 --- a/meta/recipes-gnome/libportal/libportal_0.9.1.bb +++ b/meta/recipes-gnome/libportal/libportal_0.9.1.bb @@ -9,14 +9,22 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=3000208d539ec061b899bce1d9ce9404" SRC_URI = "git://github.com/flatpak/${BPN}.git;protocol=https;branch=main" SRCREV = "8f5dc8d192f6e31dafe69e35219e3b707bde71ce" -inherit meson gi-docgen gobject-introspection vala features_check pkgconfig +inherit meson gi-docgen gobject-introspection vala pkgconfig GIDOCGEN_MESON_OPTION = 'docs' -ANY_OF_DISTRO_FEATURES = "${GTK3DISTROFEATURES}" +DEPENDS += "glib-2.0 glib-2.0-native" -DEPENDS += "glib-2.0 glib-2.0-native gtk+3" +CAN_GTK = "${@bb.utils.contains_any('DISTRO_FEATURES', '${GTK3DISTROFEATURES}', '1', '0', d)}" -PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'gtk4', '', d)}" +PACKAGECONFIG ??= "${@oe.utils.vartrue('CAN_GTK', 'gtk3', '', d)} \ + ${@oe.utils.vartrue('CAN_GTK', '${@bb.utils.contains("DISTRO_FEATURES", "opengl", "gtk4", "", d)}', '', d)}" + +PACKAGECONFIG[gtk3] = "-Dbackend-gtk3=enabled,-Dbackend-gtk3=disabled,gtk+3" PACKAGECONFIG[gtk4] = "-Dbackend-gtk4=enabled,-Dbackend-gtk4=disabled,gtk4" EXTRA_OEMESON = "${@bb.utils.contains('GI_DATA_ENABLED', 'True', '-Dvapi=true', '-Dvapi=false', d)} -Dbackend-qt5=disabled" + +PACKAGES =+ "${PN}-gtk3 ${PN}-gtk4" + +FILES:${PN}-gtk3 = "${libdir}/libportal-gtk3${SOLIBS} ${libdir}/girepository-1.0/*Gtk3-1.0.typelib" +FILES:${PN}-gtk4 = "${libdir}/libportal-gtk4${SOLIBS} ${libdir}/girepository-1.0/*Gtk4-1.0.typelib" From patchwork Wed May 13 13:35:55 2026 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ross Burton X-Patchwork-Id: 88042 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 C21C6CD4F21 for ; Wed, 13 May 2026 13:36:04 +0000 (UTC) Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by mx.groups.io with SMTP id smtpd.msgproc01-g2.7722.1778679363885326663 for ; Wed, 13 May 2026 06:36:04 -0700 Authentication-Results: mx.groups.io; dkim=fail reason="dkim: body hash did not verify" header.i=@arm.com header.s=foss header.b=iuV05RRF; 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 2FD6E15A1 for ; Wed, 13 May 2026 06:35:58 -0700 (PDT) Received: from cesw-amp-gbt-1s-m12830-04.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 0EDF03F836 for ; Wed, 13 May 2026 06:36:02 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=arm.com; s=foss; t=1778679363; bh=BXBFKOpXgBaFN/xjjMTg6CKXwMV6b8UEKf6aZIFBZhY=; h=From:To:Subject:Date:In-Reply-To:References:From; b=iuV05RRFVvOaEshz8xnmqrmUEfrBKobUKnKtj0XO0Ly/IUr0SJ5NLZdBXcRaqaC9Y bmbz7Sndb7NufCWKGLK7uH20A/bkXzJKe9C0qouDXmD/oq0C1wNyLpLmVIpDiIms1X 5kzzqVhchjug/T1uGyQIjFgBz7isjGU98SmFfyho= From: Ross Burton To: openembedded-core@lists.openembedded.org Subject: [PATCH v2 3/5] gcr: remove obsolete DEPENDS Date: Wed, 13 May 2026 14:35:55 +0100 Message-ID: <20260513133557.2951262-3-ross.burton@arm.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260513133557.2951262-1-ross.burton@arm.com> References: <20260513133557.2951262-1-ross.burton@arm.com> MIME-Version: 1.0 List-Id: X-Webhook-Received: from 45-33-107-173.ip.linodeusercontent.com [45.33.107.173] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Wed, 13 May 2026 13:36:04 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/236982 libxslt-native was added back in 2017 to gcr-3.2.0 as a needed dependency when building with gobject-introspection[1], but this no longer appears to be the case. gnupg-native was added in 2020[1] but we now pass the correct paths to Meson so this is no longer needed. [1] oe-core 58922a43f93 ("gcr: add missing dependency on xsltproc if introspection is enabled") [2] oe-core afa5ec0dee8 ("gcr: depends on gnupg-native") Signed-off-by: Ross Burton --- meta/recipes-gnome/gcr/gcr_4.4.0.1.bb | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/meta/recipes-gnome/gcr/gcr_4.4.0.1.bb b/meta/recipes-gnome/gcr/gcr_4.4.0.1.bb index f3288c8d36e..1f4d2f48001 100644 --- a/meta/recipes-gnome/gcr/gcr_4.4.0.1.bb +++ b/meta/recipes-gnome/gcr/gcr_4.4.0.1.bb @@ -8,8 +8,7 @@ BUGTRACKER = "https://gitlab.gnome.org/GNOME/gcr/issues" LICENSE = "LGPL-2.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=55ca817ccb7d5b5b66355690e9abc605" -DEPENDS = "p11-kit glib-2.0 libgcrypt gnupg-native \ - ${@bb.utils.contains('GI_DATA_ENABLED', 'True', 'libxslt-native', '', d)}" +DEPENDS = "p11-kit glib-2.0 libgcrypt" CFLAGS += "-D_GNU_SOURCE" From patchwork Wed May 13 13:35:56 2026 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ross Burton X-Patchwork-Id: 88045 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 CFD16CD4851 for ; Wed, 13 May 2026 13:36:14 +0000 (UTC) Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by mx.groups.io with SMTP id smtpd.msgproc01-g2.7724.1778679364577680868 for ; Wed, 13 May 2026 06:36:04 -0700 Authentication-Results: mx.groups.io; dkim=fail reason="dkim: body hash did not verify" header.i=@arm.com header.s=foss header.b=ra01lYMs; 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 D36541596 for ; Wed, 13 May 2026 06:35:58 -0700 (PDT) Received: from cesw-amp-gbt-1s-m12830-04.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 BCDBE3F836 for ; Wed, 13 May 2026 06:36:03 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=arm.com; s=foss; t=1778679364; bh=EQi0Ze4ABIahFdgH4TQNl3RCPJtDxzSupSYJR7krBY0=; h=From:To:Subject:Date:In-Reply-To:References:From; b=ra01lYMscFRl13XceeW/14ZXSp3fJuwpMpYnShTPcOLnzT/OK8BthD7Ks0lTfJ+W3 PiAk0mEziS3Y2mCtuxRGqchBkT1fpDlabkIeKIe7ChQSM0FVAPl2vTyyiS0o9aScJ6 wZY5alIBTW1Em2aHHuUTsVuS29d53vaIi6lWAWac= From: Ross Burton To: openembedded-core@lists.openembedded.org Subject: [PATCH v2 4/5] gcr: remove obsolete packaging Date: Wed, 13 May 2026 14:35:56 +0100 Message-ID: <20260513133557.2951262-4-ross.burton@arm.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260513133557.2951262-1-ross.burton@arm.com> References: <20260513133557.2951262-1-ross.burton@arm.com> MIME-Version: 1.0 List-Id: X-Webhook-Received: from 45-33-107-173.ip.linodeusercontent.com [45.33.107.173] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Wed, 13 May 2026 13:36:14 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/236983 Previously the package contained UI libraries but they were removed in the 4.0.0 release: - gcr4 will no longer ship UI libraries, i.e. gcr-gtk3 or gcr-gtk4. Remove a large amount of packaging metadata that is no longer needed, and add an optional and disabled PACKAGECONFIG for the viewer tool which is packaged separately from the libraries. Signed-off-by: Ross Burton --- meta/recipes-gnome/gcr/gcr_4.4.0.1.bb | 16 ++++------------ 1 file changed, 4 insertions(+), 12 deletions(-) diff --git a/meta/recipes-gnome/gcr/gcr_4.4.0.1.bb b/meta/recipes-gnome/gcr/gcr_4.4.0.1.bb index 1f4d2f48001..fa769759c14 100644 --- a/meta/recipes-gnome/gcr/gcr_4.4.0.1.bb +++ b/meta/recipes-gnome/gcr/gcr_4.4.0.1.bb @@ -13,31 +13,23 @@ DEPENDS = "p11-kit glib-2.0 libgcrypt" CFLAGS += "-D_GNU_SOURCE" GTKDOC_MESON_OPTION = "gtk_doc" -inherit gnomebase gtk-icon-cache gi-docgen features_check vala gobject-introspection gettext mime mime-xdg +inherit gnomebase gi-docgen vala gobject-introspection lib_package UPSTREAM_CHECK_REGEX = "gcr-(?P\d+\.\d+\.(?!9\d+)\d+(\.\d+)?)" -REQUIRED_DISTRO_FEATURES = "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'opengl', '', d)}" - SRC_URI[archive.sha256sum] = "0c3c341e49f9f4f2532a4884509804190a0c2663e6120360bb298c5d174a8098" PACKAGECONFIG ??= " \ ${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)} \ - ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'gtk', '', d)} \ - ${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'gtk', '', d)} \ ${@bb.utils.contains('GI_DATA_ENABLED', 'True', 'vapi', '', d)} \ " -PACKAGECONFIG[gtk] = "-Dgtk4=true,-Dgtk4=false,gtk4" PACKAGECONFIG[ssh_agent] = "-Dssh_agent=true,-Dssh_agent=false,libsecret,openssh" #'Use systemd socket activation for server programs' PACKAGECONFIG[systemd] = "-Dsystemd=enabled,-Dsystemd=disabled,systemd" PACKAGECONFIG[vapi] = "-Dvapi=true,-Dvapi=false," +# A tool to view certificates +PACKAGECONFIG[viewer] = "-Dgtk4=true,-Dgtk4=false,gtk4" -FILES:${PN} += " \ - ${datadir}/dbus-1 \ - ${datadir}/gcr-4 \ - ${systemd_user_unitdir}/gcr-ssh-agent.socket \ - ${systemd_user_unitdir}/gcr-ssh-agent.service \ -" +FILES:${PN} += "${systemd_user_unitdir}/gcr-ssh-agent.*" # http://errors.yoctoproject.org/Errors/Details/20229/ ARM_INSTRUCTION_SET:armv4 = "arm" From patchwork Wed May 13 13:35:57 2026 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ross Burton X-Patchwork-Id: 88044 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 DF152CD4F21 for ; Wed, 13 May 2026 13:36:14 +0000 (UTC) Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by mx.groups.io with SMTP id smtpd.msgproc01-g2.7725.1778679365279436226 for ; Wed, 13 May 2026 06:36:05 -0700 Authentication-Results: mx.groups.io; dkim=fail reason="dkim: body hash did not verify" header.i=@arm.com header.s=foss header.b=VeczMocJ; 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 887361596 for ; Wed, 13 May 2026 06:35:59 -0700 (PDT) Received: from cesw-amp-gbt-1s-m12830-04.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 6D7B33F836 for ; Wed, 13 May 2026 06:36:04 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=arm.com; s=foss; t=1778679364; bh=+HsZubV2QubXnuSCuDVhz/CfIAv9ep1Yv+hTZKuroK8=; h=From:To:Subject:Date:In-Reply-To:References:From; b=VeczMocJU9LLJ78WB1udKdJC8PpOn6v5MwYEBulA/Xd+OKgFZxmi4gQH/YtKNhecw DM5p4E5zMJ7jPPyVAjaOLgTm5G/yf1mTXGgNzN/1OaLfDEyHw03JooFiYx2g7LoZgv 2JUdTpVxsEX0Fkfle9Kn87OTI1rYG6jrJnOSOyms= From: Ross Burton To: openembedded-core@lists.openembedded.org Subject: [PATCH v2 5/5] gcr: package the ssh-agent into a separate package Date: Wed, 13 May 2026 14:35:57 +0100 Message-ID: <20260513133557.2951262-5-ross.burton@arm.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260513133557.2951262-1-ross.burton@arm.com> References: <20260513133557.2951262-1-ross.burton@arm.com> MIME-Version: 1.0 List-Id: X-Webhook-Received: from 45-33-107-173.ip.linodeusercontent.com [45.33.107.173] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Wed, 13 May 2026 13:36:14 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/236984 The agent is a separate component to the library, so package it into a new package. The systemd dependency is only relevant to the ssh-agent, so don't enable it by default as we don't enable the agent either. Signed-off-by: Ross Burton --- meta/recipes-gnome/gcr/gcr_4.4.0.1.bb | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/meta/recipes-gnome/gcr/gcr_4.4.0.1.bb b/meta/recipes-gnome/gcr/gcr_4.4.0.1.bb index fa769759c14..493c8c2a0d0 100644 --- a/meta/recipes-gnome/gcr/gcr_4.4.0.1.bb +++ b/meta/recipes-gnome/gcr/gcr_4.4.0.1.bb @@ -18,18 +18,17 @@ UPSTREAM_CHECK_REGEX = "gcr-(?P\d+\.\d+\.(?!9\d+)\d+(\.\d+)?)" SRC_URI[archive.sha256sum] = "0c3c341e49f9f4f2532a4884509804190a0c2663e6120360bb298c5d174a8098" -PACKAGECONFIG ??= " \ - ${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)} \ - ${@bb.utils.contains('GI_DATA_ENABLED', 'True', 'vapi', '', d)} \ -" -PACKAGECONFIG[ssh_agent] = "-Dssh_agent=true,-Dssh_agent=false,libsecret,openssh" -#'Use systemd socket activation for server programs' +PACKAGECONFIG ??= "${@bb.utils.contains('GI_DATA_ENABLED', 'True', 'vapi', '', d)}" +PACKAGECONFIG[ssh_agent] = "-Dssh_agent=true,-Dssh_agent=false,libsecret" +# Socket activation for the ssh-agent PACKAGECONFIG[systemd] = "-Dsystemd=enabled,-Dsystemd=disabled,systemd" PACKAGECONFIG[vapi] = "-Dvapi=true,-Dvapi=false," # A tool to view certificates PACKAGECONFIG[viewer] = "-Dgtk4=true,-Dgtk4=false,gtk4" -FILES:${PN} += "${systemd_user_unitdir}/gcr-ssh-agent.*" +PACKAGE_BEFORE_PN += "${PN}-ssh-agent" +FILES:${PN}-ssh-agent = "${libexecdir}/gcr-ssh-agent ${systemd_user_unitdir}/gcr-ssh-agent.*" +RDEPENDS:${PN}-ssh-agent += "openssh" # http://errors.yoctoproject.org/Errors/Details/20229/ ARM_INSTRUCTION_SET:armv4 = "arm"