From 5aaaf8e972dae7a9ef5d23d55989f9fd2cc39e60 Mon Sep 17 00:00:00 2001 From: Robert Joslyn Date: Tue, 2 Jul 2019 21:51:18 -0700 Subject: 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 Reviewed-by: Mikko Rapeli Signed-off-by: Khem Raj --- meta-oe/recipes-crypto/cryptsetup/cryptsetup_2.1.0.bb | 6 ++++-- 1 file 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 ??= " \ cryptsetup-reencrypt \ integritysetup \ ${@bb.utils.filter('DISTRO_FEATURES', 'selinux', d)} \ - udev \ kernel_crypto \ internal-argon2 \ blkid \ luks-adjust-xts-keysize \ openssl \ " +PACKAGECONFIG_append_class-target = " \ + udev \ +" PACKAGECONFIG[keyring] = "--enable-keyring,--disable-keyring" PACKAGECONFIG[fips] = "--enable-fips,--disable-fips" @@ -48,7 +50,7 @@ PACKAGECONFIG[veritysetup] = "--enable-veritysetup,--disable-veritysetup" PACKAGECONFIG[cryptsetup-reencrypt] = "--enable-cryptsetup-reencrypt,--disable-cryptsetup-reencrypt" PACKAGECONFIG[integritysetup] = "--enable-integritysetup,--disable-integritysetup" PACKAGECONFIG[selinux] = "--enable-selinux,--disable-selinux" -PACKAGECONFIG[udev] = "--enable-udev,--disable-udev,udev" +PACKAGECONFIG[udev] = "--enable-udev,--disable-udev,,udev" PACKAGECONFIG[kernel_crypto] = "--enable-kernel_crypto,--disable-kernel_crypto" # gcrypt-pkbdf2 requries --with-crypto_backend=gcrypt or the flag isn't # recognized. -- cgit 1.2.3-korg