Gentoo Archives: gentoo-commits

From: "Richard Yao (ryao)" <ryao@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in sys-fs/zfs-kmod: zfs-kmod-9999.ebuild zfs-kmod-0.6.0_rc10.ebuild ChangeLog
Date: Wed, 22 Aug 2012 07:50:19
Message-Id: 20120822075006.42A4E20305@flycatcher.gentoo.org
1 ryao 12/08/22 07:50:06
2
3 Modified: zfs-kmod-9999.ebuild zfs-kmod-0.6.0_rc10.ebuild
4 ChangeLog
5 Log:
6 Remove obsolete code from src_prepare() and src_test()
7
8 (Portage version: 2.1.11.9/cvs/Linux x86_64)
9
10 Revision Changes Path
11 1.2 sys-fs/zfs-kmod/zfs-kmod-9999.ebuild
12
13 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/zfs-kmod/zfs-kmod-9999.ebuild?rev=1.2&view=markup
14 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/zfs-kmod/zfs-kmod-9999.ebuild?rev=1.2&content-type=text/plain
15 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/zfs-kmod/zfs-kmod-9999.ebuild?r1=1.1&r2=1.2
16
17 Index: zfs-kmod-9999.ebuild
18 ===================================================================
19 RCS file: /var/cvsroot/gentoo-x86/sys-fs/zfs-kmod/zfs-kmod-9999.ebuild,v
20 retrieving revision 1.1
21 retrieving revision 1.2
22 diff -u -r1.1 -r1.2
23 --- zfs-kmod-9999.ebuild 22 Aug 2012 07:28:13 -0000 1.1
24 +++ zfs-kmod-9999.ebuild 22 Aug 2012 07:50:06 -0000 1.2
25 @@ -1,6 +1,6 @@
26 # Copyright 1999-2012 Gentoo Foundation
27 # Distributed under the terms of the GNU General Public License v2
28 -# $Header: /var/cvsroot/gentoo-x86/sys-fs/zfs-kmod/zfs-kmod-9999.ebuild,v 1.1 2012/08/22 07:28:13 ryao Exp $
29 +# $Header: /var/cvsroot/gentoo-x86/sys-fs/zfs-kmod/zfs-kmod-9999.ebuild,v 1.2 2012/08/22 07:50:06 ryao Exp $
30
31 EAPI="4"
32
33 @@ -54,11 +54,6 @@
34 }
35
36 src_prepare() {
37 - # Workaround for hard coded path
38 - sed -i "s|/sbin/lsmod|/bin/lsmod|" scripts/common.sh.in || die
39 - # Workaround rename
40 - sed -i "s|/usr/bin/scsi-rescan|/usr/sbin/rescan-scsi-bus|" scripts/common.sh.in || die
41 -
42 if [ ${PV} != "9999" ]
43 then
44 # Fix various deadlocks
45 @@ -84,16 +79,6 @@
46 autotools-utils_src_configure
47 }
48
49 -src_test() {
50 - if [ $UID -ne 0 ]
51 - then
52 - ewarn "Cannot run make check tests with FEATURES=userpriv."
53 - ewarn "Skipping make check tests."
54 - else
55 - autotools-utils_src_test
56 - fi
57 -}
58 -
59 src_install() {
60 autotools-utils_src_install
61 }
62
63
64
65 1.2 sys-fs/zfs-kmod/zfs-kmod-0.6.0_rc10.ebuild
66
67 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/zfs-kmod/zfs-kmod-0.6.0_rc10.ebuild?rev=1.2&view=markup
68 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/zfs-kmod/zfs-kmod-0.6.0_rc10.ebuild?rev=1.2&content-type=text/plain
69 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/zfs-kmod/zfs-kmod-0.6.0_rc10.ebuild?r1=1.1&r2=1.2
70
71 Index: zfs-kmod-0.6.0_rc10.ebuild
72 ===================================================================
73 RCS file: /var/cvsroot/gentoo-x86/sys-fs/zfs-kmod/zfs-kmod-0.6.0_rc10.ebuild,v
74 retrieving revision 1.1
75 retrieving revision 1.2
76 diff -u -r1.1 -r1.2
77 --- zfs-kmod-0.6.0_rc10.ebuild 22 Aug 2012 07:28:13 -0000 1.1
78 +++ zfs-kmod-0.6.0_rc10.ebuild 22 Aug 2012 07:50:06 -0000 1.2
79 @@ -1,6 +1,6 @@
80 # Copyright 1999-2012 Gentoo Foundation
81 # Distributed under the terms of the GNU General Public License v2
82 -# $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 $
83 +# $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 $
84
85 EAPI="4"
86
87 @@ -54,11 +54,6 @@
88 }
89
90 src_prepare() {
91 - # Workaround for hard coded path
92 - sed -i "s|/sbin/lsmod|/bin/lsmod|" scripts/common.sh.in || die
93 - # Workaround rename
94 - sed -i "s|/usr/bin/scsi-rescan|/usr/sbin/rescan-scsi-bus|" scripts/common.sh.in || die
95 -
96 if [ ${PV} != "9999" ]
97 then
98 # Fix various deadlocks
99 @@ -84,16 +79,6 @@
100 autotools-utils_src_configure
101 }
102
103 -src_test() {
104 - if [ $UID -ne 0 ]
105 - then
106 - ewarn "Cannot run make check tests with FEATURES=userpriv."
107 - ewarn "Skipping make check tests."
108 - else
109 - autotools-utils_src_test
110 - fi
111 -}
112 -
113 src_install() {
114 autotools-utils_src_install
115 }
116
117
118
119 1.2 sys-fs/zfs-kmod/ChangeLog
120
121 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/zfs-kmod/ChangeLog?rev=1.2&view=markup
122 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/zfs-kmod/ChangeLog?rev=1.2&content-type=text/plain
123 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/zfs-kmod/ChangeLog?r1=1.1&r2=1.2
124
125 Index: ChangeLog
126 ===================================================================
127 RCS file: /var/cvsroot/gentoo-x86/sys-fs/zfs-kmod/ChangeLog,v
128 retrieving revision 1.1
129 retrieving revision 1.2
130 diff -u -r1.1 -r1.2
131 --- ChangeLog 22 Aug 2012 07:28:13 -0000 1.1
132 +++ ChangeLog 22 Aug 2012 07:50:06 -0000 1.2
133 @@ -1,6 +1,10 @@
134 # ChangeLog for sys-fs/zfs-kmod
135 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
136 -# $Header: /var/cvsroot/gentoo-x86/sys-fs/zfs-kmod/ChangeLog,v 1.1 2012/08/22 07:28:13 ryao Exp $
137 +# $Header: /var/cvsroot/gentoo-x86/sys-fs/zfs-kmod/ChangeLog,v 1.2 2012/08/22 07:50:06 ryao Exp $
138 +
139 + 22 Aug 2012; Richard Yao <ryao@g.o> zfs-kmod-0.6.0_rc10.ebuild,
140 + zfs-kmod-9999.ebuild:
141 + Remove obsolete code from src_prepare() and src_test()
142
143 *zfs-kmod-9999 (22 Aug 2012)
144 *zfs-kmod-0.6.0_rc10 (22 Aug 2012)