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_rc9.ebuild zfs-9999.ebuild ChangeLog
Date: Sat, 16 Jun 2012 18:57:51
Message-Id: 20120616185739.23CFE2004B@flycatcher.gentoo.org
1 ryao 12/06/16 18:57:39
2
3 Modified: zfs-9999.ebuild ChangeLog
4 Added: zfs-0.6.0_rc9.ebuild
5 Log:
6 Introduce ZFS 0.6.0-rc9 without keywords
7
8 (Portage version: 2.1.10.49/cvs/Linux x86_64)
9
10 Revision Changes Path
11 1.22 sys-fs/zfs/zfs-9999.ebuild
12
13 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/zfs/zfs-9999.ebuild?rev=1.22&view=markup
14 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/zfs/zfs-9999.ebuild?rev=1.22&content-type=text/plain
15 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/zfs/zfs-9999.ebuild?r1=1.21&r2=1.22
16
17 Index: zfs-9999.ebuild
18 ===================================================================
19 RCS file: /var/cvsroot/gentoo-x86/sys-fs/zfs/zfs-9999.ebuild,v
20 retrieving revision 1.21
21 retrieving revision 1.22
22 diff -u -r1.21 -r1.22
23 --- zfs-9999.ebuild 30 Apr 2012 15:38:47 -0000 1.21
24 +++ zfs-9999.ebuild 16 Jun 2012 18:57:39 -0000 1.22
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/zfs-9999.ebuild,v 1.21 2012/04/30 15:38:47 floppym Exp $
29 +# $Header: /var/cvsroot/gentoo-x86/sys-fs/zfs/zfs-9999.ebuild,v 1.22 2012/06/16 18:57:39 ryao Exp $
30
31 EAPI="4"
32
33 @@ -8,16 +8,24 @@
34 AUTOTOOLS_AUTORECONF="1"
35 AUTOTOOLS_IN_SOURCE_BUILD="1"
36
37 -inherit flag-o-matic git-2 linux-mod toolchain-funcs autotools-utils
38 +inherit flag-o-matic linux-mod toolchain-funcs autotools-utils
39 +
40 +if [[ ${PV} == "9999" ]] ; then
41 + inherit git-2
42 + EGIT_REPO_URI="git://github.com/zfsonlinux/${PN}.git"
43 +else
44 + inherit versionator
45 + MY_PV=$(replace_version_separator 3 '-')
46 + SRC_URI="https://github.com/downloads/zfsonlinux/${PN}/${PN}-${MY_PV}.tar.gz"
47 + S="${WORKDIR}/${PN}-${MY_PV}"
48 + KEYWORDS=""
49 +fi
50
51 DESCRIPTION="Native ZFS for Linux"
52 HOMEPAGE="http://zfsonlinux.org/"
53 -SRC_URI=""
54 -EGIT_REPO_URI="git://github.com/zfsonlinux/zfs.git"
55
56 LICENSE="CDDL GPL-2"
57 SLOT="0"
58 -KEYWORDS=""
59 IUSE="custom-cflags debug dracut +rootfs test test-suite static-libs"
60
61 DEPEND="
62
63
64
65 1.23 sys-fs/zfs/ChangeLog
66
67 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/zfs/ChangeLog?rev=1.23&view=markup
68 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/zfs/ChangeLog?rev=1.23&content-type=text/plain
69 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/zfs/ChangeLog?r1=1.22&r2=1.23
70
71 Index: ChangeLog
72 ===================================================================
73 RCS file: /var/cvsroot/gentoo-x86/sys-fs/zfs/ChangeLog,v
74 retrieving revision 1.22
75 retrieving revision 1.23
76 diff -u -r1.22 -r1.23
77 --- ChangeLog 17 May 2012 18:42:32 -0000 1.22
78 +++ ChangeLog 16 Jun 2012 18:57:39 -0000 1.23
79 @@ -1,6 +1,12 @@
80 # ChangeLog for sys-fs/zfs
81 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
82 -# $Header: /var/cvsroot/gentoo-x86/sys-fs/zfs/ChangeLog,v 1.22 2012/05/17 18:42:32 ryao Exp $
83 +# $Header: /var/cvsroot/gentoo-x86/sys-fs/zfs/ChangeLog,v 1.23 2012/06/16 18:57:39 ryao Exp $
84 +
85 +*zfs-0.6.0_rc9 (16 Jun 2012)
86 +
87 + 16 Jun 2012; Richard Yao <ryao@g.o> +zfs-0.6.0_rc9.ebuild,
88 + zfs-9999.ebuild:
89 + Introduce ZFS 0.6.0-rc9 without keywords
90
91 17 May 2012; <richard@g.o> metadata.xml:
92 Update maintainer email to use gentoo.org address
93
94
95
96 1.1 sys-fs/zfs/zfs-0.6.0_rc9.ebuild
97
98 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/zfs/zfs-0.6.0_rc9.ebuild?rev=1.1&view=markup
99 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/zfs/zfs-0.6.0_rc9.ebuild?rev=1.1&content-type=text/plain
100
101 Index: zfs-0.6.0_rc9.ebuild
102 ===================================================================
103 # Copyright 1999-2012 Gentoo Foundation
104 # Distributed under the terms of the GNU General Public License v2
105 # $Header: /var/cvsroot/gentoo-x86/sys-fs/zfs/zfs-0.6.0_rc9.ebuild,v 1.1 2012/06/16 18:57:39 ryao Exp $
106
107 EAPI="4"
108
109 AT_M4DIR="config"
110 AUTOTOOLS_AUTORECONF="1"
111 AUTOTOOLS_IN_SOURCE_BUILD="1"
112
113 inherit flag-o-matic linux-mod toolchain-funcs autotools-utils
114
115 if [[ ${PV} == "9999" ]] ; then
116 inherit git-2
117 EGIT_REPO_URI="git://github.com/zfsonlinux/${PN}.git"
118 else
119 inherit versionator
120 MY_PV=$(replace_version_separator 3 '-')
121 SRC_URI="https://github.com/downloads/zfsonlinux/${PN}/${PN}-${MY_PV}.tar.gz"
122 S="${WORKDIR}/${PN}-${MY_PV}"
123 KEYWORDS=""
124 fi
125
126 DESCRIPTION="Native ZFS for Linux"
127 HOMEPAGE="http://zfsonlinux.org/"
128
129 LICENSE="CDDL GPL-2"
130 SLOT="0"
131 IUSE="custom-cflags debug dracut +rootfs test test-suite static-libs"
132
133 DEPEND="
134 >=sys-kernel/spl-${PV}
135 sys-apps/util-linux[static-libs?]
136 sys-libs/zlib[static-libs(+)?]
137 "
138 RDEPEND="${DEPEND}
139 !sys-fs/zfs-fuse
140 !prefix? ( sys-fs/udev )
141 test-suite? (
142 sys-apps/gawk
143 sys-apps/util-linux
144 sys-devel/bc
145 sys-block/parted
146 sys-fs/lsscsi
147 sys-fs/mdadm
148 sys-process/procps
149 virtual/modutils
150 )
151 rootfs? (
152 app-arch/cpio
153 app-misc/pax-utils
154 )
155 "
156 DEPEND+="
157 test? ( sys-fs/mdadm )
158 "
159
160 pkg_setup() {
161 CONFIG_CHECK="!DEBUG_LOCK_ALLOC
162 !PREEMPT
163 !PREEMPT_VOLUNTARY
164 BLK_DEV_LOOP
165 EFI_PARTITION
166 MODULES
167 ZLIB_DEFLATE
168 ZLIB_INFLATE"
169 kernel_is ge 2 6 26 || die "Linux 2.6.26 or newer required"
170 check_extra_config
171 }
172
173 src_prepare() {
174 # Workaround for hard coded path
175 sed -i "s|/sbin/lsmod|/bin/lsmod|" scripts/common.sh.in || die
176 # Workaround rename
177 sed -i "s|/usr/bin/scsi-rescan|/usr/sbin/rescan-scsi-bus|" scripts/common.sh.in || die
178 autotools-utils_src_prepare
179 }
180
181 src_configure() {
182 use custom-cflags || strip-flags
183 set_arch_to_kernel
184 local myeconfargs=(
185 --bindir="${EPREFIX}/bin"
186 --sbindir="${EPREFIX}/sbin"
187 --with-config=all
188 --with-linux="${KV_DIR}"
189 --with-linux-obj="${KV_OUT_DIR}"
190 --with-udevdir="${EPREFIX}/lib/udev"
191 $(use_enable debug)
192 )
193 autotools-utils_src_configure
194 }
195
196 src_test() {
197 if [[ $UID -ne 0 ]]
198 then
199 ewarn "Cannot run make check tests with FEATURES=userpriv."
200 ewarn "Skipping make check tests."
201 else
202 autotools-utils_src_test
203 fi
204 }
205
206 src_install() {
207 autotools-utils_src_install
208 gen_usr_ldscript -a uutil nvpair zpool zfs
209 use dracut || rm -rf "${ED}usr/share/dracut"
210 use test-suite || rm -rf "${ED}usr/libexec"
211
212 if use rootfs
213 then
214 doinitd "${FILESDIR}/zfs-shutdown"
215 exeinto /usr/share/zfs
216 doexe "${FILESDIR}/linuxrc"
217 fi
218
219 }
220
221 pkg_postinst() {
222 linux-mod_pkg_postinst
223
224 use x86 && ewarn "32-bit kernels are unsupported by ZFSOnLinux upstream. Do not file bug reports."
225
226 [ -e "${EROOT}/etc/runlevels/boot/zfs" ] \
227 || ewarn 'You should add zfs to the boot runlevel.'
228
229 use rootfs && ([ -e "${EROOT}/etc/runlevels/shutdown/zfs-shutdown" ] \
230 || ewarn 'You should add zfs-shutdown to the shutdown runlevel.')
231
232 }
Report Message
Find on MARC Find on Google Groups