helium-3rd-party/meta-openembedded
1
0
Fork 0
mirror of git://git.openembedded.org/meta-openembedded synced 2026-10-01 14:33:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

cryptsetup: Add support for building without SSH tokens

Browse Source 
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 <peter.kjellerstedt@axis.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
This commit is contained in:
Peter Kjellerstedt 2022-06-08 20:26:54 +02:00 committed by Khem Raj
parent 63d6205550
commit fc57827421
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
meta-oe/recipes-crypto/cryptsetup/cryptsetup_2.4.3.bb
View File

@ -14,7 +14,6 @@ DEPENDS = " \
libdevmapper \ libdevmapper \
popt \ popt \
util-linux-libuuid \ util-linux-libuuid \
libssh \
" "
DEPENDS:append:libc-musl = " argp-standalone" DEPENDS:append:libc-musl = " argp-standalone"
@ -39,6 +38,7 @@ PACKAGECONFIG ??= " \
blkid \ blkid \
luks-adjust-xts-keysize \ luks-adjust-xts-keysize \
openssl \ openssl \
ssh-token \
" "
PACKAGECONFIG:append:class-target = " \ PACKAGECONFIG:append:class-target = " \
udev \ udev \
@ -69,7 +69,7 @@ PACKAGECONFIG[nss] = "--with-crypto_backend=nss,,nss"
PACKAGECONFIG[kernel] = "--with-crypto_backend=kernel" PACKAGECONFIG[kernel] = "--with-crypto_backend=kernel"
PACKAGECONFIG[nettle] = "--with-crypto_backend=nettle,,nettle" PACKAGECONFIG[nettle] = "--with-crypto_backend=nettle,,nettle"
PACKAGECONFIG[luks2] = "--with-default-luks-format=LUKS2,--with-default-luks-format=LUKS1" PACKAGECONFIG[luks2] = "--with-default-luks-format=LUKS2,--with-default-luks-format=LUKS1"
PACKAGECONFIG[ssh-token] = "--enable-ssh-token,--disable-ssh-token,libssh"
EXTRA_OECONF = "--enable-static" EXTRA_OECONF = "--enable-static"
# Building without largefile is not supported by upstream # Building without largefile is not supported by upstream
@ -90,6 +90,14 @@ EXTRA_OECONF += "--with-luks2-pbkdf=${LUKS2_PBKDF} \
--with-luks2-parallel-threads=${LUKS2_PARALLEL_THREADS} \ --with-luks2-parallel-threads=${LUKS2_PARALLEL_THREADS} \
--with-luks2-iter-time=${LUKS2_ITERTIME}" --with-luks2-iter-time=${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 easiest solution
# is to remove it if it is empty.
rmdir -p --ignore-fail-on-non-empty ${D}${libdir}/${BPN}
}
FILES:${PN} += "${@bb.utils.contains('DISTRO_FEATURES','systemd','${exec_prefix}/lib/tmpfiles.d/cryptsetup.conf', '', d)}" FILES:${PN} += "${@bb.utils.contains('DISTRO_FEATURES','systemd','${exec_prefix}/lib/tmpfiles.d/cryptsetup.conf', '', d)}"
RDEPENDS:${PN} = " \ RDEPENDS:${PN} = " \