Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status

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: zfs-0.6.0_rc12-r1.ebuild zfs-0.6.0_rc11-r1.ebuild zfs-0.6.0_rc10-r2.ebuild ChangeLog zfs-0.6.0_rc11.ebuild zfs-0.6.0_rc10-r1.ebuild zfs-0.6.0_rc12.ebuild
Date: Thu, 29 Nov 2012 05:19:24
Message-Id: 20121129051912.710B120C65@flycatcher.gentoo.org
1 ryao 12/11/29 05:19:12
2
3 Modified: ChangeLog
4 Added: zfs-0.6.0_rc12-r1.ebuild zfs-0.6.0_rc11-r1.ebuild
5 zfs-0.6.0_rc10-r2.ebuild
6 Removed: zfs-0.6.0_rc11.ebuild zfs-0.6.0_rc10-r1.ebuild
7 zfs-0.6.0_rc12.ebuild
8 Log:
9 Make zfs-shutdown script a noop on systems that do not use ZFS as their rootfs
10
11 (Portage version: 2.1.11.31/cvs/Linux x86_64, unsigned Manifest commit)
12
13 Revision Changes Path
14 1.51 sys-fs/zfs/ChangeLog
15
16 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/zfs/ChangeLog?rev=1.51&view=markup
17 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/zfs/ChangeLog?rev=1.51&content-type=text/plain
18 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/zfs/ChangeLog?r1=1.50&r2=1.51
19
20 Index: ChangeLog
21 ===================================================================
22 RCS file: /var/cvsroot/gentoo-x86/sys-fs/zfs/ChangeLog,v
23 retrieving revision 1.50
24 retrieving revision 1.51
25 diff -u -r1.50 -r1.51
26 --- ChangeLog 14 Nov 2012 21:57:19 -0000 1.50
27 +++ ChangeLog 29 Nov 2012 05:19:12 -0000 1.51
28 @@ -1,6 +1,16 @@
29 # ChangeLog for sys-fs/zfs
30 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
31 -# $Header: /var/cvsroot/gentoo-x86/sys-fs/zfs/ChangeLog,v 1.50 2012/11/14 21:57:19 ryao Exp $
32 +# $Header: /var/cvsroot/gentoo-x86/sys-fs/zfs/ChangeLog,v 1.51 2012/11/29 05:19:12 ryao Exp $
33 +
34 +*zfs-0.6.0_rc10-r2 (29 Nov 2012)
35 +*zfs-0.6.0_rc11-r1 (29 Nov 2012)
36 +*zfs-0.6.0_rc12-r1 (29 Nov 2012)
37 +
38 + 29 Nov 2012; Richard Yao <ryao@g.o> +zfs-0.6.0_rc10-r2.ebuild,
39 + +zfs-0.6.0_rc11-r1.ebuild, +zfs-0.6.0_rc12-r1.ebuild,
40 + -zfs-0.6.0_rc10-r1.ebuild, -zfs-0.6.0_rc11.ebuild, -zfs-0.6.0_rc12.ebuild,
41 + files/zfs-shutdown:
42 + Make zfs-shutdown script a noop on systems that do not use ZFS as their rootfs
43
44 *zfs-0.6.0_rc12 (14 Nov 2012)
45
46
47
48
49 1.1 sys-fs/zfs/zfs-0.6.0_rc12-r1.ebuild
50
51 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/zfs/zfs-0.6.0_rc12-r1.ebuild?rev=1.1&view=markup
52 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/zfs/zfs-0.6.0_rc12-r1.ebuild?rev=1.1&content-type=text/plain
53
54 Index: zfs-0.6.0_rc12-r1.ebuild
55 ===================================================================
56 # Copyright 1999-2012 Gentoo Foundation
57 # Distributed under the terms of the GNU General Public License v2
58 # $Header: /var/cvsroot/gentoo-x86/sys-fs/zfs/zfs-0.6.0_rc12-r1.ebuild,v 1.1 2012/11/29 05:19:12 ryao Exp $
59
60 EAPI="4"
61
62 AT_M4DIR="config"
63 AUTOTOOLS_AUTORECONF="1"
64 AUTOTOOLS_IN_SOURCE_BUILD="1"
65
66 inherit bash-completion-r1 flag-o-matic toolchain-funcs autotools-utils
67
68 if [ ${PV} == "9999" ] ; then
69 inherit git-2
70 EGIT_REPO_URI="git://github.com/zfsonlinux/${PN}.git"
71 else
72 inherit eutils versionator
73 MY_PV=$(replace_version_separator 3 '-')
74 SRC_URI="https://github.com/downloads/zfsonlinux/${PN}/${PN}-${MY_PV}.tar.gz"
75 S="${WORKDIR}/${PN}-${MY_PV}"
76 KEYWORDS="~amd64"
77 fi
78
79 DESCRIPTION="Userland utilities for ZFS Linux kernel module"
80 HOMEPAGE="http://zfsonlinux.org/"
81
82 LICENSE="BSD-2 CDDL MIT"
83 SLOT="0"
84 IUSE="custom-cflags kernel-builtin +rootfs test-suite static-libs"
85 RESTRICT="test"
86
87 COMMON_DEPEND="
88 sys-apps/util-linux[static-libs?]
89 sys-libs/zlib[static-libs(+)?]
90 "
91 DEPEND="${COMMON_DEPEND}
92 virtual/pkgconfig
93 "
94
95 RDEPEND="${COMMON_DEPEND}
96 !=sys-apps/grep-2.13*
97 !kernel-builtin? ( =sys-fs/zfs-kmod-${PV}* )
98 !sys-fs/zfs-fuse
99 !prefix? ( sys-fs/udev )
100 test-suite? (
101 sys-apps/gawk
102 sys-apps/util-linux
103 sys-devel/bc
104 sys-block/parted
105 sys-fs/lsscsi
106 sys-fs/mdadm
107 sys-process/procps
108 virtual/modutils
109 )
110 rootfs? (
111 app-arch/cpio
112 app-misc/pax-utils
113 )
114 "
115
116 src_prepare() {
117 # Workaround for hard coded path
118 sed -i "s|/sbin/lsmod|/bin/lsmod|" scripts/common.sh.in || die
119 # Workaround rename
120 sed -i "s|/usr/bin/scsi-rescan|/usr/sbin/rescan-scsi-bus|" scripts/common.sh.in || die
121
122 autotools-utils_src_prepare
123 }
124
125 src_configure() {
126 use custom-cflags || strip-flags
127 local myeconfargs=(
128 --bindir="${EPREFIX}/bin"
129 --sbindir="${EPREFIX}/sbin"
130 --with-config=user
131 --with-linux="${KV_DIR}"
132 --with-linux-obj="${KV_OUT_DIR}"
133 --with-udevdir="$($(tc-getPKG_CONFIG) --variable=udevdir udev)"
134 )
135 autotools-utils_src_configure
136 }
137
138 src_install() {
139 autotools-utils_src_install
140 gen_usr_ldscript -a uutil nvpair zpool zfs
141 rm -rf "${ED}usr/share/dracut"
142 use test-suite || rm -rf "${ED}usr/libexec"
143
144 if use rootfs
145 then
146 doinitd "${FILESDIR}/zfs-shutdown"
147 exeinto /usr/share/zfs
148 doexe "${FILESDIR}/linuxrc"
149 fi
150
151 newbashcomp "${FILESDIR}/bash-completion" zfs
152
153 }
154
155 pkg_postinst() {
156
157 [ -e "${EROOT}/etc/runlevels/boot/zfs" ] \
158 || ewarn 'You should add zfs to the boot runlevel.'
159
160 use rootfs && ([ -e "${EROOT}/etc/runlevels/shutdown/zfs-shutdown" ] \
161 || ewarn 'You should add zfs-shutdown to the shutdown runlevel.')
162
163 }
164
165
166
167 1.1 sys-fs/zfs/zfs-0.6.0_rc11-r1.ebuild
168
169 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/zfs/zfs-0.6.0_rc11-r1.ebuild?rev=1.1&view=markup
170 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/zfs/zfs-0.6.0_rc11-r1.ebuild?rev=1.1&content-type=text/plain
171
172 Index: zfs-0.6.0_rc11-r1.ebuild
173 ===================================================================
174 # Copyright 1999-2012 Gentoo Foundation
175 # Distributed under the terms of the GNU General Public License v2
176 # $Header: /var/cvsroot/gentoo-x86/sys-fs/zfs/zfs-0.6.0_rc11-r1.ebuild,v 1.1 2012/11/29 05:19:12 ryao Exp $
177
178 EAPI="4"
179
180 AT_M4DIR="config"
181 AUTOTOOLS_AUTORECONF="1"
182 AUTOTOOLS_IN_SOURCE_BUILD="1"
183
184 inherit bash-completion-r1 flag-o-matic toolchain-funcs autotools-utils
185
186 if [ ${PV} == "9999" ] ; then
187 inherit git-2
188 EGIT_REPO_URI="git://github.com/zfsonlinux/${PN}.git"
189 else
190 inherit eutils versionator
191 MY_PV=$(replace_version_separator 3 '-')
192 SRC_URI="https://github.com/downloads/zfsonlinux/${PN}/${PN}-${MY_PV}.tar.gz"
193 S="${WORKDIR}/${PN}-${MY_PV}"
194 KEYWORDS="~amd64"
195 fi
196
197 DESCRIPTION="Userland utilities for ZFS Linux kernel module"
198 HOMEPAGE="http://zfsonlinux.org/"
199
200 LICENSE="BSD-2 CDDL MIT"
201 SLOT="0"
202 IUSE="custom-cflags kernel-builtin +rootfs test-suite static-libs"
203 RESTRICT="test"
204
205 COMMON_DEPEND="
206 sys-apps/util-linux[static-libs?]
207 sys-libs/zlib[static-libs(+)?]
208 "
209 DEPEND="${COMMON_DEPEND}
210 virtual/pkgconfig
211 "
212
213 RDEPEND="${COMMON_DEPEND}
214 !=sys-apps/grep-2.13*
215 !kernel-builtin? ( =sys-fs/zfs-kmod-${PV}* )
216 !sys-fs/zfs-fuse
217 !prefix? ( sys-fs/udev )
218 test-suite? (
219 sys-apps/gawk
220 sys-apps/util-linux
221 sys-devel/bc
222 sys-block/parted
223 sys-fs/lsscsi
224 sys-fs/mdadm
225 sys-process/procps
226 virtual/modutils
227 )
228 rootfs? (
229 app-arch/cpio
230 app-misc/pax-utils
231 )
232 "
233
234 src_prepare() {
235 # Workaround for hard coded path
236 sed -i "s|/sbin/lsmod|/bin/lsmod|" scripts/common.sh.in || die
237 # Workaround rename
238 sed -i "s|/usr/bin/scsi-rescan|/usr/sbin/rescan-scsi-bus|" scripts/common.sh.in || die
239
240 autotools-utils_src_prepare
241 }
242
243 src_configure() {
244 use custom-cflags || strip-flags
245 local myeconfargs=(
246 --bindir="${EPREFIX}/bin"
247 --sbindir="${EPREFIX}/sbin"
248 --with-config=user
249 --with-linux="${KV_DIR}"
250 --with-linux-obj="${KV_OUT_DIR}"
251 --with-udevdir="$($(tc-getPKG_CONFIG) --variable=udevdir udev)"
252 )
253 autotools-utils_src_configure
254 }
255
256 src_install() {
257 autotools-utils_src_install
258 gen_usr_ldscript -a uutil nvpair zpool zfs
259 rm -rf "${ED}usr/share/dracut"
260 use test-suite || rm -rf "${ED}usr/libexec"
261
262 if use rootfs
263 then
264 doinitd "${FILESDIR}/zfs-shutdown"
265 exeinto /usr/share/zfs
266 doexe "${FILESDIR}/linuxrc"
267 fi
268
269 newbashcomp "${FILESDIR}/bash-completion" zfs
270
271 }
272
273 pkg_postinst() {
274
275 [ -e "${EROOT}/etc/runlevels/boot/zfs" ] \
276 || ewarn 'You should add zfs to the boot runlevel.'
277
278 use rootfs && ([ -e "${EROOT}/etc/runlevels/shutdown/zfs-shutdown" ] \
279 || ewarn 'You should add zfs-shutdown to the shutdown runlevel.')
280
281 }
282
283
284
285 1.1 sys-fs/zfs/zfs-0.6.0_rc10-r2.ebuild
286
287 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/zfs/zfs-0.6.0_rc10-r2.ebuild?rev=1.1&view=markup
288 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/zfs/zfs-0.6.0_rc10-r2.ebuild?rev=1.1&content-type=text/plain
289
290 Index: zfs-0.6.0_rc10-r2.ebuild
291 ===================================================================
292 # Copyright 1999-2012 Gentoo Foundation
293 # Distributed under the terms of the GNU General Public License v2
294 # $Header: /var/cvsroot/gentoo-x86/sys-fs/zfs/zfs-0.6.0_rc10-r2.ebuild,v 1.1 2012/11/29 05:19:12 ryao Exp $
295
296 EAPI="4"
297
298 AT_M4DIR="config"
299 AUTOTOOLS_AUTORECONF="1"
300 AUTOTOOLS_IN_SOURCE_BUILD="1"
301
302 inherit bash-completion-r1 flag-o-matic toolchain-funcs autotools-utils
303
304 if [ ${PV} == "9999" ] ; then
305 inherit git-2
306 EGIT_REPO_URI="git://github.com/zfsonlinux/${PN}.git"
307 else
308 inherit eutils versionator
309 MY_PV=$(replace_version_separator 3 '-')
310 SRC_URI="https://github.com/downloads/zfsonlinux/${PN}/${PN}-${MY_PV}.tar.gz"
311 S="${WORKDIR}/${PN}-${MY_PV}"
312 KEYWORDS="~amd64"
313 fi
314
315 DESCRIPTION="Userland utilities for ZFS Linux kernel module"
316 HOMEPAGE="http://zfsonlinux.org/"
317
318 LICENSE="BSD-2 CDDL MIT"
319 SLOT="0"
320 IUSE="custom-cflags kernel-builtin +rootfs test-suite static-libs"
321 RESTRICT="test"
322
323 COMMON_DEPEND="
324 sys-apps/util-linux[static-libs?]
325 sys-libs/zlib[static-libs(+)?]
326 "
327 DEPEND="${COMMON_DEPEND}
328 virtual/pkgconfig
329 "
330
331 RDEPEND="${COMMON_DEPEND}
332 !=sys-apps/grep-2.13*
333 !kernel-builtin? ( =sys-fs/zfs-kmod-${PV}* )
334 !sys-fs/zfs-fuse
335 !prefix? ( sys-fs/udev )
336 test-suite? (
337 sys-apps/gawk
338 sys-apps/util-linux
339 sys-devel/bc
340 sys-block/parted
341 sys-fs/lsscsi
342 sys-fs/mdadm
343 sys-process/procps
344 virtual/modutils
345 )
346 rootfs? (
347 app-arch/cpio
348 app-misc/pax-utils
349 )
350 "
351
352 src_prepare() {
353 # Workaround for hard coded path
354 sed -i "s|/sbin/lsmod|/bin/lsmod|" scripts/common.sh.in || die
355 # Workaround rename
356 sed -i "s|/usr/bin/scsi-rescan|/usr/sbin/rescan-scsi-bus|" scripts/common.sh.in || die
357
358 autotools-utils_src_prepare
359 }
360
361 src_configure() {
362 use custom-cflags || strip-flags
363 local myeconfargs=(
364 --bindir="${EPREFIX}/bin"
365 --sbindir="${EPREFIX}/sbin"
366 --with-config=user
367 --with-linux="${KV_DIR}"
368 --with-linux-obj="${KV_OUT_DIR}"
369 --with-udevdir="$($(tc-getPKG_CONFIG) --variable=udevdir udev)"
370 )
371 autotools-utils_src_configure
372 }
373
374 src_install() {
375 autotools-utils_src_install
376 gen_usr_ldscript -a uutil nvpair zpool zfs
377 rm -rf "${ED}usr/share/dracut"
378 use test-suite || rm -rf "${ED}usr/libexec"
379
380 if use rootfs
381 then
382 doinitd "${FILESDIR}/zfs-shutdown"
383 exeinto /usr/share/zfs
384 doexe "${FILESDIR}/linuxrc"
385 fi
386
387 newbashcomp "${FILESDIR}/bash-completion" zfs
388
389 }
390
391 pkg_postinst() {
392
393 [ -e "${EROOT}/etc/runlevels/boot/zfs" ] \
394 || ewarn 'You should add zfs to the boot runlevel.'
395
396 use rootfs && ([ -e "${EROOT}/etc/runlevels/shutdown/zfs-shutdown" ] \
397 || ewarn 'You should add zfs-shutdown to the shutdown runlevel.')
398
399 }
Report Message
Find on MARC Find on Google Groups