1 |
ryao 13/10/05 22:08:10 |
2 |
|
3 |
Modified: ChangeLog |
4 |
Added: zfs-0.6.2-r1.ebuild |
5 |
Log: |
6 |
Use libblkid to improve drive detection; Update drive database with additional entries |
7 |
|
8 |
(Portage version: 2.2.7/cvs/Linux x86_64, signed Manifest commit with key 0xBEE84C64) |
9 |
|
10 |
Revision Changes Path |
11 |
1.72 sys-fs/zfs/ChangeLog |
12 |
|
13 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/zfs/ChangeLog?rev=1.72&view=markup |
14 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/zfs/ChangeLog?rev=1.72&content-type=text/plain |
15 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/zfs/ChangeLog?r1=1.71&r2=1.72 |
16 |
|
17 |
Index: ChangeLog |
18 |
=================================================================== |
19 |
RCS file: /var/cvsroot/gentoo-x86/sys-fs/zfs/ChangeLog,v |
20 |
retrieving revision 1.71 |
21 |
retrieving revision 1.72 |
22 |
diff -u -r1.71 -r1.72 |
23 |
--- ChangeLog 5 Sep 2013 19:44:53 -0000 1.71 |
24 |
+++ ChangeLog 5 Oct 2013 22:08:09 -0000 1.72 |
25 |
@@ -1,6 +1,12 @@ |
26 |
# ChangeLog for sys-fs/zfs |
27 |
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 |
28 |
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/zfs/ChangeLog,v 1.71 2013/09/05 19:44:53 mgorny Exp $ |
29 |
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/zfs/ChangeLog,v 1.72 2013/10/05 22:08:09 ryao Exp $ |
30 |
+ |
31 |
+*zfs-0.6.2-r1 (05 Oct 2013) |
32 |
+ |
33 |
+ 05 Oct 2013; Richard Yao <ryao@g.o> +zfs-0.6.2-r1.ebuild: |
34 |
+ Use libblkid to improve drive detection; Update drive database with additional |
35 |
+ entries |
36 |
|
37 |
05 Sep 2013; Michał Górny <mgorny@g.o> zfs-0.6.2.ebuild, |
38 |
zfs-9999.ebuild: |
39 |
|
40 |
|
41 |
|
42 |
1.1 sys-fs/zfs/zfs-0.6.2-r1.ebuild |
43 |
|
44 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/zfs/zfs-0.6.2-r1.ebuild?rev=1.1&view=markup |
45 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/zfs/zfs-0.6.2-r1.ebuild?rev=1.1&content-type=text/plain |
46 |
|
47 |
Index: zfs-0.6.2-r1.ebuild |
48 |
=================================================================== |
49 |
# Copyright 1999-2013 Gentoo Foundation |
50 |
# Distributed under the terms of the GNU General Public License v2 |
51 |
# $Header: /var/cvsroot/gentoo-x86/sys-fs/zfs/zfs-0.6.2-r1.ebuild,v 1.1 2013/10/05 22:08:09 ryao Exp $ |
52 |
|
53 |
EAPI="5" |
54 |
PYTHON_COMPAT=( python{2_5,2_6,2_7} ) |
55 |
|
56 |
inherit python-single-r1 |
57 |
|
58 |
AT_M4DIR="config" |
59 |
AUTOTOOLS_AUTORECONF="1" |
60 |
AUTOTOOLS_IN_SOURCE_BUILD="1" |
61 |
|
62 |
if [ ${PV} == "9999" ] ; then |
63 |
inherit git-2 linux-mod |
64 |
EGIT_REPO_URI="git://github.com/zfsonlinux/${PN}.git" |
65 |
else |
66 |
inherit eutils versionator |
67 |
MY_PV=$(replace_version_separator 3 '-') |
68 |
SRC_URI="https://github.com/zfsonlinux/${PN}/archive/${PN}-${MY_PV}.tar.gz |
69 |
http://dev.gentoo.org/~ryao/dist/${PN}-kmod-${MY_PV}-p0.tar.xz" |
70 |
S="${WORKDIR}/${PN}-${PN}-${MY_PV}" |
71 |
KEYWORDS="~amd64" |
72 |
fi |
73 |
|
74 |
inherit bash-completion-r1 flag-o-matic toolchain-funcs autotools-utils udev systemd |
75 |
|
76 |
DESCRIPTION="Userland utilities for ZFS Linux kernel module" |
77 |
HOMEPAGE="http://zfsonlinux.org/" |
78 |
|
79 |
LICENSE="BSD-2 CDDL MIT" |
80 |
SLOT="0" |
81 |
IUSE="bash-completion custom-cflags kernel-builtin +rootfs selinux test-suite static-libs" |
82 |
RESTRICT="test" |
83 |
|
84 |
COMMON_DEPEND=" |
85 |
selinux? ( sys-libs/libselinux ) |
86 |
sys-apps/util-linux[static-libs?] |
87 |
sys-libs/zlib[static-libs(+)?] |
88 |
virtual/awk |
89 |
" |
90 |
DEPEND="${COMMON_DEPEND} |
91 |
virtual/pkgconfig |
92 |
" |
93 |
|
94 |
RDEPEND="${COMMON_DEPEND} |
95 |
!=sys-apps/grep-2.13* |
96 |
!kernel-builtin? ( =sys-fs/zfs-kmod-${PV}* ) |
97 |
!sys-fs/zfs-fuse |
98 |
!prefix? ( virtual/udev ) |
99 |
test-suite? ( |
100 |
sys-apps/util-linux |
101 |
sys-devel/bc |
102 |
sys-block/parted |
103 |
sys-fs/lsscsi |
104 |
sys-fs/mdadm |
105 |
sys-process/procps |
106 |
virtual/modutils |
107 |
) |
108 |
rootfs? ( |
109 |
app-arch/cpio |
110 |
app-misc/pax-utils |
111 |
!<sys-boot/grub-2.00-r2:2 |
112 |
) |
113 |
" |
114 |
|
115 |
pkg_setup() { |
116 |
: |
117 |
} |
118 |
|
119 |
src_prepare() { |
120 |
if [ ${PV} != "9999" ] |
121 |
then |
122 |
# Apply patch set |
123 |
EPATCH_SUFFIX="patch" \ |
124 |
EPATCH_FORCE="yes" \ |
125 |
epatch "${WORKDIR}/${PN}-kmod-${MY_PV}-patches" |
126 |
fi |
127 |
|
128 |
# Update paths |
129 |
sed -e "s|/sbin/lsmod|/bin/lsmod|" \ |
130 |
-e "s|/usr/bin/scsi-rescan|/usr/sbin/rescan-scsi-bus|" \ |
131 |
-e "s|/sbin/parted|/usr/sbin/parted|" \ |
132 |
-i scripts/common.sh.in |
133 |
|
134 |
autotools-utils_src_prepare |
135 |
} |
136 |
|
137 |
src_configure() { |
138 |
use custom-cflags || strip-flags |
139 |
local myeconfargs=( |
140 |
--bindir="${EPREFIX}/bin" |
141 |
--sbindir="${EPREFIX}/sbin" |
142 |
--with-config=user |
143 |
--with-linux="${KV_DIR}" |
144 |
--with-linux-obj="${KV_OUT_DIR}" |
145 |
--with-udevdir="$(udev_get_udevdir)" |
146 |
--with-blkid |
147 |
$(use_with selinux) |
148 |
) |
149 |
autotools-utils_src_configure |
150 |
|
151 |
# prepare systemd unit and helper script |
152 |
cat "${FILESDIR}/zfs.service.in" | \ |
153 |
sed -e "s:@sbindir@:${EPREFIX}/sbin:g" \ |
154 |
-e "s:@sysconfdir@:${EPREFIX}/etc:g" \ |
155 |
> "${T}/zfs.service" || die |
156 |
cat "${FILESDIR}/zfs-init.sh.in" | \ |
157 |
sed -e "s:@sbindir@:${EPREFIX}/sbin:g" \ |
158 |
-e "s:@sysconfdir@:${EPREFIX}/etc:g" \ |
159 |
> "${T}/zfs-init.sh" || die |
160 |
} |
161 |
|
162 |
src_install() { |
163 |
autotools-utils_src_install |
164 |
gen_usr_ldscript -a uutil nvpair zpool zfs |
165 |
rm -rf "${ED}usr/lib/dracut" |
166 |
use test-suite || rm -rf "${ED}usr/share/zfs" |
167 |
|
168 |
use bash-completion && newbashcomp "${FILESDIR}/bash-completion" zfs |
169 |
|
170 |
exeinto /usr/libexec |
171 |
doexe "${T}/zfs-init.sh" |
172 |
systemd_dounit "${T}/zfs.service" |
173 |
} |
174 |
|
175 |
pkg_postinst() { |
176 |
|
177 |
if ! use kernel-builtin && [ ${PV} = "9999" ] |
178 |
then |
179 |
einfo "Adding ${P} to the module database to ensure that the" |
180 |
einfo "kernel modules and userland utilities stay in sync." |
181 |
update_moduledb |
182 |
fi |
183 |
|
184 |
[ -e "${EROOT}/etc/runlevels/boot/zfs" ] \ |
185 |
|| ewarn 'You should add zfs to the boot runlevel.' |
186 |
|
187 |
if [ -e "${EROOT}/etc/runlevels/shutdown/zfs-shutdown" ] |
188 |
then |
189 |
einfo "The zfs-shutdown script is obsolete. Removing it from runlevel." |
190 |
rm "${EROOT}/etc/runlevels/shutdown/zfs-shutdown" |
191 |
fi |
192 |
|
193 |
} |
194 |
|
195 |
pkg_postrm() { |
196 |
if ! use kernel-builtin && [ ${PV} = "9999" ] |
197 |
then |
198 |
remove_moduledb |
199 |
fi |
200 |
} |