summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRobert Joslyn <robert.joslyn@redrectangle.org>2019-07-02 21:51:18 -0700
committerKhem Raj <raj.khem@gmail.com>2019-07-10 09:24:33 -0700
commit5aaaf8e972dae7a9ef5d23d55989f9fd2cc39e60 (patch)
tree34be06a8eec5845ee2712f7e69b29a8f3a5b1737
parent3a4dfcce5de01f001ba29db5879752ec8e5acf87 (diff)
downloadmeta-openembedded-5aaaf8e972dae7a9ef5d23d55989f9fd2cc39e60.tar.gz
cryptsetup: Don't enable udev for native build
When building cryptsetup-native, don't enable udev support since there is not a udev-native recipe. When udev is enabled, change the dependency from a DEPENDS to an RDEPENDS. The --enable-udev option adds a runtime check for udev before using udev features of libdevmapper. Because of this, udev isn't needed at build time, just runtime. Signed-off-by: Robert Joslyn <robert.joslyn@redrectangle.org> Reviewed-by: Mikko Rapeli <mikko.rapeli@bmw.de> Signed-off-by: Khem Raj <raj.khem@gmail.com>
-rw-r--r--meta-oe/recipes-crypto/cryptsetup/cryptsetup_2.1.0.bb6
1 files changed, 4 insertions, 2 deletions
diff --git a/meta-oe/recipes-crypto/cryptsetup/cryptsetup_2.1.0.bb b/meta-oe/recipes-crypto/cryptsetup/cryptsetup_2.1.0.bb
index 51cecf5d23..a500b18986 100644
--- a/meta-oe/recipes-crypto/cryptsetup/cryptsetup_2.1.0.bb
+++ b/meta-oe/recipes-crypto/cryptsetup/cryptsetup_2.1.0.bb
@@ -31,13 +31,15 @@ PACKAGECONFIG ??= " \
31 cryptsetup-reencrypt \ 31 cryptsetup-reencrypt \
32 integritysetup \ 32 integritysetup \
33 ${@bb.utils.filter('DISTRO_FEATURES', 'selinux', d)} \ 33 ${@bb.utils.filter('DISTRO_FEATURES', 'selinux', d)} \
34 udev \
35 kernel_crypto \ 34 kernel_crypto \
36 internal-argon2 \ 35 internal-argon2 \
37 blkid \ 36 blkid \
38 luks-adjust-xts-keysize \ 37 luks-adjust-xts-keysize \
39 openssl \ 38 openssl \
40" 39"
40PACKAGECONFIG_append_class-target = " \
41 udev \
42"
41 43
42PACKAGECONFIG[keyring] = "--enable-keyring,--disable-keyring" 44PACKAGECONFIG[keyring] = "--enable-keyring,--disable-keyring"
43PACKAGECONFIG[fips] = "--enable-fips,--disable-fips" 45PACKAGECONFIG[fips] = "--enable-fips,--disable-fips"
@@ -48,7 +50,7 @@ PACKAGECONFIG[veritysetup] = "--enable-veritysetup,--disable-veritysetup"
48PACKAGECONFIG[cryptsetup-reencrypt] = "--enable-cryptsetup-reencrypt,--disable-cryptsetup-reencrypt" 50PACKAGECONFIG[cryptsetup-reencrypt] = "--enable-cryptsetup-reencrypt,--disable-cryptsetup-reencrypt"
49PACKAGECONFIG[integritysetup] = "--enable-integritysetup,--disable-integritysetup" 51PACKAGECONFIG[integritysetup] = "--enable-integritysetup,--disable-integritysetup"
50PACKAGECONFIG[selinux] = "--enable-selinux,--disable-selinux" 52PACKAGECONFIG[selinux] = "--enable-selinux,--disable-selinux"
51PACKAGECONFIG[udev] = "--enable-udev,--disable-udev,udev" 53PACKAGECONFIG[udev] = "--enable-udev,--disable-udev,,udev"
52PACKAGECONFIG[kernel_crypto] = "--enable-kernel_crypto,--disable-kernel_crypto" 54PACKAGECONFIG[kernel_crypto] = "--enable-kernel_crypto,--disable-kernel_crypto"
53# gcrypt-pkbdf2 requries --with-crypto_backend=gcrypt or the flag isn't 55# gcrypt-pkbdf2 requries --with-crypto_backend=gcrypt or the flag isn't
54# recognized. 56# recognized.