summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRichard Yao <ryao@gentoo.org>2013-03-24 00:02:31 +0000
committerRichard Yao <ryao@gentoo.org>2013-03-24 00:02:31 +0000
commitee0be76f8434cecb7797f554b30eecdf0c1a504f (patch)
treec73f17c23235911caec0eec184c2a9fcf82adea2
parentEnable zfs_arc_memory_throttle_disable by default (diff)
downloadgentoo-2-ee0be76f8434cecb7797f554b30eecdf0c1a504f.tar.gz
gentoo-2-ee0be76f8434cecb7797f554b30eecdf0c1a504f.tar.bz2
gentoo-2-ee0be76f8434cecb7797f554b30eecdf0c1a504f.zip
Change how we generate the /usr/src/zfs used by lustre to work on the 9999 ebuild.
(Portage version: 2.2.0_alpha169/cvs/Linux x86_64, signed Manifest commit with key 0xBEE84C64)
-rw-r--r--sys-fs/zfs-kmod/ChangeLog7
-rw-r--r--sys-fs/zfs-kmod/zfs-kmod-0.6.0_rc14-r5.ebuild4
-rw-r--r--sys-fs/zfs-kmod/zfs-kmod-9999.ebuild4
3 files changed, 10 insertions, 5 deletions
diff --git a/sys-fs/zfs-kmod/ChangeLog b/sys-fs/zfs-kmod/ChangeLog
index 2dd1d1570c05..73a9b96605b0 100644
--- a/sys-fs/zfs-kmod/ChangeLog
+++ b/sys-fs/zfs-kmod/ChangeLog
@@ -1,6 +1,11 @@
# ChangeLog for sys-fs/zfs-kmod
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/zfs-kmod/ChangeLog,v 1.24 2013/03/23 23:50:17 ryao Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/zfs-kmod/ChangeLog,v 1.25 2013/03/24 00:02:31 ryao Exp $
+
+ 24 Mar 2013; Richard Yao <ryao@gentoo.org> zfs-kmod-0.6.0_rc14-r5.ebuild,
+ zfs-kmod-9999.ebuild:
+ Change how we generate the /usr/src/zfs used by lustre to work on the 9999
+ ebuild.
*zfs-kmod-0.6.0_rc14-r5 (23 Mar 2013)
diff --git a/sys-fs/zfs-kmod/zfs-kmod-0.6.0_rc14-r5.ebuild b/sys-fs/zfs-kmod/zfs-kmod-0.6.0_rc14-r5.ebuild
index 5b0e51c9e09a..5fd4e4eab8e6 100644
--- a/sys-fs/zfs-kmod/zfs-kmod-0.6.0_rc14-r5.ebuild
+++ b/sys-fs/zfs-kmod/zfs-kmod-0.6.0_rc14-r5.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/zfs-kmod/zfs-kmod-0.6.0_rc14-r5.ebuild,v 1.1 2013/03/23 23:50:17 ryao Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/zfs-kmod/zfs-kmod-0.6.0_rc14-r5.ebuild,v 1.2 2013/03/24 00:02:31 ryao Exp $
EAPI="4"
@@ -115,7 +115,7 @@ src_install() {
dodoc AUTHORS COPYRIGHT DISCLAIMER README.markdown
# Provide /usr/src/zfs symlink for lustre
- dosym "zfs-${MY_PV}/${KV_FULL}" /usr/src/zfs
+ dosym "$(basename $(echo "${ED}/usr/src/zfs-"*))/${KV_FULL}" /usr/src/zfs
}
pkg_postinst() {
diff --git a/sys-fs/zfs-kmod/zfs-kmod-9999.ebuild b/sys-fs/zfs-kmod/zfs-kmod-9999.ebuild
index ab594eb7d701..b9fb690f4b20 100644
--- a/sys-fs/zfs-kmod/zfs-kmod-9999.ebuild
+++ b/sys-fs/zfs-kmod/zfs-kmod-9999.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/zfs-kmod/zfs-kmod-9999.ebuild,v 1.12 2013/03/16 18:06:07 ryao Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/zfs-kmod/zfs-kmod-9999.ebuild,v 1.13 2013/03/24 00:02:31 ryao Exp $
EAPI="4"
@@ -112,7 +112,7 @@ src_install() {
dodoc AUTHORS COPYRIGHT DISCLAIMER README.markdown
# Provide /usr/src/zfs symlink for lustre
- dosym "zfs-${MY_PV}/${KV_FULL}" /usr/src/zfs
+ dosym "$(basename $(echo "${ED}/usr/src/zfs-"*))/${KV_FULL}" /usr/src/zfs
}
pkg_postinst() {