Patchwork [17/17] cryptsetup: New recipe. Supporting LUKS

login
register
mail settings
Submitter Kim Bøndergaard
Date Oct. 4, 2013, 1:24 p.m.
Message ID <fcbd748778f997ed55c597fd13f1f23657fb05f1.1380892944.git.kibo@prevas.dk>
Download mbox | patch
Permalink /patch/280610/
State Accepted
Delegated to: Esben Haabendal
Headers show

Comments

Kim Bøndergaard - Oct. 4, 2013, 1:24 p.m.
---
 recipes/cryptsetup/cryptsetup_1.6.2.oe     | 26 ++++++++++++++++++++++++++
 recipes/cryptsetup/cryptsetup_1.6.2.oe.sig |  1 +
 2 files changed, 27 insertions(+)
 create mode 100644 recipes/cryptsetup/cryptsetup_1.6.2.oe
 create mode 100644 recipes/cryptsetup/cryptsetup_1.6.2.oe.sig
Esben Haabendal - Oct. 15, 2013, 11:54 a.m.
Kim Bøndergaard <kibo@prevas.dk> writes:

> ---
>  recipes/cryptsetup/cryptsetup_1.6.2.oe     | 26 ++++++++++++++++++++++++++
>  recipes/cryptsetup/cryptsetup_1.6.2.oe.sig |  1 +
>  2 files changed, 27 insertions(+)
>  create mode 100644 recipes/cryptsetup/cryptsetup_1.6.2.oe
>  create mode 100644 recipes/cryptsetup/cryptsetup_1.6.2.oe.sig
>
> diff --git a/recipes/cryptsetup/cryptsetup_1.6.2.oe b/recipes/cryptsetup/cryptsetup_1.6.2.oe
> new file mode 100644
> index 0000000..dfc87c7
> --- /dev/null
> +++ b/recipes/cryptsetup/cryptsetup_1.6.2.oe
> @@ -0,0 +1,26 @@
> +SUMMARY = "cryptsetup is used to conveniently setup dm-crypt managed block devices under Linux"
> +DESCRIPTION = "While LUKS is a standard on-disk format, there is also a reference implementation. LUKS for dm-crypt is implemented in an enhanced version of cryptsetup."
> +HOMEPAGE="http://code.google.com/p/cryptsetup/"
> +LICENSE="GPLv2"
> +SRC_URI = "http://cryptsetup.googlecode.com/files/cryptsetup-1.6.2.tar.bz2"
> +
> +RECIPE_TYPES = "machine"
> +
> +inherit autotools pkgconfig auto-package-utils auto-package-libs
> +
> +DEPENDS += "libuuid libdevmapper popt libgcrypt"
> +
> +RECIPE_FLAGS += "cryptosetup_udev_disable"
> +
> +DEFAULT_cryptosetup_udev_disable = "0"

It is DEFAULT_USE_* and not DEFAULT_*. Also, the extra 'o' in
cryptosetup is doomed to cause confusion.  And double negation... To
disable the disable flag...

> +EXTRA_OECONF:>USE_cryptosetup_udev_disable = " --disable-udev "
> +
> +
> +AUTO_PACKAGE_UTILS = "cryptsetup veritysetup"
> +AUTO_PACKAGE_UTILS_RDEPENDS += "${PN} libpopti libc"

This, together with the RDEPENDS_${PN} assignment below, introduces a
circular dependency.

> +
> +AUTO_PACKAGE_LIBS = "${PN}"
> +AUTO_PACKAGE_LIB_DEV_DEPENDS = "libuuid libdevmapper libgcrypt"
> +AUTO_PACKAGE_LIB_RDEPENDS = "libuuid libdevmapper libgcrypt libgpg-error libc"
> +
> +RDEPENDS_${PN} = "${AUTO_PACKAGE_UTILS_PACKAGES} ${LIBS_AUTO_RPACKAGES}"
> diff --git a/recipes/cryptsetup/cryptsetup_1.6.2.oe.sig b/recipes/cryptsetup/cryptsetup_1.6.2.oe.sig
> new file mode 100644
> index 0000000..bc6c74d
> --- /dev/null
> +++ b/recipes/cryptsetup/cryptsetup_1.6.2.oe.sig
> @@ -0,0 +1 @@
> +8d04c5c1a8cad4faf7418fc2124b31bba2d50a1e  cryptsetup-1.6.2.tar.bz2

I merged your commit, fixed/changed the udev use flag, removed the
circular dependency, and added two extra use flags
(cryptsetup_kernel_crypto and cryptsetup_selinux).  All 3 use flags are
default disabled.

Building with kernel_crypto enabled fails here, because of problems with
the kernel headers used.  Did you have problems with kernel_crypto?

/Esben

Patch

diff --git a/recipes/cryptsetup/cryptsetup_1.6.2.oe b/recipes/cryptsetup/cryptsetup_1.6.2.oe
new file mode 100644
index 0000000..dfc87c7
--- /dev/null
+++ b/recipes/cryptsetup/cryptsetup_1.6.2.oe
@@ -0,0 +1,26 @@ 
+SUMMARY = "cryptsetup is used to conveniently setup dm-crypt managed block devices under Linux"
+DESCRIPTION = "While LUKS is a standard on-disk format, there is also a reference implementation. LUKS for dm-crypt is implemented in an enhanced version of cryptsetup."
+HOMEPAGE="http://code.google.com/p/cryptsetup/"
+LICENSE="GPLv2"
+SRC_URI = "http://cryptsetup.googlecode.com/files/cryptsetup-1.6.2.tar.bz2"
+
+RECIPE_TYPES = "machine"
+
+inherit autotools pkgconfig auto-package-utils auto-package-libs
+
+DEPENDS += "libuuid libdevmapper popt libgcrypt"
+
+RECIPE_FLAGS += "cryptosetup_udev_disable"
+
+DEFAULT_cryptosetup_udev_disable = "0"
+EXTRA_OECONF:>USE_cryptosetup_udev_disable = " --disable-udev "
+
+
+AUTO_PACKAGE_UTILS = "cryptsetup veritysetup"
+AUTO_PACKAGE_UTILS_RDEPENDS += "${PN} libpopti libc"
+
+AUTO_PACKAGE_LIBS = "${PN}"
+AUTO_PACKAGE_LIB_DEV_DEPENDS = "libuuid libdevmapper libgcrypt"
+AUTO_PACKAGE_LIB_RDEPENDS = "libuuid libdevmapper libgcrypt libgpg-error libc"
+
+RDEPENDS_${PN} = "${AUTO_PACKAGE_UTILS_PACKAGES} ${LIBS_AUTO_RPACKAGES}"
diff --git a/recipes/cryptsetup/cryptsetup_1.6.2.oe.sig b/recipes/cryptsetup/cryptsetup_1.6.2.oe.sig
new file mode 100644
index 0000000..bc6c74d
--- /dev/null
+++ b/recipes/cryptsetup/cryptsetup_1.6.2.oe.sig
@@ -0,0 +1 @@ 
+8d04c5c1a8cad4faf7418fc2124b31bba2d50a1e  cryptsetup-1.6.2.tar.bz2