Gentoo Archives: gentoo-commits

From: Alexey Shvetsov <alexxy@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/sci:master commit in: sys-fs/zfs/, sys-devel/spl/, sys-fs/zfs/files/
Date: Sat, 30 Apr 2011 23:03:40
Message-Id: ec2a75d178451518dbc07a134e7e1ca1513f5fd9.alexxy@gentoo
1 commit: ec2a75d178451518dbc07a134e7e1ca1513f5fd9
2 Author: Alexey Shvetsov <alexxy <AT> gentoo <DOT> org>
3 AuthorDate: Sat Apr 30 23:02:43 2011 +0000
4 Commit: Alexey Shvetsov <alexxy <AT> gentoo <DOT> org>
5 CommitDate: Sat Apr 30 23:02:43 2011 +0000
6 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=ec2a75d1
7
8 More zfs updates
9
10 ---
11 sys-devel/spl/spl-0.6.0_rc3.ebuild | 2 --
12 sys-devel/spl/spl-9999.ebuild | 2 --
13 sys-fs/zfs/files/zfs.initd | 4 ++--
14 sys-fs/zfs/zfs-0.6.0_rc3.ebuild | 2 --
15 sys-fs/zfs/zfs-9999.ebuild | 2 --
16 5 files changed, 2 insertions(+), 10 deletions(-)
17
18 diff --git a/sys-devel/spl/spl-0.6.0_rc3.ebuild b/sys-devel/spl/spl-0.6.0_rc3.ebuild
19 index e680822..4970482 100644
20 --- a/sys-devel/spl/spl-0.6.0_rc3.ebuild
21 +++ b/sys-devel/spl/spl-0.6.0_rc3.ebuild
22 @@ -32,8 +32,6 @@ src_prepare() {
23 src_configure() {
24 set_arch_to_kernel
25 econf \
26 - --prefix="${EPREFIX}" \
27 - --includedir="${EPREFIX}"/usr/include \
28 --with-config=all \
29 --with-linux="${KERNEL_DIR}" \
30 --with-linux-obj="${KERNEL_DIR}"
31
32 diff --git a/sys-devel/spl/spl-9999.ebuild b/sys-devel/spl/spl-9999.ebuild
33 index c687962..2bf68c0 100644
34 --- a/sys-devel/spl/spl-9999.ebuild
35 +++ b/sys-devel/spl/spl-9999.ebuild
36 @@ -31,8 +31,6 @@ src_prepare() {
37 src_configure() {
38 set_arch_to_kernel
39 econf \
40 - --prefix="${EPREFIX}" \
41 - --includedir="${EPREFIX}"/usr/include \
42 --with-config=all \
43 --with-linux="${KERNEL_DIR}" \
44 --with-linux-obj="${KERNEL_DIR}"
45
46 diff --git a/sys-fs/zfs/files/zfs.initd b/sys-fs/zfs/files/zfs.initd
47 index d8ec4ea..878c054 100644
48 --- a/sys-fs/zfs/files/zfs.initd
49 +++ b/sys-fs/zfs/files/zfs.initd
50 @@ -9,8 +9,8 @@ depend() {
51 }
52
53 CACHEFILE=/etc/zfs/zpool.cache
54 -ZPOOL=/sbin/zpool
55 -ZFS=/sbin/zfs
56 +ZPOOL=/usr/sbin/zpool
57 +ZFS=/usr/sbin/zfs
58 ZFS_MODULE=zfs
59 LOCKFILE=/var/lock/zfs/zfs_lockfile
60
61
62 diff --git a/sys-fs/zfs/zfs-0.6.0_rc3.ebuild b/sys-fs/zfs/zfs-0.6.0_rc3.ebuild
63 index 1f1078d..ffbd90a 100644
64 --- a/sys-fs/zfs/zfs-0.6.0_rc3.ebuild
65 +++ b/sys-fs/zfs/zfs-0.6.0_rc3.ebuild
66 @@ -35,8 +35,6 @@ src_prepare() {
67 src_configure() {
68 set_arch_to_kernel
69 econf \
70 - --prefix="${EPREFIX}" \
71 - --includedir="${EPREFIX}"/usr/include \
72 --with-config=all \
73 --with-linux="${KERNEL_DIR}" \
74 --with-linux-obj="${KERNEL_DIR}" \
75
76 diff --git a/sys-fs/zfs/zfs-9999.ebuild b/sys-fs/zfs/zfs-9999.ebuild
77 index d7ee31a..bb45a87 100644
78 --- a/sys-fs/zfs/zfs-9999.ebuild
79 +++ b/sys-fs/zfs/zfs-9999.ebuild
80 @@ -36,8 +36,6 @@ src_prepare() {
81 src_configure() {
82 set_arch_to_kernel
83 econf \
84 - --prefix="${EPREFIX}" \
85 - --includedir="${EPREFIX}"/usr/include \
86 --with-config=all \
87 --with-linux="${KERNEL_DIR}" \
88 --with-linux-obj="${KERNEL_DIR}" \