From mboxrd@z Thu Jan 1 00:00:00 1970 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 1E978C433EF for ; Thu, 21 Jul 2022 15:02:06 +0000 (UTC) Received: from smtp2.axis.com (smtp2.axis.com [195.60.68.18]) by mx.groups.io with SMTP id smtpd.web12.7442.1658415718278638779 for ; Thu, 21 Jul 2022 08:01:58 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@axis.com header.s=axis-central1 header.b=Y8ZjFkBd; spf=pass (domain: axis.com, ip: 195.60.68.18, mailfrom: peter.kjellerstedt@axis.com) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=axis.com; q=dns/txt; s=axis-central1; t=1658415718; x=1689951718; h=from:to:cc:subject:date:message-id:references: in-reply-to:content-transfer-encoding:mime-version; bh=CIITYyeg7Sm9Rtdnqc0n1xSWdIrhII3J4tmoxkC5stE=; b=Y8ZjFkBd+4M3ecxlE6nw9WrkUqBXqrGEhNxTwdHK3T6tsvK6/bgbb2kb NkpalKVG1or/Jw0MWVaUjEPu5VoZp0UQNUnO7wnqibNyTmKEK2GJAPhZZ 2NuXPW6Trv85o8t+eMar1nbsbe257HenON0s9Fbp+ZMgyhAR5jmRNxmbK XPfM8rEyarOZtPcnxOSneAmudumTxFGDNZOchrl+5fnj0w+oYa7Asym6b Z+KP4WTZ4rcZJn481QjtLXRRn7edneOcgQ3+qvXF4kfvoUg8tMQ8c8yHp DPw/hA1OO6E0xsfpCn6m7+4hXtOxISiYT0+3cl+h//x0/xlbvuq0vDFCY g==; From: Peter Kjellerstedt To: Armin Kuster CC: "openembedded-devel@lists.openembedded.org" Subject: RE: [oe] [meta-oe][PATCH] cryptsetup: Add support for building without SSH tokens Thread-Topic: [oe] [meta-oe][PATCH] cryptsetup: Add support for building without SSH tokens Thread-Index: AQHYe2Vaqa//iELw9ke2BLd7SUzIva1wVSHggBjZn6A= Date: Thu, 21 Jul 2022 15:01:55 +0000 Message-ID: References: <16F6B88B2671EBED.5223@lists.openembedded.org> <16FF05E9F9AF02CA.28546@lists.openembedded.org> In-Reply-To: <16FF05E9F9AF02CA.28546@lists.openembedded.org> Accept-Language: en-US, sv-SE Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-originating-ip: [10.0.5.60] Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable 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 ; Thu, 21 Jul 2022 15:02:06 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/97918 *ping* //Peter > -----Original Message----- > From: openembedded-devel@lists.openembedded.org devel@lists.openembedded.org> On Behalf Of Peter Kjellerstedt > Sent: den 5 juli 2022 21:35 > To: Armin Kuster > Cc: openembedded-devel@lists.openembedded.org > Subject: Re: [oe] [meta-oe][PATCH] cryptsetup: Add support for building > without SSH tokens >=20 > > -----Original Message----- > > From: openembedded-devel@lists.openembedded.org devel@lists.openembedded.org> On Behalf Of Peter Kjellerstedt > > Sent: den 8 juni 2022 20:27 > > To: openembedded-devel@lists.openembedded.org > > Subject: [oe] [meta-oe][PATCH] cryptsetup: Add support for building > without SSH tokens >=20 > This is now on master. Please backport it to Kirkstone. >=20 > //Peter >=20 > > > > Cryptsetup SSH tokens is the only feature that has a dependency on > > libssh. Add a packageconfig to control this dependency. > > > > Change-Id: Iac4f91e099ad2e3a79aab183734108f8bfbff57f > > Signed-off-by: Peter Kjellerstedt > > --- > > .../recipes-crypto/cryptsetup/cryptsetup_2.4.3.bb | 12 ++++++++++-- > > 1 file changed, 10 insertions(+), 2 deletions(-) > > > > diff --git a/meta-oe/recipes-crypto/cryptsetup/cryptsetup_2.4.3.bb > b/meta-oe/recipes-crypto/cryptsetup/cryptsetup_2.4.3.bb > > index 435b55477..652fd6661 100644 > > --- a/meta-oe/recipes-crypto/cryptsetup/cryptsetup_2.4.3.bb > > +++ b/meta-oe/recipes-crypto/cryptsetup/cryptsetup_2.4.3.bb > > @@ -14,7 +14,6 @@ DEPENDS =3D " \ > > libdevmapper \ > > popt \ > > util-linux-libuuid \ > > - libssh \ > > " > > > > DEPENDS:append:libc-musl =3D " argp-standalone" > > @@ -39,6 +38,7 @@ PACKAGECONFIG ??=3D " \ > > blkid \ > > luks-adjust-xts-keysize \ > > openssl \ > > + ssh-token \ > > " > > PACKAGECONFIG:append:class-target =3D " \ > > udev \ > > @@ -69,7 +69,7 @@ PACKAGECONFIG[nss] =3D "--with-crypto_backend=3Dnss,,= nss" > > PACKAGECONFIG[kernel] =3D "--with-crypto_backend=3Dkernel" > > PACKAGECONFIG[nettle] =3D "--with-crypto_backend=3Dnettle,,nettle" > > PACKAGECONFIG[luks2] =3D "--with-default-luks-format=3DLUKS2,--with- > default-luks-format=3DLUKS1" > > - > > +PACKAGECONFIG[ssh-token] =3D "--enable-ssh-token,--disable-ssh- > token,libssh" > > > > EXTRA_OECONF =3D "--enable-static" > > # Building without largefile is not supported by upstream > > @@ -90,6 +90,14 @@ EXTRA_OECONF +=3D "--with-luks2-pbkdf=3D${LUKS2_PBKD= F} \ > > --with-luks2-parallel-threads=3D${LUKS2_PARALLEL_THREADS} \ > > --with-luks2-iter-time=3D${LUKS2_ITERTIME}" > > > > +do_install:append() { > > + # The /usr/lib/cryptsetup directory is always created, even when > ssh-token > > + # is disabled. In that case it is empty and causes a packaging > error. Since > > + # there is no reason to distribute the empty directory, the easies= t > solution > > + # is to remove it if it is empty. > > + rmdir -p --ignore-fail-on-non-empty ${D}${libdir}/${BPN} > > +} > > + > > FILES:${PN} +=3D > "${@bb.utils.contains('DISTRO_FEATURES','systemd','${exec_prefix}/lib/tmp= f > iles.d/cryptsetup.conf', '', d)}" > > > > RDEPENDS:${PN} =3D " \