diff options
author | Sebastian Pipping <sping@gentoo.org> | 2012-05-03 22:26:18 +0000 |
---|---|---|
committer | Sebastian Pipping <sping@gentoo.org> | 2012-05-03 22:26:18 +0000 |
commit | b5e6e1171764599e8f16cf79bffefb7162a0f6c4 (patch) | |
tree | f68de1ac12fb893d49a13bad446b1a6c8ca1c4d7 /sys-kernel/genkernel | |
parent | Removed virtualbox input driver as it's not longer in the tree (diff) | |
download | gentoo-2-b5e6e1171764599e8f16cf79bffefb7162a0f6c4.tar.gz gentoo-2-b5e6e1171764599e8f16cf79bffefb7162a0f6c4.tar.bz2 gentoo-2-b5e6e1171764599e8f16cf79bffefb7162a0f6c4.zip |
sys-kernel/genkernel: Migrate to cryptsetup use flag (bug #414523)
(Portage version: 2.1.10.56/cvs/Linux x86_64)
Diffstat (limited to 'sys-kernel/genkernel')
-rw-r--r-- | sys-kernel/genkernel/ChangeLog | 6 | ||||
-rw-r--r-- | sys-kernel/genkernel/genkernel-3.4.30.ebuild | 13 | ||||
-rw-r--r-- | sys-kernel/genkernel/genkernel-9999.ebuild | 13 | ||||
-rw-r--r-- | sys-kernel/genkernel/metadata.xml | 5 |
4 files changed, 29 insertions, 8 deletions
diff --git a/sys-kernel/genkernel/ChangeLog b/sys-kernel/genkernel/ChangeLog index c8594bff137d..e706973f8236 100644 --- a/sys-kernel/genkernel/ChangeLog +++ b/sys-kernel/genkernel/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for sys-kernel/genkernel # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-kernel/genkernel/ChangeLog,v 1.297 2012/04/16 02:19:02 sping Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-kernel/genkernel/ChangeLog,v 1.298 2012/05/03 22:26:18 sping Exp $ + + 03 May 2012; Sebastian Pipping <sping@gentoo.org> genkernel-3.4.30.ebuild, + genkernel-9999.ebuild, metadata.xml: + Migrate from use flag 'crypt' to 'cryptsetup' (bug #414523), sync live ebuild *genkernel-3.4.30 (16 Apr 2012) diff --git a/sys-kernel/genkernel/genkernel-3.4.30.ebuild b/sys-kernel/genkernel/genkernel-3.4.30.ebuild index 0f710f916fa9..7daea7b0b715 100644 --- a/sys-kernel/genkernel/genkernel-3.4.30.ebuild +++ b/sys-kernel/genkernel/genkernel-3.4.30.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-kernel/genkernel/genkernel-3.4.30.ebuild,v 1.1 2012/04/16 02:19:02 sping Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-kernel/genkernel/genkernel-3.4.30.ebuild,v 1.2 2012/05/03 22:26:18 sping Exp $ # genkernel-9999 -> latest Git branch "master" # genkernel-VERSION -> normal genkernel release @@ -58,12 +58,12 @@ HOMEPAGE="http://www.gentoo.org" LICENSE="GPL-2" SLOT="0" RESTRICT="" -IUSE="crypt ibm selinux" +IUSE="crypt cryptsetup ibm selinux" # Keep 'crypt' in to keep 'use crypt' below working! DEPEND="sys-fs/e2fsprogs selinux? ( sys-libs/libselinux )" RDEPEND="${DEPEND} - crypt? ( sys-fs/cryptsetup ) + cryptsetup? ( sys-fs/cryptsetup ) app-arch/cpio app-misc/pax-utils !<sys-apps/openrc-0.9.9" @@ -153,6 +153,13 @@ pkg_postinst() { ewarn "The LUKS support has changed from versions prior to 3.4.4. Now," ewarn "you use crypt_root=/dev/blah instead of real_root=luks:/dev/blah." echo + if use crypt && ! use cryptsetup ; then + ewarn "Local use flag 'crypt' has been renamed to 'cryptsetup' (bug #414523)." + ewarn "Please set flag 'cryptsetup' for this very package if you would like" + ewarn "to have genkernel create an initramfs with LUKS support." + ewarn "Sorry for the inconvenience." + echo + fi bash-completion_pkg_postinst } diff --git a/sys-kernel/genkernel/genkernel-9999.ebuild b/sys-kernel/genkernel/genkernel-9999.ebuild index ed4d974f0083..af788bd5323a 100644 --- a/sys-kernel/genkernel/genkernel-9999.ebuild +++ b/sys-kernel/genkernel/genkernel-9999.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-kernel/genkernel/genkernel-9999.ebuild,v 1.33 2012/03/22 15:38:48 sping Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-kernel/genkernel/genkernel-9999.ebuild,v 1.34 2012/05/03 22:26:18 sping Exp $ # genkernel-9999 -> latest Git branch "master" # genkernel-VERSION -> normal genkernel release @@ -58,12 +58,12 @@ HOMEPAGE="http://www.gentoo.org" LICENSE="GPL-2" SLOT="0" RESTRICT="" -IUSE="crypt ibm selinux" +IUSE="crypt cryptsetup ibm selinux" # Keep 'crypt' in to keep 'use crypt' below working! DEPEND="sys-fs/e2fsprogs selinux? ( sys-libs/libselinux )" RDEPEND="${DEPEND} - crypt? ( sys-fs/cryptsetup[static] ) + cryptsetup? ( sys-fs/cryptsetup ) app-arch/cpio app-misc/pax-utils !<sys-apps/openrc-0.9.9" @@ -153,6 +153,13 @@ pkg_postinst() { ewarn "The LUKS support has changed from versions prior to 3.4.4. Now," ewarn "you use crypt_root=/dev/blah instead of real_root=luks:/dev/blah." echo + if use crypt && ! use cryptsetup ; then + ewarn "Local use flag 'crypt' has been renamed to 'cryptsetup' (bug #414523)." + ewarn "Please set flag 'cryptsetup' for this very package if you would like" + ewarn "to have genkernel create an initramfs with LUKS support." + ewarn "Sorry for the inconvenience." + echo + fi bash-completion_pkg_postinst } diff --git a/sys-kernel/genkernel/metadata.xml b/sys-kernel/genkernel/metadata.xml index 2dff08258dc2..19c622da185a 100644 --- a/sys-kernel/genkernel/metadata.xml +++ b/sys-kernel/genkernel/metadata.xml @@ -3,6 +3,9 @@ <pkgmetadata> <maintainer> - <email>genkernel@gentoo.org</email> + <email>genkernel@gentoo.org</email> </maintainer> +<use> + <flag name='cryptsetup'>Enable support for Luks disk enrcyption using <pkg>sys-fs/cryptsetup</pkg></flag> +</use> </pkgmetadata> |