summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Frysinger <vapier@gentoo.org>2011-01-08 00:52:21 +0000
committerMike Frysinger <vapier@gentoo.org>2011-01-08 00:52:21 +0000
commitea6e4a8192cd56039368896e7ce5dba0c6e69e34 (patch)
tree74ae8fa641b0398f232c8f44708b2d21171ad083 /sys-fs/cryptsetup
parentMarking ess-5.12 ppc for bug 348198 (diff)
downloadhistorical-ea6e4a8192cd56039368896e7ce5dba0c6e69e34.tar.gz
historical-ea6e4a8192cd56039368896e7ce5dba0c6e69e34.tar.bz2
historical-ea6e4a8192cd56039368896e7ce5dba0c6e69e34.zip
Improve tests a bit -- skip when dmcrypt is not available.
Diffstat (limited to 'sys-fs/cryptsetup')
-rw-r--r--sys-fs/cryptsetup/ChangeLog6
-rw-r--r--sys-fs/cryptsetup/cryptsetup-1.2.0-r1.ebuild11
2 files changed, 15 insertions, 2 deletions
diff --git a/sys-fs/cryptsetup/ChangeLog b/sys-fs/cryptsetup/ChangeLog
index 068b6a266691..152a82ff2031 100644
--- a/sys-fs/cryptsetup/ChangeLog
+++ b/sys-fs/cryptsetup/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for sys-fs/cryptsetup
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/cryptsetup/ChangeLog,v 1.103 2011/01/07 21:52:34 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/cryptsetup/ChangeLog,v 1.104 2011/01/08 00:52:21 vapier Exp $
+
+ 08 Jan 2011; Mike Frysinger <vapier@gentoo.org>
+ cryptsetup-1.2.0-r1.ebuild:
+ Improve tests a bit -- skip when dmcrypt is not available.
07 Jan 2011; Brent Baude <ranger@gentoo.org> cryptsetup-1.1.3-r1.ebuild:
stable ppc, bug 350044
diff --git a/sys-fs/cryptsetup/cryptsetup-1.2.0-r1.ebuild b/sys-fs/cryptsetup/cryptsetup-1.2.0-r1.ebuild
index dae059c00b97..289cfa7f4b5b 100644
--- a/sys-fs/cryptsetup/cryptsetup-1.2.0-r1.ebuild
+++ b/sys-fs/cryptsetup/cryptsetup-1.2.0-r1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/cryptsetup/cryptsetup-1.2.0-r1.ebuild,v 1.2 2011/01/04 20:14:46 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/cryptsetup/cryptsetup-1.2.0-r1.ebuild,v 1.3 2011/01/08 00:52:21 vapier Exp $
EAPI="2"
@@ -37,6 +37,7 @@ pkg_setup() {
src_prepare() {
sed -i '/enable_static_cryptsetup=yes/d' configure #350463
+ sed -i '/^LOOPDEV=/s:=.*:=`losetup -f` || exit 0:' tests/{compat,mode}-test
elibtoolize
}
@@ -50,6 +51,14 @@ src_configure() {
$(use_enable selinux)
}
+src_test() {
+ if [[ ! -e /dev/mapper/control ]] ; then
+ ewarn "No /dev/mapper/control found -- skipping tests"
+ return 0
+ fi
+ default
+}
+
src_install() {
emake DESTDIR="${D}" install || die
use static && { mv "${D}"/sbin/cryptsetup{.static,} || die ; }