diff options
author | Robert Joslyn <robert.joslyn@redrectangle.org> | 2019-07-02 21:51:18 -0700 |
---|---|---|
committer | Khem Raj <raj.khem@gmail.com> | 2019-07-10 09:24:33 -0700 |
commit | 5aaaf8e972dae7a9ef5d23d55989f9fd2cc39e60 (patch) | |
tree | 34be06a8eec5845ee2712f7e69b29a8f3a5b1737 | |
parent | 3a4dfcce5de01f001ba29db5879752ec8e5acf87 (diff) | |
download | meta-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.bb | 6 |
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 | " |
40 | PACKAGECONFIG_append_class-target = " \ | ||
41 | udev \ | ||
42 | " | ||
41 | 43 | ||
42 | PACKAGECONFIG[keyring] = "--enable-keyring,--disable-keyring" | 44 | PACKAGECONFIG[keyring] = "--enable-keyring,--disable-keyring" |
43 | PACKAGECONFIG[fips] = "--enable-fips,--disable-fips" | 45 | PACKAGECONFIG[fips] = "--enable-fips,--disable-fips" |
@@ -48,7 +50,7 @@ PACKAGECONFIG[veritysetup] = "--enable-veritysetup,--disable-veritysetup" | |||
48 | PACKAGECONFIG[cryptsetup-reencrypt] = "--enable-cryptsetup-reencrypt,--disable-cryptsetup-reencrypt" | 50 | PACKAGECONFIG[cryptsetup-reencrypt] = "--enable-cryptsetup-reencrypt,--disable-cryptsetup-reencrypt" |
49 | PACKAGECONFIG[integritysetup] = "--enable-integritysetup,--disable-integritysetup" | 51 | PACKAGECONFIG[integritysetup] = "--enable-integritysetup,--disable-integritysetup" |
50 | PACKAGECONFIG[selinux] = "--enable-selinux,--disable-selinux" | 52 | PACKAGECONFIG[selinux] = "--enable-selinux,--disable-selinux" |
51 | PACKAGECONFIG[udev] = "--enable-udev,--disable-udev,udev" | 53 | PACKAGECONFIG[udev] = "--enable-udev,--disable-udev,,udev" |
52 | PACKAGECONFIG[kernel_crypto] = "--enable-kernel_crypto,--disable-kernel_crypto" | 54 | PACKAGECONFIG[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. |