summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--sys-fs/btrfs/ChangeLog7
-rw-r--r--sys-fs/btrfs/btrfs-0.17.ebuild3
-rw-r--r--sys-fs/btrfs/btrfs-9999.ebuild12
3 files changed, 18 insertions, 4 deletions
diff --git a/sys-fs/btrfs/ChangeLog b/sys-fs/btrfs/ChangeLog
index 197d22ae15f8..0775e146619d 100644
--- a/sys-fs/btrfs/ChangeLog
+++ b/sys-fs/btrfs/ChangeLog
@@ -1,6 +1,11 @@
# ChangeLog for sys-fs/btrfs
# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/btrfs/ChangeLog,v 1.19 2009/04/17 15:16:51 lavajoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/btrfs/ChangeLog,v 1.20 2009/04/17 15:23:36 lavajoe Exp $
+
+ 17 Apr 2009; Joe Peterson <lavajoe@gentoo.org> btrfs-0.17.ebuild,
+ btrfs-9999.ebuild:
+ Add checks for CONFIG_ZLIB_INFLATE and CONFIG_ZLIB_DEFLATE to version
+ 9999; minor whitespace cleanup
*btrfs-0.17 (17 Apr 2009)
diff --git a/sys-fs/btrfs/btrfs-0.17.ebuild b/sys-fs/btrfs/btrfs-0.17.ebuild
index 5aa78f0ee857..1a10896493e2 100644
--- a/sys-fs/btrfs/btrfs-0.17.ebuild
+++ b/sys-fs/btrfs/btrfs-0.17.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2009 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/btrfs/btrfs-0.17.ebuild,v 1.1 2009/04/17 15:16:51 lavajoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/btrfs/btrfs-0.17.ebuild,v 1.2 2009/04/17 15:23:36 lavajoe Exp $
inherit eutils linux-mod
@@ -48,7 +48,6 @@ pkg_setup()
eerror "You need to enable ZLIB_DEFLATE in your kernel!"
die "You need to enable ZLIB_DEFLATE in your kernel!"
fi
-
}
pkg_postinst() {
diff --git a/sys-fs/btrfs/btrfs-9999.ebuild b/sys-fs/btrfs/btrfs-9999.ebuild
index be5ca855a13f..cde009a18da0 100644
--- a/sys-fs/btrfs/btrfs-9999.ebuild
+++ b/sys-fs/btrfs/btrfs-9999.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2009 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/btrfs/btrfs-9999.ebuild,v 1.8 2009/04/17 15:16:51 lavajoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/btrfs/btrfs-9999.ebuild,v 1.9 2009/04/17 15:23:36 lavajoe Exp $
inherit eutils linux-mod git
@@ -36,6 +36,16 @@ pkg_setup()
eerror "You need to enable LIBCRC32C in your kernel!"
die "You need to enable LIBCRC32C in your kernel!"
fi
+
+ if ! linux_chkconfig_present ZLIB_INFLATE; then
+ eerror "You need to enable ZLIB_INFLATE in your kernel!"
+ die "You need to enable ZLIB_INFLATE in your kernel!"
+ fi
+
+ if ! linux_chkconfig_present ZLIB_DEFLATE; then
+ eerror "You need to enable ZLIB_DEFLATE in your kernel!"
+ die "You need to enable ZLIB_DEFLATE in your kernel!"
+ fi
}
src_install()