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"