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-kmod: zfs-kmod-0.6.3.ebuild zfs-kmod-9999.ebuild ChangeLog
Date: Fri, 05 Sep 2014 18:23:40
Message-Id: 20140905182336.9F3DE4CBE@oystercatcher.gentoo.org
1 ryao 14/09/05 18:23:36
2
3 Modified: zfs-kmod-0.6.3.ebuild zfs-kmod-9999.ebuild
4 ChangeLog
5 Log:
6 Add preliminary ebuild changes for Gentoo Prefix support; Provide message to die if updating META fails; Sync 0.6.3 and 9999 ebuilds.
7
8 (Portage version: 2.2.8-r1/cvs/Linux x86_64, signed Manifest commit with key 0xBEE84C64)
9
10 Revision Changes Path
11 1.3 sys-fs/zfs-kmod/zfs-kmod-0.6.3.ebuild
12
13 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/zfs-kmod/zfs-kmod-0.6.3.ebuild?rev=1.3&view=markup
14 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/zfs-kmod/zfs-kmod-0.6.3.ebuild?rev=1.3&content-type=text/plain
15 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/zfs-kmod/zfs-kmod-0.6.3.ebuild?r1=1.2&r2=1.3
16
17 Index: zfs-kmod-0.6.3.ebuild
18 ===================================================================
19 RCS file: /var/cvsroot/gentoo-x86/sys-fs/zfs-kmod/zfs-kmod-0.6.3.ebuild,v
20 retrieving revision 1.2
21 retrieving revision 1.3
22 diff -u -r1.2 -r1.3
23 --- zfs-kmod-0.6.3.ebuild 7 Aug 2014 18:23:45 -0000 1.2
24 +++ zfs-kmod-0.6.3.ebuild 5 Sep 2014 18:23:36 -0000 1.3
25 @@ -1,6 +1,6 @@
26 # Copyright 1999-2014 Gentoo Foundation
27 # Distributed under the terms of the GNU General Public License v2
28 -# $Header: /var/cvsroot/gentoo-x86/sys-fs/zfs-kmod/zfs-kmod-0.6.3.ebuild,v 1.2 2014/08/07 18:23:45 ryao Exp $
29 +# $Header: /var/cvsroot/gentoo-x86/sys-fs/zfs-kmod/zfs-kmod-0.6.3.ebuild,v 1.3 2014/09/05 18:23:36 ryao Exp $
30
31 EAPI="4"
32
33 @@ -8,12 +8,12 @@
34 AUTOTOOLS_AUTORECONF="1"
35 AUTOTOOLS_IN_SOURCE_BUILD="1"
36
37 -inherit bash-completion-r1 flag-o-matic linux-info linux-mod toolchain-funcs autotools-utils
38 +inherit flag-o-matic linux-info linux-mod toolchain-funcs autotools-utils
39
40 if [ ${PV} == "9999" ] ; then
41 inherit git-2
42 MY_PV=9999
43 - EGIT_REPO_URI="git://github.com/zfsonlinux/zfs.git"
44 + EGIT_REPO_URI="https://github.com/zfsonlinux/zfs.git"
45 else
46 inherit eutils versionator
47 MY_PV=$(replace_version_separator 3 '-')
48 @@ -55,6 +55,7 @@
49 use debug && CONFIG_CHECK="${CONFIG_CHECK}
50 FRAME_POINTER
51 DEBUG_INFO
52 + !DEBUG_INFO_REDUCED
53 "
54
55 use rootfs && \
56 @@ -76,7 +77,8 @@
57 use debug || sed -e 's/^subdir-m += zpios$//' -i "${S}/module/Makefile.in"
58
59 # Set module revision number
60 - sed -i "s/\(Release:\)\(.*\)1/\1\2${PR}-gentoo/" "${S}/META" || die
61 + [ ${PV} != "9999" ] && \
62 + { sed -i "s/\(Release:\)\(.*\)1/\1\2${PR}-gentoo/" "${S}/META" || die "Could not set Gentoo release"; }
63
64 autotools-utils_src_prepare
65 }
66 @@ -86,7 +88,7 @@
67 filter-ldflags -Wl,*
68
69 set_arch_to_kernel
70 - local myeconfargs=(
71 + local myeconfargs=(${myeconfargs}
72 --bindir="${EPREFIX}/bin"
73 --sbindir="${EPREFIX}/sbin"
74 --with-config=kernel
75 @@ -94,11 +96,16 @@
76 --with-linux-obj="${KV_OUT_DIR}"
77 $(use_enable debug)
78 )
79 +
80 + SPL_PATH=$(basename $(echo "${EROOT}usr/src/spl-"*)) \
81 + myeconfargs="${myeconfargs} --with-spl=${EROOT}usr/src/${SPL_PATH} \
82 + --with-spl-obj=${EROOT}usr/src/${SPL_PATH}/${KV_FULL}"
83 +
84 autotools-utils_src_configure
85 }
86
87 src_install() {
88 - autotools-utils_src_install
89 + autotools-utils_src_install INSTALL_MOD_PATH=${INSTALL_MOD_PATH:-$EROOT}
90 dodoc AUTHORS COPYRIGHT DISCLAIMER README.markdown
91 }
92
93
94
95
96 1.25 sys-fs/zfs-kmod/zfs-kmod-9999.ebuild
97
98 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/zfs-kmod/zfs-kmod-9999.ebuild?rev=1.25&view=markup
99 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/zfs-kmod/zfs-kmod-9999.ebuild?rev=1.25&content-type=text/plain
100 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/zfs-kmod/zfs-kmod-9999.ebuild?r1=1.24&r2=1.25
101
102 Index: zfs-kmod-9999.ebuild
103 ===================================================================
104 RCS file: /var/cvsroot/gentoo-x86/sys-fs/zfs-kmod/zfs-kmod-9999.ebuild,v
105 retrieving revision 1.24
106 retrieving revision 1.25
107 diff -u -r1.24 -r1.25
108 --- zfs-kmod-9999.ebuild 9 Jul 2014 01:29:39 -0000 1.24
109 +++ zfs-kmod-9999.ebuild 5 Sep 2014 18:23:36 -0000 1.25
110 @@ -1,6 +1,6 @@
111 # Copyright 1999-2014 Gentoo Foundation
112 # Distributed under the terms of the GNU General Public License v2
113 -# $Header: /var/cvsroot/gentoo-x86/sys-fs/zfs-kmod/zfs-kmod-9999.ebuild,v 1.24 2014/07/09 01:29:39 prometheanfire Exp $
114 +# $Header: /var/cvsroot/gentoo-x86/sys-fs/zfs-kmod/zfs-kmod-9999.ebuild,v 1.25 2014/09/05 18:23:36 ryao Exp $
115
116 EAPI="4"
117
118 @@ -8,7 +8,7 @@
119 AUTOTOOLS_AUTORECONF="1"
120 AUTOTOOLS_IN_SOURCE_BUILD="1"
121
122 -inherit bash-completion-r1 flag-o-matic linux-info linux-mod toolchain-funcs autotools-utils
123 +inherit flag-o-matic linux-info linux-mod toolchain-funcs autotools-utils
124
125 if [ ${PV} == "9999" ] ; then
126 inherit git-2
127 @@ -67,7 +67,7 @@
128 kernel_is ge 2 6 26 || die "Linux 2.6.26 or newer required"
129
130 [ ${PV} != "9999" ] && \
131 - { kernel_is le 3 15 || die "Linux 3.15 is the latest supported version."; }
132 + { kernel_is le 3 16 || die "Linux 3.16 is the latest supported version."; }
133
134 check_extra_config
135 }
136 @@ -76,6 +76,10 @@
137 # Remove GPLv2-licensed ZPIOS unless we are debugging
138 use debug || sed -e 's/^subdir-m += zpios$//' -i "${S}/module/Makefile.in"
139
140 + # Set module revision number
141 + [ ${PV} != "9999" ] && \
142 + { sed -i "s/\(Release:\)\(.*\)1/\1\2${PR}-gentoo/" "${S}/META" || die "Could not set Gentoo release"; }
143 +
144 autotools-utils_src_prepare
145 }
146
147 @@ -84,7 +88,7 @@
148 filter-ldflags -Wl,*
149
150 set_arch_to_kernel
151 - local myeconfargs=(
152 + local myeconfargs=(${myeconfargs}
153 --bindir="${EPREFIX}/bin"
154 --sbindir="${EPREFIX}/sbin"
155 --with-config=kernel
156 @@ -92,11 +96,16 @@
157 --with-linux-obj="${KV_OUT_DIR}"
158 $(use_enable debug)
159 )
160 +
161 + SPL_PATH=$(basename $(echo "${EROOT}usr/src/spl-"*)) \
162 + myeconfargs="${myeconfargs} --with-spl=${EROOT}usr/src/${SPL_PATH} \
163 + --with-spl-obj=${EROOT}usr/src/${SPL_PATH}/${KV_FULL}"
164 +
165 autotools-utils_src_configure
166 }
167
168 src_install() {
169 - autotools-utils_src_install
170 + autotools-utils_src_install INSTALL_MOD_PATH=${INSTALL_MOD_PATH:-$EROOT}
171 dodoc AUTHORS COPYRIGHT DISCLAIMER README.markdown
172 }
173
174
175
176
177 1.52 sys-fs/zfs-kmod/ChangeLog
178
179 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/zfs-kmod/ChangeLog?rev=1.52&view=markup
180 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/zfs-kmod/ChangeLog?rev=1.52&content-type=text/plain
181 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/zfs-kmod/ChangeLog?r1=1.51&r2=1.52
182
183 Index: ChangeLog
184 ===================================================================
185 RCS file: /var/cvsroot/gentoo-x86/sys-fs/zfs-kmod/ChangeLog,v
186 retrieving revision 1.51
187 retrieving revision 1.52
188 diff -u -r1.51 -r1.52
189 --- ChangeLog 7 Aug 2014 18:23:45 -0000 1.51
190 +++ ChangeLog 5 Sep 2014 18:23:36 -0000 1.52
191 @@ -1,6 +1,11 @@
192 # ChangeLog for sys-fs/zfs-kmod
193 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
194 -# $Header: /var/cvsroot/gentoo-x86/sys-fs/zfs-kmod/ChangeLog,v 1.51 2014/08/07 18:23:45 ryao Exp $
195 +# $Header: /var/cvsroot/gentoo-x86/sys-fs/zfs-kmod/ChangeLog,v 1.52 2014/09/05 18:23:36 ryao Exp $
196 +
197 + 05 Sep 2014; Richard Yao <ryao@g.o> zfs-kmod-0.6.3.ebuild,
198 + zfs-kmod-9999.ebuild:
199 + Add preliminary ebuild changes for Gentoo Prefix support; Provide message to
200 + die if updating META fails; Sync 0.6.3 and 9999 ebuilds.
201
202 07 Aug 2014; Richard Yao <ryao@g.o> zfs-kmod-0.6.3.ebuild:
203 No code changes are needed to support Linux 3.16. I modifying the ebuild to
Report Message
Find on MARC Find on Google Groups