summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRichard Yao <ryao@gentoo.org>2012-08-22 07:50:06 +0000
committerRichard Yao <ryao@gentoo.org>2012-08-22 07:50:06 +0000
commitc96a538f5a59e23bdd71a24aaf3340cab378d1d9 (patch)
treef32771d49856336cf778e5b8ec594e3e9593216f /sys-fs/zfs-kmod
parentppc stable (bug 418803) (diff)
downloadgentoo-2-c96a538f5a59e23bdd71a24aaf3340cab378d1d9.tar.gz
gentoo-2-c96a538f5a59e23bdd71a24aaf3340cab378d1d9.tar.bz2
gentoo-2-c96a538f5a59e23bdd71a24aaf3340cab378d1d9.zip
Remove obsolete code from src_prepare() and src_test()
(Portage version: 2.1.11.9/cvs/Linux x86_64)
Diffstat (limited to 'sys-fs/zfs-kmod')
-rw-r--r--sys-fs/zfs-kmod/ChangeLog6
-rw-r--r--sys-fs/zfs-kmod/zfs-kmod-0.6.0_rc10.ebuild17
-rw-r--r--sys-fs/zfs-kmod/zfs-kmod-9999.ebuild17
3 files changed, 7 insertions, 33 deletions
diff --git a/sys-fs/zfs-kmod/ChangeLog b/sys-fs/zfs-kmod/ChangeLog
index bb509af30adc..f7686c557d38 100644
--- a/sys-fs/zfs-kmod/ChangeLog
+++ b/sys-fs/zfs-kmod/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for sys-fs/zfs-kmod
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/zfs-kmod/ChangeLog,v 1.1 2012/08/22 07:28:13 ryao Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/zfs-kmod/ChangeLog,v 1.2 2012/08/22 07:50:06 ryao Exp $
+
+ 22 Aug 2012; Richard Yao <ryao@gentoo.org> zfs-kmod-0.6.0_rc10.ebuild,
+ zfs-kmod-9999.ebuild:
+ Remove obsolete code from src_prepare() and src_test()
*zfs-kmod-9999 (22 Aug 2012)
*zfs-kmod-0.6.0_rc10 (22 Aug 2012)
diff --git a/sys-fs/zfs-kmod/zfs-kmod-0.6.0_rc10.ebuild b/sys-fs/zfs-kmod/zfs-kmod-0.6.0_rc10.ebuild
index 86fe86a9f00f..9062afb8517e 100644
--- a/sys-fs/zfs-kmod/zfs-kmod-0.6.0_rc10.ebuild
+++ b/sys-fs/zfs-kmod/zfs-kmod-0.6.0_rc10.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-fs/zfs-kmod/zfs-kmod-0.6.0_rc10.ebuild,v 1.1 2012/08/22 07:28:13 ryao Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/zfs-kmod/zfs-kmod-0.6.0_rc10.ebuild,v 1.2 2012/08/22 07:50:06 ryao Exp $
EAPI="4"
@@ -54,11 +54,6 @@ pkg_setup() {
}
src_prepare() {
- # Workaround for hard coded path
- sed -i "s|/sbin/lsmod|/bin/lsmod|" scripts/common.sh.in || die
- # Workaround rename
- sed -i "s|/usr/bin/scsi-rescan|/usr/sbin/rescan-scsi-bus|" scripts/common.sh.in || die
-
if [ ${PV} != "9999" ]
then
# Fix various deadlocks
@@ -84,16 +79,6 @@ src_configure() {
autotools-utils_src_configure
}
-src_test() {
- if [ $UID -ne 0 ]
- then
- ewarn "Cannot run make check tests with FEATURES=userpriv."
- ewarn "Skipping make check tests."
- else
- autotools-utils_src_test
- fi
-}
-
src_install() {
autotools-utils_src_install
}
diff --git a/sys-fs/zfs-kmod/zfs-kmod-9999.ebuild b/sys-fs/zfs-kmod/zfs-kmod-9999.ebuild
index 9dcbb1226606..0c3ed45d3947 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-2012 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.1 2012/08/22 07:28:13 ryao Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/zfs-kmod/zfs-kmod-9999.ebuild,v 1.2 2012/08/22 07:50:06 ryao Exp $
EAPI="4"
@@ -54,11 +54,6 @@ pkg_setup() {
}
src_prepare() {
- # Workaround for hard coded path
- sed -i "s|/sbin/lsmod|/bin/lsmod|" scripts/common.sh.in || die
- # Workaround rename
- sed -i "s|/usr/bin/scsi-rescan|/usr/sbin/rescan-scsi-bus|" scripts/common.sh.in || die
-
if [ ${PV} != "9999" ]
then
# Fix various deadlocks
@@ -84,16 +79,6 @@ src_configure() {
autotools-utils_src_configure
}
-src_test() {
- if [ $UID -ne 0 ]
- then
- ewarn "Cannot run make check tests with FEATURES=userpriv."
- ewarn "Skipping make check tests."
- else
- autotools-utils_src_test
- fi
-}
-
src_install() {
autotools-utils_src_install
}