From e0eaa29f0208bf32ce33e1a50ad9a1f39f7b6c27 Mon Sep 17 00:00:00 2001 From: Yevhen Kyriukha Date: Sun, 1 Sep 2013 11:14:47 +0000 Subject: cryptsetup: Updated to upstream version. Also build static libraries. Signed-off-by: Yevhen Kyriukha Signed-off-by: Martin Jansa --- .../recipes-support/cryptsetup/cryptsetup_1.6.1.bb | 31 -------------------- .../recipes-support/cryptsetup/cryptsetup_1.6.2.bb | 33 ++++++++++++++++++++++ 2 files changed, 33 insertions(+), 31 deletions(-) delete mode 100644 meta-oe/recipes-support/cryptsetup/cryptsetup_1.6.1.bb create mode 100644 meta-oe/recipes-support/cryptsetup/cryptsetup_1.6.2.bb diff --git a/meta-oe/recipes-support/cryptsetup/cryptsetup_1.6.1.bb b/meta-oe/recipes-support/cryptsetup/cryptsetup_1.6.1.bb deleted file mode 100644 index 95f7e8d5fd..0000000000 --- a/meta-oe/recipes-support/cryptsetup/cryptsetup_1.6.1.bb +++ /dev/null @@ -1,31 +0,0 @@ -SUMMARY = "Manage plain dm-crypt and LUKS encrypted volumes" -DESCRIPTION = "Cryptsetup is used to conveniently setup dm-crypt managed \ -device-mapper mappings. These include plain dm-crypt volumes and \ -LUKS volumes. The difference is that LUKS uses a metadata header \ -and can hence offer more features than plain dm-crypt. On the other \ -hand, the header is visible and vulnerable to damage." -HOMEPAGE = "http://code.google.com/p/cryptsetup/" -SECTION = "console" -LICENSE = "GPL-2.0-with-OpenSSL-exception" -LIC_FILES_CHKSUM = "file://COPYING;md5=32107dd283b1dfeb66c9b3e6be312326" - -DEPENDS = "util-linux lvm2 popt libgcrypt" - -SRC_URI = "http://cryptsetup.googlecode.com/files/cryptsetup-${PV}.tar.bz2" -SRC_URI[md5sum] = "f374d11e3b0e7ca0f805756fd02e34ff" -SRC_URI[sha256sum] = "baf36e663c03eb6440482d91c486d61ed47ce5c9268ad04c18ca09082755149c" - -inherit autotools gettext - -# Use openssl because libgcrypt drops root privileges -# if libgcrypt is linked with libcap support -PACKAGECONFIG ??= "openssl" -PACKAGECONFIG[openssl] = "--with-crypto_backend=openssl,,openssl" -PACKAGECONFIG[gcrypt] = "--with-crypto_backend=gcrypt,,libgcrypt" - -RRECOMMENDS_${PN} = "kernel-module-aes-generic \ - kernel-module-dm-crypt \ - kernel-module-md5 \ - kernel-module-cbc \ - kernel-module-sha256-generic \ -" diff --git a/meta-oe/recipes-support/cryptsetup/cryptsetup_1.6.2.bb b/meta-oe/recipes-support/cryptsetup/cryptsetup_1.6.2.bb new file mode 100644 index 0000000000..6c3418a0c4 --- /dev/null +++ b/meta-oe/recipes-support/cryptsetup/cryptsetup_1.6.2.bb @@ -0,0 +1,33 @@ +SUMMARY = "Manage plain dm-crypt and LUKS encrypted volumes" +DESCRIPTION = "Cryptsetup is used to conveniently setup dm-crypt managed \ +device-mapper mappings. These include plain dm-crypt volumes and \ +LUKS volumes. The difference is that LUKS uses a metadata header \ +and can hence offer more features than plain dm-crypt. On the other \ +hand, the header is visible and vulnerable to damage." +HOMEPAGE = "http://code.google.com/p/cryptsetup/" +SECTION = "console" +LICENSE = "GPL-2.0-with-OpenSSL-exception" +LIC_FILES_CHKSUM = "file://COPYING;md5=32107dd283b1dfeb66c9b3e6be312326" + +DEPENDS = "util-linux lvm2 popt libgcrypt" + +SRC_URI = "http://cryptsetup.googlecode.com/files/cryptsetup-${PV}.tar.bz2" +SRC_URI[md5sum] = "cd834da49fbe92dd66df02cc5c61280f" +SRC_URI[sha256sum] = "15723f0198303d4bcb99d480b7a773918e2d319f0348457988c063bdd03e109a" + +inherit autotools gettext + +# Use openssl because libgcrypt drops root privileges +# if libgcrypt is linked with libcap support +PACKAGECONFIG ??= "openssl" +PACKAGECONFIG[openssl] = "--with-crypto_backend=openssl,,openssl" +PACKAGECONFIG[gcrypt] = "--with-crypto_backend=gcrypt,,libgcrypt" + +RRECOMMENDS_${PN} = "kernel-module-aes-generic \ + kernel-module-dm-crypt \ + kernel-module-md5 \ + kernel-module-cbc \ + kernel-module-sha256-generic \ +" + +EXTRA_OECONF = "--enable-static" -- cgit v1.2.3-54-g00ecf