| 1 |
commit: 1e371cdd8cf7e43c531834be505e255d941328df |
| 2 |
Author: Alexey Shvetsov <alexxy <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Mon May 2 15:51:11 2011 +0000 |
| 4 |
Commit: Alexey Shvetsov <alexxy <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Mon May 2 15:51:11 2011 +0000 |
| 6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=1e371cdd |
| 7 |
|
| 8 |
Small fixes for zfs |
| 9 |
|
| 10 |
(Portage version: 2.2.0_alpha30/git/Linux x86_64, signed Manifest commit with key F82F92E6) |
| 11 |
|
| 12 |
--- |
| 13 |
sys-fs/zfs/zfs-0.6.0_rc3.ebuild | 15 ++++++++++++++- |
| 14 |
sys-fs/zfs/zfs-9999.ebuild | 17 +++++++++++++++-- |
| 15 |
2 files changed, 29 insertions(+), 3 deletions(-) |
| 16 |
|
| 17 |
diff --git a/sys-fs/zfs/zfs-0.6.0_rc3.ebuild b/sys-fs/zfs/zfs-0.6.0_rc3.ebuild |
| 18 |
index ffbd90a..a7316c7 100644 |
| 19 |
--- a/sys-fs/zfs/zfs-0.6.0_rc3.ebuild |
| 20 |
+++ b/sys-fs/zfs/zfs-0.6.0_rc3.ebuild |
| 21 |
@@ -19,7 +19,7 @@ IUSE="" |
| 22 |
|
| 23 |
DEPEND=" |
| 24 |
>=sys-devel/spl-${PV} |
| 25 |
- >=virtual/linux-sources-2.6.32 |
| 26 |
+ >=virtual/linux-sources-2.6 |
| 27 |
" |
| 28 |
RDEPEND=" |
| 29 |
!sys-fs/zfs-fuse |
| 30 |
@@ -27,6 +27,17 @@ RDEPEND=" |
| 31 |
|
| 32 |
S="${WORKDIR}/${P/_/-}" |
| 33 |
|
| 34 |
+pkg_setup() { |
| 35 |
+ linux-mod_pkg_setup |
| 36 |
+ kernel_is gt 2 6 32 || die "Your kernel is too old. ${CATEGORY}/${PN} need 2.6.32 or newer." |
| 37 |
+ linux_config_exists || die "Your kernel sources are unconfigured." |
| 38 |
+ if linux_chkconfig_present PREEMPT; then |
| 39 |
+ eerror "${CATEGORY}/${PN} doesn't currently work with PREEMPT kernel." |
| 40 |
+ eerror "Please look at bug https://github.com/behlendorf/zfs/issues/83" |
| 41 |
+ die "PREEMPT kernel" |
| 42 |
+ fi |
| 43 |
+} |
| 44 |
+ |
| 45 |
src_prepare() { |
| 46 |
epatch "${FILESDIR}/${PN}-0.6.0-includedir.patch" |
| 47 |
eautoreconf |
| 48 |
@@ -51,4 +62,6 @@ src_install() { |
| 49 |
emake DESTDIR="${D}" install || die 'emake install failed' |
| 50 |
newinitd "${FILESDIR}/zfs.initd" zfs |
| 51 |
keepdir /var/lock/zfs |
| 52 |
+ # Drop unwanted files |
| 53 |
+ rm -rf "${D}/usr/src" || die "removing unwanted files die" |
| 54 |
} |
| 55 |
|
| 56 |
diff --git a/sys-fs/zfs/zfs-9999.ebuild b/sys-fs/zfs/zfs-9999.ebuild |
| 57 |
index bb45a87..5625db6 100644 |
| 58 |
--- a/sys-fs/zfs/zfs-9999.ebuild |
| 59 |
+++ b/sys-fs/zfs/zfs-9999.ebuild |
| 60 |
@@ -9,7 +9,7 @@ AT_M4DIR=./config # for aclocal called by eautoreconf |
| 61 |
|
| 62 |
EGIT_REPO_URI="http://github.com/behlendorf/zfs.git" |
| 63 |
|
| 64 |
-inherit git eutils autotools linux-mod |
| 65 |
+inherit autotools eutils git linux-mod |
| 66 |
|
| 67 |
DESCRIPTION="Native ZFS for Linux" |
| 68 |
HOMEPAGE="http://wiki.github.com/behlendorf/zfs/" |
| 69 |
@@ -22,12 +22,23 @@ IUSE="" |
| 70 |
|
| 71 |
DEPEND=" |
| 72 |
>=sys-devel/spl-${PV} |
| 73 |
- >=virtual/linux-sources-2.6.32 |
| 74 |
+ >=virtual/linux-sources-2.6 |
| 75 |
" |
| 76 |
RDEPEND=" |
| 77 |
!sys-fs/zfs-fuse |
| 78 |
" |
| 79 |
|
| 80 |
+pkg_setup() { |
| 81 |
+ linux-mod_pkg_setup |
| 82 |
+ kernel_is gt 2 6 32 || die "Your kernel is too old. ${CATEGORY}/${PN} need 2.6.32 or newer." |
| 83 |
+ linux_config_exists || die "Your kernel sources are unconfigured." |
| 84 |
+ if linux_chkconfig_present PREEMPT; then |
| 85 |
+ eerror "${CATEGORY}/${PN} doesn't currently work with PREEMPT kernel." |
| 86 |
+ eerror "Please look at bug https://github.com/behlendorf/zfs/issues/83" |
| 87 |
+ die "PREEMPT kernel" |
| 88 |
+ fi |
| 89 |
+} |
| 90 |
+ |
| 91 |
src_prepare() { |
| 92 |
epatch "${FILESDIR}"/${PN}-0.6.0-includedir.patch |
| 93 |
eautoreconf |
| 94 |
@@ -52,4 +63,6 @@ src_install() { |
| 95 |
emake DESTDIR="${D}" install || die 'emake install failed' |
| 96 |
newinitd "${FILESDIR}/zfs.initd" zfs |
| 97 |
keepdir /var/lock/zfs |
| 98 |
+ # Drop unwanted files |
| 99 |
+ rm -rf "${D}/usr/src" || die "removing unwanted files die" |
| 100 |
} |
Archives