1 |
ryao 14/12/01 14:39:13 |
2 |
|
3 |
Modified: ChangeLog |
4 |
Added: zfs-0.6.3-r2.ebuild |
5 |
Removed: zfs-0.6.3-r1.ebuild |
6 |
Log: |
7 |
Fix typo in dracut module installation, thanks Wuodan |
8 |
|
9 |
(Portage version: 2.2.8-r2/cvs/Linux x86_64, signed Manifest commit with key 0xBEE84C64) |
10 |
|
11 |
Revision Changes Path |
12 |
1.88 sys-fs/zfs/ChangeLog |
13 |
|
14 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/zfs/ChangeLog?rev=1.88&view=markup |
15 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/zfs/ChangeLog?rev=1.88&content-type=text/plain |
16 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/zfs/ChangeLog?r1=1.87&r2=1.88 |
17 |
|
18 |
Index: ChangeLog |
19 |
=================================================================== |
20 |
RCS file: /var/cvsroot/gentoo-x86/sys-fs/zfs/ChangeLog,v |
21 |
retrieving revision 1.87 |
22 |
retrieving revision 1.88 |
23 |
diff -u -r1.87 -r1.88 |
24 |
--- ChangeLog 1 Dec 2014 07:04:45 -0000 1.87 |
25 |
+++ ChangeLog 1 Dec 2014 14:39:13 -0000 1.88 |
26 |
@@ -1,6 +1,12 @@ |
27 |
# ChangeLog for sys-fs/zfs |
28 |
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 |
29 |
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/zfs/ChangeLog,v 1.87 2014/12/01 07:04:45 ryao Exp $ |
30 |
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/zfs/ChangeLog,v 1.88 2014/12/01 14:39:13 ryao Exp $ |
31 |
+ |
32 |
+*zfs-0.6.3-r2 (01 Dec 2014) |
33 |
+ |
34 |
+ 01 Dec 2014; Richard Yao <ryao@g.o> +zfs-0.6.3-r2.ebuild, |
35 |
+ -zfs-0.6.3-r1.ebuild: |
36 |
+ Fix typo in dracut module installation, thanks Wuodan |
37 |
|
38 |
*zfs-0.6.3-r1 (01 Dec 2014) |
39 |
|
40 |
|
41 |
|
42 |
|
43 |
1.1 sys-fs/zfs/zfs-0.6.3-r2.ebuild |
44 |
|
45 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/zfs/zfs-0.6.3-r2.ebuild?rev=1.1&view=markup |
46 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/zfs/zfs-0.6.3-r2.ebuild?rev=1.1&content-type=text/plain |
47 |
|
48 |
Index: zfs-0.6.3-r2.ebuild |
49 |
=================================================================== |
50 |
# Copyright 1999-2014 Gentoo Foundation |
51 |
# Distributed under the terms of the GNU General Public License v2 |
52 |
# $Header: /var/cvsroot/gentoo-x86/sys-fs/zfs/zfs-0.6.3-r2.ebuild,v 1.1 2014/12/01 14:39:13 ryao Exp $ |
53 |
|
54 |
EAPI="5" |
55 |
PYTHON_COMPAT=( python{2_6,2_7,3_1,3_2,3_3,3_4} ) |
56 |
|
57 |
inherit python-r1 |
58 |
|
59 |
AT_M4DIR="config" |
60 |
AUTOTOOLS_AUTORECONF="1" |
61 |
AUTOTOOLS_IN_SOURCE_BUILD="1" |
62 |
|
63 |
if [ ${PV} == "9999" ] ; then |
64 |
inherit git-2 linux-mod |
65 |
EGIT_REPO_URI="git://github.com/zfsonlinux/${PN}.git" |
66 |
else |
67 |
inherit eutils versionator |
68 |
SRC_URI="https://github.com/zfsonlinux/${PN}/archive/${P}.tar.gz |
69 |
http://dev.gentoo.org/~ryao/dist/${P}-patches-r1.tar.xz" |
70 |
S="${WORKDIR}/${PN}-${P}" |
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 bash-completion? ( MIT )" |
80 |
SLOT="0" |
81 |
IUSE="bash-completion custom-cflags debug kernel-builtin +rootfs test-suite static-libs" |
82 |
RESTRICT="test" |
83 |
|
84 |
COMMON_DEPEND=" |
85 |
sys-apps/util-linux[static-libs?] |
86 |
sys-libs/zlib[static-libs(+)?] |
87 |
virtual/awk |
88 |
" |
89 |
DEPEND="${COMMON_DEPEND} |
90 |
virtual/pkgconfig |
91 |
" |
92 |
|
93 |
RDEPEND="${COMMON_DEPEND} |
94 |
!=sys-apps/grep-2.13* |
95 |
!kernel-builtin? ( =sys-fs/zfs-kmod-${PV}* ) |
96 |
!sys-fs/zfs-fuse |
97 |
!prefix? ( virtual/udev ) |
98 |
test-suite? ( |
99 |
sys-apps/util-linux |
100 |
sys-devel/bc |
101 |
sys-block/parted |
102 |
sys-fs/lsscsi |
103 |
sys-fs/mdadm |
104 |
sys-process/procps |
105 |
virtual/modutils |
106 |
) |
107 |
rootfs? ( |
108 |
app-arch/cpio |
109 |
app-misc/pax-utils |
110 |
!<sys-boot/grub-2.00-r2:2 |
111 |
) |
112 |
" |
113 |
|
114 |
pkg_setup() { |
115 |
: |
116 |
} |
117 |
|
118 |
src_prepare() { |
119 |
if [ ${PV} != "9999" ] |
120 |
then |
121 |
# Apply patch set |
122 |
EPATCH_SUFFIX="patch" \ |
123 |
EPATCH_FORCE="yes" \ |
124 |
epatch "${WORKDIR}/${P}-patches" |
125 |
fi |
126 |
|
127 |
# Update paths |
128 |
sed -e "s|/sbin/lsmod|/bin/lsmod|" \ |
129 |
-e "s|/usr/bin/scsi-rescan|/usr/sbin/rescan-scsi-bus|" \ |
130 |
-e "s|/sbin/parted|/usr/sbin/parted|" \ |
131 |
-i scripts/common.sh.in |
132 |
|
133 |
autotools-utils_src_prepare |
134 |
} |
135 |
|
136 |
src_configure() { |
137 |
use custom-cflags || strip-flags |
138 |
local myeconfargs=( |
139 |
--bindir="${EPREFIX}/bin" |
140 |
--sbindir="${EPREFIX}/sbin" |
141 |
--with-config=user |
142 |
--with-dracutdir="/usr/$(get_libdir)/dracut" |
143 |
--with-linux="${KV_DIR}" |
144 |
--with-linux-obj="${KV_OUT_DIR}" |
145 |
--with-udevdir="$(get_udevdir)" |
146 |
--with-blkid |
147 |
$(use_enable debug) |
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 zfs_core |
165 |
use test-suite || rm -rf "${ED}usr/share/zfs" |
166 |
|
167 |
use bash-completion && newbashcomp "${FILESDIR}/bash-completion-r1" zfs |
168 |
|
169 |
exeinto /usr/libexec |
170 |
doexe "${T}/zfs-init.sh" |
171 |
systemd_dounit "${T}/zfs.service" |
172 |
} |
173 |
|
174 |
pkg_postinst() { |
175 |
|
176 |
if ! use kernel-builtin && [ ${PV} = "9999" ] |
177 |
then |
178 |
einfo "Adding ${P} to the module database to ensure that the" |
179 |
einfo "kernel modules and userland utilities stay in sync." |
180 |
update_moduledb |
181 |
fi |
182 |
|
183 |
[ -e "${EROOT}/etc/runlevels/boot/zfs" ] \ |
184 |
|| ewarn 'You should add zfs to the boot runlevel.' |
185 |
|
186 |
if [ -e "${EROOT}/etc/runlevels/shutdown/zfs-shutdown" ] |
187 |
then |
188 |
einfo "The zfs-shutdown script is obsolete. Removing it from runlevel." |
189 |
rm "${EROOT}/etc/runlevels/shutdown/zfs-shutdown" |
190 |
fi |
191 |
|
192 |
} |
193 |
|
194 |
pkg_postrm() { |
195 |
if ! use kernel-builtin && [ ${PV} = "9999" ] |
196 |
then |
197 |
remove_moduledb |
198 |
fi |
199 |
} |